From 88487c54998523a9d4574e2d57cf4f1b9a193255 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 17 May 2022 17:07:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/huji/immigration/edit.vue | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue index 8cf1a260..2999880c 100644 --- a/src/views/modules/base/huji/immigration/edit.vue +++ b/src/views/modules/base/huji/immigration/edit.vue @@ -142,14 +142,23 @@ > - 享受福利 + 享受福利 + + 补充居民信息 @@ -421,7 +430,8 @@ export default { lazy: true, lazyLoad: this.lzayLoadArea }, - userInfo: {} + userInfo: {}, + initCheck: null } }, components: {}, @@ -777,6 +787,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { this.fmData = { ...data } + this.initCheck = data.isCheck this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',') } else this.$message.error(msg) }, From 5c80a92076335268f75ad3771d0972ec49b16423 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 18 May 2022 09:53:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=80=E6=88=B7=E4=B8=80=E6=A1=A3?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 2 +- .../modules/base/community/roomTable.vue | 47 +++++++++++++------ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 01f94046..7ba9c649 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -210,7 +210,7 @@ export default { this.showRoomTable = true this.$nextTick(() => { - this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag) + this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj) }) } else { this.$message.warning('请输入查询条件') diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index a3b8a17a..a866b6f3 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -209,9 +209,7 @@ export default { // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的小区对象 - ownerName: '', - ownerPhone: '', - rentFlag: '', + validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 selection: [], @@ -262,13 +260,13 @@ export default { return index + 1; }, handleSortOrderChange (value) { - console.log(value.column, value.prop, value.order) + this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.loadTable() }, handleSortChange (value) { - console.log(value.column, value.prop, value.order) + this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.loadTable() @@ -283,7 +281,7 @@ export default { async handleChangeSort (row, index) { // row.isChange = false - console.log(row.sort) + let params = { id: row.houseId, sort: row.sort, @@ -323,7 +321,7 @@ export default { }, - async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) { + async loadTable (source, treeObj) { this.source = source this.tableLoading = true @@ -331,14 +329,10 @@ export default { if (source === 'tree') {//来源于tree，查询数据清空 this.sortType = 'asc' this.agencyObj = treeObj - this.ownerName = null - this.ownerPhone = null - this.rentFlag = null + } else if (source === 'search') {//来源于查询 this.agencyObj = treeObj - this.ownerName = ownerName - this.ownerPhone = ownerPhone - this.rentFlag = rentFlag + } // if (fromTree) { @@ -403,7 +397,7 @@ export default { this.formTitle = '新增房屋' this.formShow = true this.$nextTick(() => { - console.log(this.agencyObj) + this.$refs.ref_form.initForm('add', null, this.agencyObj) }) }, @@ -618,16 +612,39 @@ export default { let url = "/gov/org/house/exportHouseUser" + let params = { agencyId: '', gridId: '', ownerName: this.ownerName, ownerPhone: this.ownerPhone, rentFlag: this.rentFlag, - buildingId: this.agencyObj.id + buildingId: '', + neighborHoodId: '' } + if (this.agencyObj.level === 'grid') { + params.gridId = this.agencyObj.id + params.agencyId = '' + params.buildingId = '' + params.neighborHoodId = '' + } else if (this.agencyObj.level === 'neighborHood') { + params.neighborHoodId = this.agencyObj.id + params.agencyId = '' + params.buildingId = '' + params.gridId = '' + } else if (this.agencyObj.level === 'building') { + params.buildingId = this.agencyObj.id + params.agencyId = '' + params.neighborHoodId = '' + params.gridId = '' + } else { + params.agencyId = this.agencyObj.id + params.buildingId = '' + params.neighborHoodId = '' + params.gridId = '' + } app.ajax.exportFilePost( url, From 7281e331f12a8371521e9905ee20b7df7b9678d1 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 15:56:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/event/cpts/event-detail.vue | 4 +- .../modules/shequzhili/event/eventList.vue | 37 +++++++++++++++++-- .../shijianchuli/event-info.vue | 8 ++-- src/views/modules/visual/cpts/analyse.vue | 11 +++++- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 711f9416..2853aa23 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -31,9 +31,9 @@ class="info-prop"> 语音： diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 6c6621bf..caeede23 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -169,7 +169,8 @@ width="80" label="音频"> @@ -290,6 +291,30 @@ @dialogOk="handleEditSuccess" /> + +
+
+ + +
+
+ +
+ 取消 + +
+ + @@ -384,7 +409,8 @@ export default { eventDetailData: {}, - + showVoice: false, + selVoiceUrl: '', }; }, computed: { @@ -518,6 +544,11 @@ export default { } }, + //显示语音窗口 + handleShowVoice (url) { + this.selVoiceUrl = url + this.showVoice = true + }, handleClose () { this.pageType = "list"; diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index d2cf2695..704971b6 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -344,7 +344,7 @@ export default { //楼院小组、居民上报都存在是，研判分析显示两个分支 - this.yanPan.singleTitle = data.categoryName; + this.yanPan.singleTitle = data.sourceTypeName; this.yanPan.hasEvent = false; @@ -374,8 +374,8 @@ export default { this.yanPan.loading = true; if (code === 0) { let oneData = { - // categoryCode: 111, - // categoryName: 111, + categoryCode: this.yanPan.categoryCode, + categoryName: this.yanPan.categoryName, showItem: true, addressList: data.list.map((subItem) => { return { @@ -391,8 +391,6 @@ export default { singleList: [oneData] } - - this.yanPan = { ...this.yanPan, ...aaa }; console.log(this.yanPan); diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue index 84ee8006..4d9c5df6 100644 --- a/src/views/modules/visual/cpts/analyse.vue +++ b/src/views/modules/visual/cpts/analyse.vue @@ -2,7 +2,8 @@
-
+
(家属)
-
+
@@ -304,6 +306,7 @@ export default { }, created () { this.tempList = [...this.singleList] + console.log(this.tempList) }, methods: { @@ -494,6 +497,10 @@ export default { margin: 0 auto; } } + + // .cate-col { + // width: 250px; + // } .cate-col-w100 { width: 230px; .cate-list-w0 { From 739399dcd212397ac3d6f84d997b8ac86a757b2a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 16:26:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shijianchuli/event-info.vue | 19 ++++++++++++++++--- .../shijianchuli/shijianchulifenxi.vue | 2 +- src/views/modules/visual/cpts/analyse.vue | 18 +++++++++++------- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index 704971b6..e9781601 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -147,7 +147,9 @@ :singleList="yanPan.singleList" :hasEvent="yanPan.hasEvent" :bcLimit="yanPan.resiReportEventCount" - @user="toUserInfo" /> + :isUserClick="true" + @user="toUserInfo" + @toMiddleUserInfo="toMiddleUserInfo" />
+ class="analys-person analys-person_red">
{{userName}}
{{userTag}}
+ class="analys-person analys-person_orange">
{{userName}}
{{userTag}}
+ class="analys-person analys-person_yellow">
{{userName}}
{{userTag}}
@@ -172,7 +172,8 @@
-
+
@@ -422,17 +423,20 @@ export default { } } - .analys-person-orange { + .analys-person_orange { background: url("../../../../assets/img/shuju/measure/zhuhu_orange.png") no-repeat center; + background-size: cover; } - .analys-person-yellow { + .analys-person_yellow { background: url("../../../../assets/img/shuju/measure/zhuhu_yellow.png") no-repeat center; + background-size: cover; } - .analys-person-red { + .analys-person_red { background: url("../../../../assets/img/shuju/measure/zhuhu_red.png") no-repeat center; + background-size: cover; } .analys-cate { From e4f73d14b9cb307edaa957985990c7b5f1a8d24a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 17:29:48 +0800 Subject: [PATCH 5/6] 11 --- src/router/index.js | 30 +++++++++---------- .../shequzhili/event/cpts/process-form.vue | 3 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index f96f01b6..b3d6d94b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -313,11 +313,11 @@ router.beforeEach((to, from, next) => { name: "事件处理分析", id: "shijianchulifenxi", }, - { - url: "visual/communityGovern/processAnalyze", - name: "事件处置分析", - id: "processAnalyze", - }, + // { + // url: "visual/communityGovern/processAnalyze", + // name: "事件处置分析", + // id: "processAnalyze", + // }, { url: "/visual/communityGovern/shijianfenlei/shijianfenleifenxi", name: "事件分类分析", @@ -333,16 +333,16 @@ router.beforeEach((to, from, next) => { // name: "事件分类分析", // id: "typeAnalyze", // }, - { - url: "/visual/communityGovern/resibuzz", - name: "居民热议分析", - id: "resibuzz", - }, - { - url: "/visual/communityGovern/distributionAnalyze", - name: "事件分布分析", - id: "distributionAnalyze", - }, + // { + // url: "/visual/communityGovern/resibuzz", + // name: "居民热议分析", + // id: "resibuzz", + // }, + // { + // url: "/visual/communityGovern/distributionAnalyze", + // name: "事件分布分析", + // id: "distributionAnalyze", + // }, ], }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue index dcfa39a1..4f9e0701 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form.vue @@ -12,7 +12,8 @@ prop="operationType"> - 暂不处理 + 暂不处理 回复 立项 转服务 From 8ef38a8dcb4a846f82c54fca0cec2af3fcbd35d3 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 26 May 2022 09:20:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=9A=E5=85=83=E5=88=86=E6=9E=90dialog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duoyuanfuwu/duoyuanDialog.vue | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue index 3b26bcec..eef1de18 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue @@ -23,10 +23,7 @@