From 770372d33b275f73499b79ec98c84bc8a4e2283b Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 18 Mar 2022 11:18:21 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 ++++++ src/views/pages/caiji.vue | 65 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 src/views/pages/caiji.vue diff --git a/src/router/index.js b/src/router/index.js index 6ec6c657..c8eb853e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,6 +44,15 @@ export const pageRoutes = [ name: "index", }, }, + { + path: "/caiji/:id", + props: true, + name: "caiji", + component: () => import("@/views/pages/caiji"), + meta: { + title: "居民信息填报", + }, + }, ]; // 模块路由(基于主入口布局页面) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue new file mode 100644 index 00000000..39fbb94f --- /dev/null +++ b/src/views/pages/caiji.vue @@ -0,0 +1,65 @@ + + + + From b41992cf0c4a84090934c8866885dec17bf0256b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 18 Mar 2022 17:41:38 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + public/index.html | 2 + src/assets/scss/pages/caiji.scss | 26 ++ src/main.js | 4 + src/views/pages/caiji.vue | 568 ++++++++++++++++++++++++++++--- 5 files changed, 559 insertions(+), 42 deletions(-) create mode 100644 src/assets/scss/pages/caiji.scss 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 7761c737..6581742c 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,8 @@ + + diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss new file mode 100644 index 00000000..f59ce9df --- /dev/null +++ b/src/assets/scss/pages/caiji.scss @@ -0,0 +1,26 @@ +.bg-app { + // background-color: rgb(230, 230, 230); + height: 100vh; + width: 100vw; + padding: 20px; + + .title { + text-align: center; + font-size: 20px; + } + + .content { + margin-top: 20px; + // font-size: 40px; + + .line { + border: 1px solid #e4e4e48e; + } + } + + .div-btn { + margin-top: 50px; + display: flex; + justify-content: center; + } +} 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/views/pages/caiji.vue b/src/views/pages/caiji.vue index 39fbb94f..9de79178 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -1,65 +1,549 @@ - + From d3a51a3783e51fbe83ac0703ce8155135a590018 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 18 Mar 2022 22:00:10 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/caiji.scss | 29 ++- src/views/pages/caiji.vue | 378 +++++++++++++++++++------------ 2 files changed, 262 insertions(+), 145 deletions(-) diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss index f59ce9df..517eff61 100644 --- a/src/assets/scss/pages/caiji.scss +++ b/src/assets/scss/pages/caiji.scss @@ -1,6 +1,6 @@ .bg-app { - // background-color: rgb(230, 230, 230); - height: 100vh; + background-color: rgba(218, 218, 218, 0.89); + height: 100%; width: 100vw; padding: 20px; @@ -9,18 +9,37 @@ font-size: 20px; } - .content { - margin-top: 20px; + .main { + padding-top: 20px; // font-size: 40px; + .content { + border-radius: 5px; + background-border: 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: 50px; + margin-top: 30px; + padding-bottom: 20px; display: flex; justify-content: center; } } + +.picker_content { + color: rgb(59, 59, 59); +} diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index 9de79178..c87e77ea 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -3,116 +3,157 @@
居民信息填报
-
+
- +
- {{shequName}} - -
+ -
- - {{selCommunity.label}} - 请选择 - -
-
- -
- - {{selBuilding.label}} - 请选择 - -
-
- -
- - {{selUnit.label}} - 请选择 - -
-
- -
- - {{selRoom.label}} - 请选择 + {{shequName}}
-
-
- -
-
- -
- - {{selRoomType.label}} - 请选择 - -
-
- -
+
+
+ + {{selCommunity.label}} + 请选择 + +
+
+ +
+ + {{selBuilding.label}} + 请选择 + +
+
+ +
+ + {{selUnit.label}} + 请选择 + +
+
+ + +
+ +
+ + {{selRoom.label}} + 请选择 + +
+
+ + - -
+
+
+ +
+
-
- +
+
+
+ + {{selRoomType.label}} + 请选择 + +
+ + v-model="formData.houseHolderName">
+ + type="number" + @blur.native.capture="bluraa" + v-model="formData.totalResi">
-
- - {{item.selDetNum.label}} - 请选择 - -
-
+
-
- - {{item.selDetCondition.label}} - 请选择 - +
+
+
{{'成员'+(index+1)}}
+ +
+ +
+ +
+ +
+ + {{item.selDetNum.label}} + 请选择 + +
+
+ +
+ + {{item.selDetCondition.label}} + 请选择 + +
+
-
@@ -148,6 +189,7 @@ import { requestPost } from "@/js/dai/request"; +import { Toast } from "mint-ui"; let loading // 加载动画 export default { @@ -155,7 +197,7 @@ export default { return { popupVisible: false, shequName: '其他小区', - shequId: '111', + shequId: '6e511da6816e53af4cda952365a26eb9',//德兴路 1202807601961984002 showAddressField: false,//是否显示其他 communityList: [], @@ -172,36 +214,42 @@ export default { selRoom: null, selRoomType: null, - address: '', - username: '', - phone: '', - idcard: '', - value: '', - memberNum: 2, + + formData: { + origin: '',//兴德路社区：internal;其他社区：external + villageId: '',//小区id；外部不显示此组件；如果是内部必填。用户选择其他，可以自己输入，前端把输入的内容放在这个字段即可 + villageContent: '', + buildId: '',//楼栋id；外部不显示此组件；如果是内部必填，用户选择其他，可以自己输入，前端把输入的内容放在这个字段即可 + buildContent: '', + unitId: '',//单元id；外部不显示磁组件。如果是内部必填。用户可以选择其他，自己输入，前端把输入的内容放在这个字段即可 + unitContent: '',//选择其他时，输入的值 + homeId: '',//房屋id；外部不展示此组件。如果是内部必填。用户选择其他，可以自己输入，前端把输入的内容放在这个字段即可 + homeContent: '',////选择其他时，输入的值 + address: '',//外部：用户自己输入；内部：把小区名楼栋名单元名房屋名拼接起来。例如：绿地望海领域10号楼一单元101 + houseType: '',//1自由0租住 + houseHolderName: '',//户主姓名 + totalResi: 1,//居住成员人数 + customerId: '',//customerId + + }, selMemberIndex: null, memberList: [ { name: '', - phone: '', - idcard: '', - num: 0, - condition: '', - selDetNum: {}, - selDetCondition: {} - }, - { - name: '', - phone: '', - idcard: '', - num: 0, - condition: '', + mobile: '', + idNum: '', + customerId: '', + heSuanCount: 0, + ymjz: '', selDetNum: {}, selDetCondition: {} } ], + + roomTypeList: [ { value: '1', @@ -213,27 +261,11 @@ export default { }, ], - detNumList: [ - { - value: '0', - label: '0' - }, - { - value: '1', - label: '1' - }, - { - value: '2', - label: '2' - }, - { - value: '3', - label: '3' - }, - ],//参加核酸次数list + detNumList: [],//参加核酸次数list detConditionList: [//参加核酸类型list { - label: '已全程接种（包含加强针或序贯）', + // label: '已全程接种（包含加强针或序贯）', + label: '已全程接种', value: '1' }, { @@ -261,20 +293,58 @@ export default { }, created () { }, mounted () { + if (this.shequId === '6e511da6816e53af4cda952365a26eb9') { + this.formData.origin = 'internal' + } else { + this.formData.origin = 'external' + } this.loadCommunity() - + this.detNumList = [] + for (let i = 0; i < 11; i++) { + let obj = { + value: i + '', + label: i + '', + } + this.detNumList.push(obj) + } }, methods: { + bluraa () { + let objTemp = { + name: '', + mobile: '', + idNum: '', + heSuanCount: 0, + ymjz: '', + selDetNum: {}, + customerId: '', + selDetCondition: {} + } + + if (this.memberList.length > this.formData.totalResi) {//已有成员数量比设置的数量大，删除多余 + let differ = this.memberList.length - this.formData.totalResi + this.memberList.splice(this.formData.totalResi, differ) + } else if (this.memberList.length < this.formData.totalResi) {////已有成员数量比设置的数量小，补充空对象 + let differ = this.formData.totalResi - this.memberList.length + + for (let i = 0; i < differ; i++) { + let temp = JSON.parse(JSON.stringify(objTemp)) + this.memberList.push(temp) + } + } + + + console.log(this.memberList) + }, + //根据社区id获取小区列表 async loadCommunity () { - const url = "/gov/org/neighborhood/neighborhoodlist" + const url = "/gov/org/icneighborhood/open/list" let params = { - pageSize: 100, - pageNo: 0, - level: 'community', - id: 'f6e183d8e6687020074e6d8061926bfa' + agencyId: this.shequId, + isPage: false } const { data, code, msg } = await requestPost(url, params) @@ -282,7 +352,7 @@ export default { if (code === 0) { data.list.forEach(element => { element.label = element.neighborHoodName - element.value = element.neighborHoodId + element.value = element.id }); this.communityList = data.list let obj = { @@ -450,28 +520,49 @@ export default { }, handleSubmit () { + if (this.formData.origin === 'internal') { + this.formData.address = this. +} + + + this.formData.memberList = this.memberList }, popupOk () { if (this.selType === 'community') { this.selCommunity = this.selObj + this.formData.villageContent = this.selObj.label + this.formData.villageId = this.selObj.value + this.selBuilding = null this.selUnit = null this.selRoom = null + this.formData.unitContent = '' + this.formData.homeContent = '' this.loadBuilding() } if (this.selType === 'building') { this.selBuilding = this.selObj + this.formData.buildContent = this.selObj.label + this.formData.buildId = this.selObj.value + this.selUnit = null this.selRoom = null + this.formData.unitContent = '' + this.formData.homeContent = '' this.loadUnit() } if (this.selType === 'unit') { this.selUnit = this.selObj + + + this.selRoom = null + this.formData.unitContent = '' + this.formData.homeContent = '' if (this.selUnit && this.selUnit.value === 'else') { this.showAddressField = true } else { @@ -482,6 +573,8 @@ export default { } if (this.selType === 'room') { this.selRoom = this.selObj + + this.formData.homeContent = '' if (this.selRoom && this.selRoom.value === 'else') { this.showAddressField = true } else { @@ -494,12 +587,17 @@ export default { } if (this.selType === 'detNum') { + + let change = this.memberList[this.selMemberIndex] + change.selDetNum = this.selObj + this.$set(this.memberList, this.selMemberIndex, change) // this.selMemberIndex = index // this.pickerData = this.detNumList } if (this.selType === 'detCondition') { - // this.selMemberIndex = index - // this.pickerData = this.detConditionList + let change = this.memberList[this.selMemberIndex] + change.selDetCondition = this.selObj + this.$set(this.memberList, this.selMemberIndex, change) } this.popupVisible = false From 12125fd9c855d97589f0e90717cf715b41dbcb5d Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 09:37:16 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=B8=82=E5=8C=97=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=20=E5=AE=89=E9=98=B2=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index f2c75cfa..bc95ab42 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -290,10 +290,10 @@ router.beforeEach((to, from, next) => { children: [ { url: "/visual/ai/index", - name: "AI安防", + name: "视频监控", id: "5feawfwa111111efwa57", }, - { + /* { url: "/visual/ai/renliu", name: "人流数据", id: "5fwaefwae222112fawef58", @@ -312,10 +312,10 @@ router.beforeEach((to, from, next) => { url: "/visual/ai/gongdan", name: "工单数据", id: "fewafwafewaefddd", - }, + },*/ { url: "/visual/ai/yujing", - name: "预警事件", + name: "预警分析", id: "545345fdsfs", }, ], From 3026a86c30fde226942ff49940387c7b2e95eede Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 09:46:20 +0800 Subject: [PATCH 05/15] =?UTF-8?q?Revert=20"=E5=B8=82=E5=8C=97=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=20=E5=AE=89=E9=98=B2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 12125fd9 --- src/router/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index cfb465fb..a17e7586 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -299,10 +299,10 @@ router.beforeEach((to, from, next) => { children: [ { url: "/visual/ai/index", - name: "视频监控", + name: "AI安防", id: "5feawfwa111111efwa57", }, - /* { + { url: "/visual/ai/renliu", name: "人流数据", id: "5fwaefwae222112fawef58", @@ -321,10 +321,10 @@ router.beforeEach((to, from, next) => { url: "/visual/ai/gongdan", name: "工单数据", id: "fewafwafewaefddd", - },*/ + }, { url: "/visual/ai/yujing", - name: "预警分析", + name: "预警事件", id: "545345fdsfs", }, ], From 4e483dd60fb574133228d52da522e395f77d098f Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Sat, 19 Mar 2022 09:46:20 +0800 Subject: [PATCH 06/15] Merge branch 'master' into shibei_master --- src/router/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index cfb465fb..a17e7586 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -299,10 +299,10 @@ router.beforeEach((to, from, next) => { children: [ { url: "/visual/ai/index", - name: "视频监控", + name: "AI安防", id: "5feawfwa111111efwa57", }, - /* { + { url: "/visual/ai/renliu", name: "人流数据", id: "5fwaefwae222112fawef58", @@ -321,10 +321,10 @@ router.beforeEach((to, from, next) => { url: "/visual/ai/gongdan", name: "工单数据", id: "fewafwafewaefddd", - },*/ + }, { url: "/visual/ai/yujing", - name: "预警分析", + name: "预警事件", id: "545345fdsfs", }, ], From 39f772a01529c30a71a4ca63952d2eb71b7c0a71 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 19 Mar 2022 13:09:39 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/assets/scss/pages/caiji.scss | 2 +- src/views/pages/caiji.vue | 304 +++++++++++++++++++++++-------- 3 files changed, 230 insertions(+), 80 deletions(-) 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/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss index 517eff61..8526f6e8 100644 --- a/src/assets/scss/pages/caiji.scss +++ b/src/assets/scss/pages/caiji.scss @@ -15,7 +15,7 @@ .content { border-radius: 5px; - background-border: 5px; + background-color: rgba(255, 255, 255, 0.787); .member_title { diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index c87e77ea..9c8fc74e 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -9,7 +9,7 @@ - {{shequName}} + {{shequName}}
@@ -18,7 +18,7 @@ {{selCommunity.label}} + v-if="selVillage">{{selVillage.label}} 请选择
@@ -28,7 +28,7 @@ {{selBuilding.label}} + v-if="selBuild">{{selBuild.label}} 请选择
@@ -49,7 +49,7 @@ :disableClear="true" label="单元号" placeholder="请输入" - v-model="formData.unitContent"> + v-model="unitContent">
{{selRoom.label}} + v-if="selHome">{{selHome.label}} 请选择
- + v-model="homeContent">
@@ -76,7 +76,7 @@ :disableClear="true" label="详细地址" placeholder="请输入" - v-model="address"> + v-model="formData.address">
@@ -86,7 +86,7 @@ {{selRoomType.label}} + v-if="selHomeType">{{selHomeType.label}} 请选择
@@ -162,6 +162,7 @@
提交
@@ -195,10 +196,13 @@ let loading // 加载动画 export default { data () { return { + btnDisabled: false, popupVisible: false, - shequName: '其他小区', - shequId: '6e511da6816e53af4cda952365a26eb9',//德兴路 1202807601961984002 - showAddressField: false,//是否显示其他 + + //二维码带来数据 + shequId: '',//社区id 6e511da6816e53af4cda952365a26eb9 德兴路 1202807601961984002 + shequName: '',//社区名称 + customerId: '',//客户id 45687aa479955f9d06204d415238f7cc communityList: [], buildingList: [], @@ -208,23 +212,20 @@ export default { pickerData: [], selObj: {}, - selCommunity: null, - selBuilding: null, + selVillage: null, + selBuild: null, selUnit: null, - selRoom: null, - selRoomType: null, - + selHome: null, + selHomeType: null, + unitContent: '', + homeContent: '',////选择其他时，输入的值 formData: { origin: '',//兴德路社区：internal;其他社区：external villageId: '',//小区id；外部不显示此组件；如果是内部必填。用户选择其他，可以自己输入，前端把输入的内容放在这个字段即可 - villageContent: '', buildId: '',//楼栋id；外部不显示此组件；如果是内部必填，用户选择其他，可以自己输入，前端把输入的内容放在这个字段即可 - buildContent: '', unitId: '',//单元id；外部不显示磁组件。如果是内部必填。用户可以选择其他，自己输入，前端把输入的内容放在这个字段即可 - unitContent: '',//选择其他时，输入的值 homeId: '',//房屋id；外部不展示此组件。如果是内部必填。用户选择其他，可以自己输入，前端把输入的内容放在这个字段即可 - homeContent: '',////选择其他时，输入的值 address: '',//外部：用户自己输入；内部：把小区名楼栋名单元名房屋名拼接起来。例如：绿地望海领域10号楼一单元101 houseType: '',//1自由0租住 houseHolderName: '',//户主姓名 @@ -248,15 +249,13 @@ export default { } ], - - roomTypeList: [ { value: '1', label: '自有' }, { - value: '2', + value: '0', label: '租住' }, ], @@ -274,7 +273,7 @@ export default { }, { label: '未接种', - value: '3' + value: '0' }, ], @@ -293,17 +292,35 @@ export default { }, created () { }, mounted () { - if (this.shequId === '6e511da6816e53af4cda952365a26eb9') { + console.log(this.$route) + + this.shequId = this.$route.params.id + this.customerId = this.$route.query.customerId + this.shequName = this.$route.query.name + + let envShow = process.env.VUE_APP_NODE_ENV + + let internalShequId = '' + if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 + internalShequId = '6e511da6816e53af4cda952365a26eb9' + } else if (envShow === 'prod:uat') { // 体验 + internalShequId = '6e511da6816e53af4cda952365a26eb9' + } else if (envShow === 'prod') { // 生产 + internalShequId = '1202807601961984002' + } + + this.formData.customerId = this.customerId + if (this.shequId === internalShequId) { this.formData.origin = 'internal' } else { this.formData.origin = 'external' } - this.loadCommunity() + this.loadVillage() this.detNumList = [] - for (let i = 0; i < 11; i++) { + for (let i = 1; i < 11; i++) { let obj = { value: i + '', - label: i + '', + label: i + '次', } this.detNumList.push(obj) } @@ -339,7 +356,7 @@ export default { }, //根据社区id获取小区列表 - async loadCommunity () { + async loadVillage () { const url = "/gov/org/icneighborhood/open/list" let params = { @@ -362,15 +379,18 @@ export default { this.popupSlots = [] this.popupSlots.push(obj) } else { - this.$message.error(msg) + Toast({ + message: msg, + duration: 3000 + }); } }, //获取楼宇列表 - async loadBuilding () { + async loadBuild () { const url = "/gov/org/icbuilding/buildingoption" let params = { - neighborHoodId: this.selCommunity.value + neighborHoodId: this.selVillage.value } const { data, code, msg } = await requestPost(url, params) @@ -388,7 +408,10 @@ export default { this.popupSlots = [] this.popupSlots.push(obj) } else { - this.$message.error(msg) + Toast({ + message: msg, + duration: 3000 + }); } }, //获取单元列表 @@ -396,7 +419,7 @@ export default { const url = '/gov/org/icbuildingunit/unitoption' let params = { - buildingId: this.selBuilding.value + buildingId: this.selBuild.value } const { data, code, msg } = await requestPost(url, params) @@ -418,15 +441,18 @@ export default { this.popupSlots = [] this.popupSlots.push(obj) } else { - this.$message.error(msg) + Toast({ + message: msg, + duration: 3000 + }); } }, //获取房间列表 - async loadRoom () { + async loadHome () { const url = "/gov/org/ichouse/houseoption" let params = { - buildingId: this.selBuilding.value, + buildingId: this.selBuild.value, unitId: this.selUnit.value } @@ -449,7 +475,10 @@ export default { this.popupSlots = [] this.popupSlots.push(obj) } else { - this.$message.error(msg) + Toast({ + message: msg, + duration: 3000 + }); } }, @@ -460,10 +489,10 @@ export default { } if (selType === 'building') { - if (!this.selCommunity) { + if (!this.selVillage) { Toast({ message: '请先选择小区', - duration: 5000 + duration: 3000 }); return false } else { @@ -473,10 +502,10 @@ export default { } if (selType === 'unit') { - if (!this.selBuilding) { + if (!this.selBuild) { Toast({ message: '请先选择楼宇', - duration: 5000 + duration: 3000 }); return false } else { @@ -488,7 +517,7 @@ export default { if (!this.selUnit) { Toast({ message: '请先选择单元', - duration: 5000 + duration: 3000 }); return false } else { @@ -509,47 +538,179 @@ export default { this.pickerData = this.detConditionList } - let obj = { values: this.pickerData } this.popupSlots = [] this.popupSlots.push(obj) - this.popupVisible = !this.popupBuildingVisibl + this.popupVisible = !this.popupVisible }, - handleSubmit () { + async handleSubmit () { + + let message = this.validataFormData() + if (message) { + Toast({ + message: message, + duration: 3000 + }); + return false + } + + if (this.formData.origin === 'internal') { - this.formData.address = this. -} + + this.formData.villageId = this.selVillage.value + this.formData.buildId = this.selBuild.value + if (this.selUnit.value === 'else') { + this.formData.unitId = this.unitContent + this.formData.homeId = this.homeContent//没有选择房屋，不存在这个对象，直接赋值 + } else { + this.formData.unitId = this.selUnit.value + this.unitContent = this.selUnit.label + + if (this.selHome.value === 'else') { + this.formData.homeId = this.homeContent + } else { + this.formData.homeId = this.selHome.value + this.homeContent = this.selHome.label + } + } + this.formData.address = this.selVillage.label + this.selBuild.label + this.unitContent + this.homeContent + } + + this.formData.houseType = this.selHomeType.value + + this.memberList.forEach(element => { + element.customerId = this.customerId + if (element.selDetNum && element.selDetNum.value) { + element.heSuanCount = element.selDetNum.value + } + if (element.selDetCondition && element.selDetCondition.value) { + element.ymjz = element.selDetCondition.value + } + + }); this.formData.memberList = this.memberList + console.log(this.formData) + this.btnDisabled = true + const url = "/epmetuser/icresicollect/save" + + const { data, code, msg } = await requestPost(url, this.formData) + + if (code === 0) { + Toast({ + message: '提交成功', + duration: 3000 + }); + this.btnDisabled = false + } else { + Toast({ + message: msg, + duration: 3000 + }); + this.btnDisabled = false + } + }, + + //必填验证 + validataFormData () { + + let message = '' + if (this.formData.origin === 'internal') {//内部 + + if (!this.selVillage) { + message = '请选择小区' + return message + } + if (!this.selBuild) { + message = '请选择楼栋' + return message + } + + if (!this.selUnit) {//没有选择单元 + message = '请选择单元' + return message + + } else {//选择了单元 + if (this.selUnit.value === 'else') {//单元选择了其他 + if (!this.unitContent) { + message = '请填写单元号' + return message + } + + if (!this.homeContent) {//房屋必须填写内容 + message = '请填写房屋' + return message + } + + } else {//单元没有选择其他 + if (!this.selHome) { + message = '请选择房屋' + return message + + } else if (this.selHome.value === 'else' && !this.homeContent) { + message = '请填写房屋' + return message + } + } + + } + + + } else { + if (!this.formData.address) { + message = '请填写地址' + return message + } + } + + if (!this.selHomeType) { + message = '请选择房屋类型' + return message + } + if (!this.formData.houseHolderName) { + message = '请填写户主姓名' + return message + } + let member = this.memberList[0] + + for (let i = 0; i < this.memberList.length; i++) { + let item = this.memberList[i] + if (!item.name || !item.mobile || !item.idNum || !item.selDetNum.value || !item.selDetCondition.value) { + message = '请完整填写用户' + (i + 1) + '信息' + return message + } + } + + }, popupOk () { if (this.selType === 'community') { - this.selCommunity = this.selObj - this.formData.villageContent = this.selObj.label - this.formData.villageId = this.selObj.value + this.selVillage = this.selObj - this.selBuilding = null + + + this.selBuild = null this.selUnit = null - this.selRoom = null + this.selHome = null this.formData.unitContent = '' this.formData.homeContent = '' - this.loadBuilding() + this.loadBuild() } if (this.selType === 'building') { - this.selBuilding = this.selObj + this.selBuild = this.selObj this.formData.buildContent = this.selObj.label this.formData.buildId = this.selObj.value this.selUnit = null - this.selRoom = null + this.selHome = null this.formData.unitContent = '' this.formData.homeContent = '' this.loadUnit() @@ -558,32 +719,22 @@ export default { if (this.selType === 'unit') { this.selUnit = this.selObj + this.selHome = null + this.unitContent = '' + this.homeContent = '' - - this.selRoom = null - this.formData.unitContent = '' - this.formData.homeContent = '' - if (this.selUnit && this.selUnit.value === 'else') { - this.showAddressField = true - } else { - this.showAddressField = false - } - this.loadRoom() + this.loadHome() } if (this.selType === 'room') { - this.selRoom = this.selObj + this.selHome = this.selObj + + this.homeContent = '' - this.formData.homeContent = '' - if (this.selRoom && this.selRoom.value === 'else') { - this.showAddressField = true - } else { - this.showAddressField = false - } } if (this.selType === 'roomType') { - this.selRoomType = this.selObj + this.selHomeType = this.selObj } if (this.selType === 'detNum') { @@ -591,8 +742,7 @@ export default { let change = this.memberList[this.selMemberIndex] change.selDetNum = this.selObj this.$set(this.memberList, this.selMemberIndex, change) - // this.selMemberIndex = index - // this.pickerData = this.detNumList + } if (this.selType === 'detCondition') { let change = this.memberList[this.selMemberIndex] From 2714ba08301dcd15bd052a5f55ae55b8efa91f87 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 19 Mar 2022 13:16:09 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index 9c8fc74e..7cf1b153 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -302,7 +302,7 @@ export default { let internalShequId = '' if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 - internalShequId = '6e511da6816e53af4cda952365a26eb9' + internalShequId = null } else if (envShow === 'prod:uat') { // 体验 internalShequId = '6e511da6816e53af4cda952365a26eb9' } else if (envShow === 'prod') { // 生产 @@ -310,7 +310,7 @@ export default { } this.formData.customerId = this.customerId - if (this.shequId === internalShequId) { + if (!this.internalShequId || this.shequId === internalShequId) { this.formData.origin = 'internal' } else { this.formData.origin = 'external' From 178fb48156255b729764271779fdc879f2f7c4cd Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 19 Mar 2022 15:35:13 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E9=87=87=E9=9B=86=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index c8eb853e..2961eea4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -170,6 +170,9 @@ const router = new Router({ router.beforeEach((to, from, next) => { // 添加动态(菜单)路由 // 已添加或者当前路由为页面路由, 可直接访问 + if(to.name==='caiji'){ + return next(); + } if ( window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || fnCurrentRouteIsPageRoute(to, pageRoutes) From 4a2ee709a99d89bdfde272df75c7989e543c8a14 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 19 Mar 2022 16:07:02 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=85=B4=E5=BE=B7=E8=B7=AF=E7=A4=BE=E5=8C=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index 7cf1b153..214db21f 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -299,18 +299,19 @@ export default { this.shequName = this.$route.query.name let envShow = process.env.VUE_APP_NODE_ENV + console.log('环境', envShow) - let internalShequId = '' - if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 - internalShequId = null - } else if (envShow === 'prod:uat') { // 体验 - internalShequId = '6e511da6816e53af4cda952365a26eb9' - } else if (envShow === 'prod') { // 生产 - internalShequId = '1202807601961984002' - } + let internalShequId = '1202807601961984002' + // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 + // internalShequId = null + // } else if (envShow === 'prod:uat') { // 体验 + // internalShequId = '6e511da6816e53af4cda952365a26eb9' + // } else if (envShow === 'prod') { // 生产 + // internalShequId = '1202807601961984002' + // } this.formData.customerId = this.customerId - if (!this.internalShequId || this.shequId === internalShequId) { + if (this.shequId === internalShequId) { this.formData.origin = 'internal' } else { this.formData.origin = 'external' From 0c4572906a0eeab235eb83bcb0074ad324bba47c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 19 Mar 2022 17:35:17 +0800 Subject: [PATCH 11/15] 111 --- src/assets/scss/pages/caiji.scss | 6 +- src/views/pages/caiji.vue | 99 +++++++++++++++++++++----------- 2 files changed, 70 insertions(+), 35 deletions(-) diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss index 8526f6e8..dede8360 100644 --- a/src/assets/scss/pages/caiji.scss +++ b/src/assets/scss/pages/caiji.scss @@ -1,5 +1,5 @@ .bg-app { - background-color: rgba(218, 218, 218, 0.89); + background-color: rgba(189, 214, 255, 0.89); height: 100%; width: 100vw; padding: 20px; @@ -37,6 +37,10 @@ padding-bottom: 20px; display: flex; justify-content: center; + + .btn { + width: 100px; + } } } diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index 214db21f..40235d96 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -99,14 +99,23 @@ v-model="formData.houseHolderName">
- + + {{selTotalResi.label}} + 请选择 + + + + @@ -162,6 +171,7 @@
提交
@@ -217,6 +227,10 @@ export default { selUnit: null, selHome: null, selHomeType: null, + selTotalResi: { + label: '4人', + value: 4 + }, unitContent: '', homeContent: '',////选择其他时，输入的值 @@ -229,7 +243,7 @@ export default { address: '',//外部：用户自己输入；内部：把小区名楼栋名单元名房屋名拼接起来。例如：绿地望海领域10号楼一单元101 houseType: '',//1自由0租住 houseHolderName: '',//户主姓名 - totalResi: 1,//居住成员人数 + totalResi: 4,//居住成员人数 customerId: '',//customerId }, @@ -246,7 +260,8 @@ export default { ymjz: '', selDetNum: {}, selDetCondition: {} - } + }, + ], roomTypeList: [ @@ -259,7 +274,7 @@ export default { label: '租住' }, ], - + totalResiList: [], detNumList: [],//参加核酸次数list detConditionList: [//参加核酸类型list { @@ -325,36 +340,20 @@ export default { } this.detNumList.push(obj) } - }, - methods: { - bluraa () { - let objTemp = { - name: '', - mobile: '', - idNum: '', - heSuanCount: 0, - ymjz: '', - selDetNum: {}, - customerId: '', - selDetCondition: {} + for (let i = 1; i < 9; i++) { + let obj = { + value: i, + label: i + '人', } + this.totalResiList.push(obj) + } - if (this.memberList.length > this.formData.totalResi) {//已有成员数量比设置的数量大，删除多余 - let differ = this.memberList.length - this.formData.totalResi - this.memberList.splice(this.formData.totalResi, differ) - } else if (this.memberList.length < this.formData.totalResi) {////已有成员数量比设置的数量小，补充空对象 - let differ = this.formData.totalResi - this.memberList.length - - for (let i = 0; i < differ; i++) { - let temp = JSON.parse(JSON.stringify(objTemp)) - this.memberList.push(temp) - } - } + this.bluraa() + }, + methods: { - console.log(this.memberList) - }, //根据社区id获取小区列表 async loadVillage () { @@ -527,6 +526,9 @@ export default { } + if (selType === 'totalResi') { + this.pickerData = this.totalResiList + } if (selType === 'roomType') { this.pickerData = this.roomTypeList } @@ -694,9 +696,6 @@ export default { popupOk () { if (this.selType === 'community') { this.selVillage = this.selObj - - - this.selBuild = null this.selUnit = null this.selHome = null @@ -729,9 +728,13 @@ export default { } if (this.selType === 'room') { this.selHome = this.selObj - this.homeContent = '' + } + if (this.selType === 'totalResi') { + this.selTotalResi = this.selObj + this.formData.totalResi = this.selObj.value + this.bluraa() } if (this.selType === 'roomType') { @@ -755,6 +758,34 @@ export default { }, + bluraa () { + let objTemp = { + name: '', + mobile: '', + idNum: '', + heSuanCount: 0, + ymjz: '', + selDetNum: {}, + customerId: '', + selDetCondition: {} + } + + if (this.memberList.length > this.formData.totalResi) {//已有成员数量比设置的数量大，删除多余 + let differ = this.memberList.length - this.formData.totalResi + this.memberList.splice(this.formData.totalResi, differ) + } else if (this.memberList.length < this.formData.totalResi) {////已有成员数量比设置的数量小，补充空对象 + let differ = this.formData.totalResi - this.memberList.length + + for (let i = 0; i < differ; i++) { + let temp = JSON.parse(JSON.stringify(objTemp)) + this.memberList.push(temp) + } + } + + + console.log(this.memberList) + }, + onPickerChange (picker, values) { this.selObj = values[0] From 0df2df67e24b977d1bdf72df40b2532ee73b7746 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 19 Mar 2022 17:40:12 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/communityTable.vue | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) 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 From 875e02a3d50194eaf1b22df3b149141b8e33ae0a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 19 Mar 2022 17:49:53 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/buttonstyle.scss | 14 ++++++++++++-- src/views/pages/caiji.vue | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) 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/views/pages/caiji.vue b/src/views/pages/caiji.vue index 40235d96..c19c93d6 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -75,7 +75,7 @@
From 8e9a6b08e0864ce67ef75cac0c509444f1b215d6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 21 Mar 2022 09:49:49 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=87=E9=9B=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 104 +++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 36 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index c19c93d6..d52b1599 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -201,6 +201,7 @@ import { requestPost } from "@/js/dai/request"; import { Toast } from "mint-ui"; +import { MessageBox } from 'mint-ui'; let loading // 加载动画 export default { @@ -247,6 +248,7 @@ export default { customerId: '',//customerId }, + showMessagsBox: false,//是否显示人员未填写提示弹出框 selMemberIndex: null, @@ -316,7 +318,7 @@ export default { let envShow = process.env.VUE_APP_NODE_ENV console.log('环境', envShow) - let internalShequId = '1202807601961984002' + let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',] // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 // internalShequId = null // } else if (envShow === 'prod:uat') { // 体验 @@ -326,7 +328,7 @@ export default { // } this.formData.customerId = this.customerId - if (this.shequId === internalShequId) { + if (internalShequId.indexOf(this.shequId) > -1) { this.formData.origin = 'internal' } else { this.formData.origin = 'external' @@ -551,17 +553,29 @@ export default { }, async handleSubmit () { - let message = this.validataFormData() + + if (message) { - Toast({ - message: message, - duration: 3000 - }); - return false + if (this.showMessagsBox) { + MessageBox.confirm(message).then(action => { + this.submit() + }); + } else { + Toast({ + message: message, + duration: 3000 + }); + } + } else { + this.submit() } + }, + async submit () { + + if (this.formData.origin === 'internal') { this.formData.villageId = this.selVillage.value @@ -619,45 +633,48 @@ export default { } }, + + //必填验证 validataFormData () { - let message = '' + let aletMessage = '' + this.showMessagsBox = false if (this.formData.origin === 'internal') {//内部 - if (!this.selVillage) { - message = '请选择小区' - return message + aletMessage = '请选择小区' + + return aletMessage } if (!this.selBuild) { - message = '请选择楼栋' - return message + aletMessage = '请选择楼栋' + return aletMessage } if (!this.selUnit) {//没有选择单元 - message = '请选择单元' - return message + aletMessage = '请选择单元' + return aletMessage } else {//选择了单元 if (this.selUnit.value === 'else') {//单元选择了其他 if (!this.unitContent) { - message = '请填写单元号' - return message + aletMessage = '请填写单元号' + return aletMessage } if (!this.homeContent) {//房屋必须填写内容 - message = '请填写房屋' - return message + aletMessage = '请填写房屋' + return aletMessage } } else {//单元没有选择其他 if (!this.selHome) { - message = '请选择房屋' - return message + aletMessage = '请选择房屋' + return aletMessage } else if (this.selHome.value === 'else' && !this.homeContent) { - message = '请填写房屋' - return message + aletMessage = '请填写房屋' + return aletMessage } } @@ -666,29 +683,44 @@ export default { } else { if (!this.formData.address) { - message = '请填写地址' - return message + aletMessage = '请填写地址' + return aletMessage } } if (!this.selHomeType) { - message = '请选择房屋类型' - return message + aletMessage = '请选择房屋类型' + return aletMessage } if (!this.formData.houseHolderName) { - message = '请填写户主姓名' - return message + aletMessage = '请填写户主姓名' + return aletMessage + } + let member1 = this.memberList[0] + + + if (!member1.name || !member1.mobile || !member1.idNum || !member1.selDetNum.value || !member1.selDetCondition.value) { + aletMessage = '请完整填写用户1信息' + return aletMessage } - let member = this.memberList[0] - for (let i = 0; i < this.memberList.length; i++) { + + for (let i = 1; i < this.memberList.length; i++) { let item = this.memberList[i] - if (!item.name || !item.mobile || !item.idNum || !item.selDetNum.value || !item.selDetCondition.value) { - message = '请完整填写用户' + (i + 1) + '信息' - return message + + if (item.name || item.mobile || item.idNum || item.selDetNum.value || item.selDetCondition.value) {//填写了信息的，必须填写姓名身份证 + if (!item.name || !item.idNum) { + aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息' + return aletMessage + } + } else { + aletMessage = '用户' + (i + 1) + '的信息没有填写，是否继续' + this.showMessagsBox = true + return aletMessage + } - } + } }, From ea4c0d8e6b8da2cb683adcdab65e11847c7a0ca3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 21 Mar 2022 10:28:59 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/caiji.scss | 37 ++++++++++++++- src/router/index.js | 9 ++++ src/views/pages/caiji.vue | 40 ++++++++++++---- src/views/pages/caijisuccess.vue | 78 ++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+), 12 deletions(-) create mode 100644 src/views/pages/caijisuccess.vue diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss index dede8360..8dafd6eb 100644 --- a/src/assets/scss/pages/caiji.scss +++ b/src/assets/scss/pages/caiji.scss @@ -1,4 +1,4 @@ -.bg-app { +.bg-caiji { background-color: rgba(189, 214, 255, 0.89); height: 100%; width: 100vw; @@ -39,7 +39,8 @@ justify-content: center; .btn { - width: 100px; + width: 150px; + font-size: 16px; } } } @@ -47,3 +48,35 @@ .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/router/index.js b/src/router/index.js index 2961eea4..8b2d8ab6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,6 +53,15 @@ export const pageRoutes = [ title: "居民信息填报", }, }, + { + path: "/caijisuccess", + props: true, + name: "caijisuccess", + component: () => import("@/views/pages/caijisuccess"), + meta: { + title: "居民信息填报", + }, + }, ]; // 模块路由(基于主入口布局页面) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index d52b1599..be259c60 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -1,5 +1,5 @@