From 132a880b5868cdfa407ce6ce16b633eea4825cb7 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 6 Jan 2023 09:43:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/renfang/cpts/fwgl.vue | 21 +++++++++++++++++++++ src/views/dataBoard/renfang/cpts/jmgl.vue | 21 +++++++++++++++++++++ src/views/dataBoard/renfang/cpts/rkfx.vue | 21 +++++++++++++++++++++ src/views/dataBoard/renfang/cpts/rkyj.vue | 21 +++++++++++++++++++++ src/views/dataBoard/renfang/index.vue | 22 +++++++++++++++++----- 5 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 src/views/dataBoard/renfang/cpts/fwgl.vue create mode 100644 src/views/dataBoard/renfang/cpts/jmgl.vue create mode 100644 src/views/dataBoard/renfang/cpts/rkfx.vue create mode 100644 src/views/dataBoard/renfang/cpts/rkyj.vue diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue new file mode 100644 index 000000000..edaf98176 --- /dev/null +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue new file mode 100644 index 000000000..edaf98176 --- /dev/null +++ b/src/views/dataBoard/renfang/cpts/jmgl.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue new file mode 100644 index 000000000..edaf98176 --- /dev/null +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/dataBoard/renfang/cpts/rkyj.vue b/src/views/dataBoard/renfang/cpts/rkyj.vue new file mode 100644 index 000000000..edaf98176 --- /dev/null +++ b/src/views/dataBoard/renfang/cpts/rkyj.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 93224e2ef..8fcdab663 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -10,7 +10,9 @@
房屋概览
-
+
+ +
@@ -22,7 +24,9 @@
居民概览
-
+
+ +
@@ -156,7 +160,9 @@
人口分析
-
+
+ +
@@ -168,7 +174,9 @@
人口预警
-
+
+ +
@@ -176,11 +184,15 @@ diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 361b9b87a..0817ab73d 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -17,13 +17,7 @@ --> - + + - - 查看 + 迁出登记 - 编辑 + 死亡登记 + size="small"> 登记 @@ -450,7 +456,9 @@ export default { editTableName: {}, formName: "", formList: [], - tableHeader: [], + tableHeader: [ + {columnName:'name',label:'姓名'}, {columnName:'birthday',label:'生日'},{columnName:'gender',label:'性别'},{columnName:'gridName',label:'所属网格'},{columnName:'homeName',label:'所属房屋'},{columnName:'idNum',label:'证件号'},{columnName:'mobile',label:'联系电话'} + ], tabsList: [], selection: [], @@ -489,8 +497,6 @@ export default { let query = this.$route.query; this.defaultCategotyKey = query.columnName; console.log("defaultCategotyKey----", this.defaultCategotyKey); - await this.getSearchList(); - this.$refs.resiSearch.handleSearch(); } }, computed: { @@ -509,20 +515,14 @@ export default { this.defaultCategotyKey = query.columnName; } - await this.getSearchList(); // await this.getFormList() - await this.getTableHeader(); - // console.log('this.$refs.resiSearch', this) - this.$refs.resiSearch.handleSearch(); - // this.handleSearch() - // this.getTableData() + // console.log('this.$refs.resiSearch', this) + this.getTableData() this.pageLoading = true; - this.searchH = this.$refs.resiSearch.$el.offsetHeight; console.log("storeoooo----0000", this.$store); - console.log("resiSearch", this.$refs.resiSearch.$el.offsetHeight); }, async mounted () { // this.$nextTick(() => { @@ -706,31 +706,12 @@ export default { return _val || row[item.columnName]; }, - handleSearchFrom () { - let arr = []; - this.searchList.forEach((item) => { - const arr1 = - this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch(); - arr = arr.concat(arr1); - // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`]) - }); - console.log("search-----refs", this.$refs); - console.log("search-----arr", arr); - this.currentPage = 1; - this.conditions = arr; - this.getTableData(); - }, - handleSearch (val) { - console.log("searchhh--", val); - this.currentPage = 1; - this.conditions = val; - this.getTableData(); - }, + + resetSearchForm (formName) { // for(const n in this.form) { // this.form[n] = '' // } - // this.handleSearch() this.searchList.forEach((item) => { this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm(); // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`]) @@ -1057,12 +1038,35 @@ export default { const arr = await this.formetForm(); if (arr) this.submitEdit(arr); }, + async handleSUbmit () { + this.$refs.baseForm.submit_from() + for (const key of this.$refs.baseForm) { + if(typeof key == "Object"){ + console.log(key); + } + } // console.log(this,$refs.baseForm); // const arr = await this.formetForm(); - // if (arr) this.submitAdd(arr); - this.dialogVisible = false; - + + // this.$refs.baseForm.tabsList.forEach(item=>{ + // if(item.id){ + // console.log(item.id); + // } + // }) + // console.log(this.$refs.baseForm.tabsList); + // if(this.$refs.baseForm.form.hobbyInfoDto.hobbyCode.length != 0 || this.$refs.baseForm.form.volunteerDto.volunteerCategory.length != 0 ||this.$refs.baseForm.form.specialDto.specialCategoryCode.length != 0){ + // this.$refs.baseForm.form.hobbyInfoDto.hobbyCode = this.$refs.baseForm.form.hobbyInfoDto.hobbyCode.join(',') + // this.$refs.baseForm.form.volunteerDto.volunteerCategory = this.$refs.baseForm.form.volunteerDto.volunteerCategory.join(',') + // this.$refs.baseForm.form.specialDto.specialCategoryCode = this.$refs.baseForm.form.specialDto.specialCategoryCode.join(',') + // }else { + // this.$refs.baseForm.form.hobbyInfoDto.hobbyCode = '' + // this.$refs.baseForm.form.volunteerDto.volunteerCategory='' + // this.$refs.baseForm.form.specialDto.specialCategoryCode = '' + // } + // this.submitAdd(this.$refs.baseForm.form); + console.log(this.$refs.baseForm.form); + // this.dialogVisible = false; }, handleDel (row) { let params = { @@ -1107,24 +1111,21 @@ export default { async submitAdd (arr) { this.btnLoading = true; await this.$http - .post("/epmetuser/icresiuser/add", arr) + .post("/actual/base/residentBaseInfo/save", arr) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); } else { this.$message.success("提交成功"); // this.$refs[formName].resetFields(); - this.$refs.baseForm.resetForm(); - this.tabsList.forEach((item) => { - this.$refs["group" + item.groupId][0].resetForm(); - }); - this.getTableData(); + this.dialogVisible = false; } }) .catch(() => { return this.$message.error("网络错误"); }); + // console.log(this.$refs.baseForm.form); this.btnLoading = false; }, async submitEdit (arr) { @@ -1150,71 +1151,21 @@ export default { }); this.btnLoading = false; }, - async getTableHeader () { - await this.$http - .post("/oper/customize/icform/tableheaders", { - formCode: "resi_base_info", - }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.tableHeader = res.data; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); - }, async getTableData () { - this.tableLoading = true; - // console.log(this.conditions); - // if(this.conditions.columnName){ - // columnValue - // } - // var index = this.conditions.findIndex(item=>item.columnName === 'BIRTHDAY' ) - // this.conditions.filter(item=>{ - // if(item.columnName === "BIRTHDAY") { - // console.log(this.$refs.resiSearch.endPickerTime); - // item.columnValue = [this.$refs.resiSearch.endPickerTime,this.$refs.resiSearch.startPickerTime] - // } - // }) - // console.log(this.conditions); - let timer = this.$refs.resiSearch.handelWatchStartDate() - - console.log(timer, '派发'); - let params = { - formCode: "resi_base_info", - pageNo: this.currentPage, - pageSize: this.pageSize, - conditions: this.conditions, + try { + let params = { + pageNo: this.currentPage, + pageSize: this.pageSize, }; - await this.$http - .post("/epmetuser/icresiuser/listresi", params) - .then(({ data: res }) => { - - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.tableData = res.data.list.map((item) => { - return { - ...item, - isChecked: this.filterEdit(item.ORG_ID), - }; - }); - let _selAllFlagDisabled = true; - this.tableData.forEach((item) => { - if (item.isChecked) _selAllFlagDisabled = false; - }); - this.selAllFlagDisabled = _selAllFlagDisabled; - this.total = res.data.total; - } - }) - .catch(() => { - console.log(this.conditions); - return this.$message.error("网络错误"); - - }); + // this.tableLoading = true; + const { data } = await this.$http.post("/actual/base/residentBaseInfo/page", params) + this.tableData =data.data.list + console.log(this.tableData); + console.log(data,'data'); + } catch (error) { + console.log(error); + } + this.tableLoading = false; }, getrowInfo (id) { @@ -1312,48 +1263,7 @@ export default { }); return options; }, - async getSearchList () { - // /oper/customize/icform/conditionlist - await this.$http - .post("/oper/customize/icform/conditionlist-bygroup", { - formCode: "resi_base_info", - dynamic: true, - }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - console.log("获取查询详情成功--sss", res); - - res.data.forEach((item) => { - item.queryItemList.forEach((n) => { - if (n.optionSourceType === "remote") { - this.getOptionsList(n.optionSourceValue).then((res) => { - n.options = this.getTreeData(res); - }); - // console.log('') - } else if (n.itemType == "radio" && n.options.length == 0) { - n.options = [ - { - label: "是", - value: "1", - }, - { - label: "否", - value: "0", - }, - ]; - } - }); - }); - this.searchList = res.data; - console.log(this.searchList); - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); - }, + getTreeData (data) { if (!Array.isArray(data)) return []; let arr = data.map((item) => { From df1617a8be076419a077edf81224beb892041b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=AD=81?= <2403457699@qq.com> Date: Fri, 6 Jan 2023 10:16:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index c26b481d7..5db66bc54 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://192.168.1.144/api # VUE_APP_API_SERVER = http://118.190.150.119:41080/api # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api From 93bb2bcd017b66cb5135d52974f3b1fa31c6a559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=AD=81?= <2403457699@qq.com> Date: Fri, 6 Jan 2023 10:47:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/management/list-main.scss | 4 +++- src/views/modules/base/resi.vue | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 00bfa22b9..1c9e5fd72 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -225,7 +225,9 @@ .f-right8 { margin-right: 8px !important; } - +.f-right10 { + margin-right: 10px !important; +} .f-margin30 { margin: 30px; } diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 0817ab73d..ecdd71d17 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -181,12 +181,17 @@ size="small" @click="handleLook(scope.row)">查看 编辑 - 登记 + + + 登记 + + + 死亡登记 + 迁出登记 + + @@ -549,6 +554,9 @@ export default { }); } }, + handelRegister(row){ + console.log(row); + }, reportForm () { this.$refs.baobiao.init({ elseParams: { @@ -914,6 +922,7 @@ export default { console.log(tab, event); }, async handleLook (row) { + console.log(); this.lookInfo.userId = row.icResiUserId; this.lookInfo.gridName = row.GRID_ID; this.showedPeopleMoreInfo = true;