diff --git a/.env.development b/.env.development index b23cea2c..de4725c1 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api +# VUE_APP_API_SERVER = http://192.168.1.140/api #家中开发连级的后端服务 # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api diff --git a/package.json b/package.json index 360bbcb1..3deef137 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "js-cookie": "^2.2.0", "jsencrypt": "^3.0.3", "lodash": "^4.17.15", + "mint-ui": "^2.2.13", "node-sass": "^4.12.0", "ol": "^6.9.0", "portfinder": "^1.0.21", diff --git a/public/index.html b/public/index.html index d6bf95af..37b08883 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,8 @@ + + diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index a5f6b533..2eabacde 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -81,12 +81,16 @@ background-color: #3e8ef7 !important; border-color: #3e8ef7 !important; } - +.diy-button--qrcode { + color: #fff !important; + background-color: #4ec591 !important; + border-color: #4ec591 !important; +} //table按钮样式 //查看 .div-table-button--detail { - color: #3E8EF7 !important; + color: #3e8ef7 !important; text-decoration: underline !important; } @@ -101,3 +105,9 @@ color: #d51010 !important; text-decoration: underline !important; } + +// +.div-table-button--qr { + color: #4ec591 !important; + text-decoration: underline !important; +} diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss new file mode 100644 index 00000000..8dafd6eb --- /dev/null +++ b/src/assets/scss/pages/caiji.scss @@ -0,0 +1,82 @@ +.bg-caiji { + background-color: rgba(189, 214, 255, 0.89); + height: 100%; + width: 100vw; + padding: 20px; + + .title { + text-align: center; + font-size: 20px; + } + + .main { + padding-top: 20px; + // font-size: 40px; + + .content { + border-radius: 5px; + + background-color: rgba(255, 255, 255, 0.787); + + .member_title { + padding: 10px; + font-size: 14px; + } + } + .content1 { + margin-top: 20px; + } + + .line { + border: 1px solid #e4e4e48e; + } + } + + .div-btn { + margin-top: 30px; + padding-bottom: 20px; + display: flex; + justify-content: center; + + .btn { + width: 150px; + font-size: 16px; + } + } +} + +.picker_content { + color: rgb(59, 59, 59); +} + +.bg-caiji-success { + height: 100vh; + width: 100vw; + + text-align: center; + .title { + background-color: rgba(189, 214, 255, 0.89); + padding: 20px; + text-align: center; + font-size: 20px; + } + + .main { + margin-top: 100px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + + .icon-success { + font-size: 40px; + // width: 20px; + // height: 20px; + } + + .success-content { + margin-top: 10px; + font-size: 25px; + } + } +} diff --git a/src/main.js b/src/main.js index 05367aa0..296c9448 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,8 @@ import Vue from "vue"; import Element from "element-ui"; +import Mint from 'mint-ui'; +import 'mint-ui/lib/style.css'; + import App from "@/App"; import i18n from "@/i18n"; @@ -60,6 +63,7 @@ Vue.use(renProcessStart); Vue.use(renProcessRunning); Vue.use(renProcessDetail); Vue.use(Element); +Vue.use(Mint); Vue.use(Element, { size: "default", diff --git a/src/router/index.js b/src/router/index.js index dd5f66c9..1bf6bc25 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,6 +44,24 @@ export const pageRoutes = [ name: "index", }, }, + { + path: "/caiji/:id", + props: true, + name: "caiji", + component: () => import("@/views/pages/caiji"), + meta: { + title: "居民信息填报", + }, + }, + { + path: "/caijisuccess", + props: true, + name: "caijisuccess", + component: () => import("@/views/pages/caijisuccess"), + meta: { + title: "居民信息填报", + }, + }, ]; // 模块路由(基于主入口布局页面) @@ -161,6 +179,9 @@ const router = new Router({ router.beforeEach((to, from, next) => { // 添加动态(菜单)路由 // 已添加或者当前路由为页面路由, 可直接访问 + if(to.name==='caiji'){ + return next(); + } if ( window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || fnCurrentRouteIsPageRoute(to, pageRoutes) diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index e14dd753..cbe00837 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -33,6 +33,10 @@ class="diy-button--reset" size="small" @click="resetSearch">重置 +
导出 + 社区二维码
@@ -119,6 +128,11 @@ + 进入 --> + { + console.log('res----1r', res) + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + console.log('filename', fileName) + this.download(res.data, fileName) //释放掉blob对象 + } else this.$message.error('下载失败') + // this.download(res.data, '1.png') + }) + }, //导出表格 async handleExport () { let title = this.agencyObj.label diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue new file mode 100644 index 00000000..be259c60 --- /dev/null +++ b/src/views/pages/caiji.vue @@ -0,0 +1,881 @@ + + + + diff --git a/src/views/pages/caijisuccess.vue b/src/views/pages/caijisuccess.vue new file mode 100644 index 00000000..7127c126 --- /dev/null +++ b/src/views/pages/caijisuccess.vue @@ -0,0 +1,78 @@ + + + +