From 15ec56597c56277570449bfea6bad1b2dbf313ab Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 24 May 2022 13:34:25 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/xiangmu/cpts/project-info.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index 8bcc953cb..b0dd01ac2 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -685,12 +685,20 @@ export default { handleImgSuccess (res, file, fileList) { console.log("res.data.url", file); if (res.code === 0 && res.msg === "success") { - console.log("res.data.url", res.data.url); + let format = file.name.split(".").pop(); + let srcType = file.raw.type; + let type = 'file'; + console.log("==============================srcType: ", srcType); + if(srcType.indexOf('image')!=-1){ + type = 'image' + } else if(srcType.indexOf('video')!=-1){ + type = 'video' + } this.fmData.internalFile.push({ - format: file.name.split(".").pop(), + format, name: file.name, size: file.size, - type: file.raw.type, + type, url: res.data.url, }); console.log(this.fmData.internalFile); From d92c458b477b1afba0bd3d248a42e1eba4799054 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 24 May 2022 13:39:04 +0800 Subject: [PATCH 02/11] 11111 --- .../scss/modules/shequzhili/event-info.scss | 32 +++++++++++++++++-- .../modules/shequzhili/event/cpts/add.vue | 26 ++++++++++----- .../event/cpts/process-form-project.vue | 1 - .../visual/basicinfo/basicInfoMain.vue | 2 ++ 4 files changed, 49 insertions(+), 12 deletions(-) diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index 08dbf0f14..cb97b6361 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -21,7 +21,33 @@ .cell-width-1{ width: 250px } - + .avatar-uploader { + margin: 0 0 0 20px; + + /deep/ .el-upload--picture-card{ + width: 100px; + height: 100px; + } + /deep/ .el-upload{ + width: 100px; + height: 100px; + line-height: 100px; + } + /deep/ .el-upload-list--picture-card .el-upload-list__item{ + width: 100px; + height: 100px; + line-height: 100px; + } + /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail{ + width: 100px; + height: 100px; + line-height: 100px; + } + /deep/ .avatar{ + width: 100px; + height: 100px; + } + } } @@ -143,8 +169,8 @@ cursor:pointer } .info-title-2 { - width: 100px; - flex: 0 0 1; + + flex: 0 0 100px; font-size: 14px; } diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 1935079fd..294c1b1a3 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -112,13 +112,14 @@ - 选择图片 @@ -161,7 +162,7 @@ -
+
@@ -343,7 +344,9 @@ export default { selGridId: '', selPersonIndex: '', selPerson: {}, - demandUserList: [] + demandUserList: [], + + hideUploadBtn: false }; }, components: {}, @@ -587,6 +590,10 @@ export default { this.replayImgList.splice(this.replayImgList.findIndex(item => item.uid === file.uid), 1) }, + // 最多上传3张图，超过时隐藏上传按钮 + handleEditChange (file, fileList) { + this.hideUploadBtn = fileList.length >= 3; + }, exceedPic () { this.$message.warning("最多上传3张预览图片") @@ -739,11 +746,14 @@ export default { > - - - - diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue index 715019ec1..8096461ed 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue @@ -371,7 +371,6 @@ export default { this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId) this.selCategoryArray.push(this.eventDetailCopy.categoryId) - this.selCateObj = { name: this.eventDetailCopy.categoryName, id: this.eventDetailCopy.categoryId diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index bf12af804..0f2fc5b72 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -715,6 +715,8 @@ const vueGis = { 'features': featureData }; let feature = (new GeoJSON()).readFeatures(geojsonObject) + + polygonSource.addFeatures(feature) let iconFeatures = []; From a7d5814114e5705d26b086016f34cae807a96093 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 24 May 2022 14:07:53 +0800 Subject: [PATCH 03/11] 111 --- .../modules/visual/basicinfo/basicInfoMain.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 0f2fc5b72..28372ee7c 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -172,6 +172,8 @@ let iconSource; // icon let polygonSource;//变电站标注多边形 let select;//选中标注 +let xoffset = 0.005 + //url图标 @@ -629,10 +631,12 @@ const vueGis = { let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组 coorArray.forEach((item, index) => { - itemArray.push(item) - if (index % 2 == 0) {//偶 + if (index % 2 == 0) {//偶 + // item = (parseFloat(item) + xoffset) + '' + itemArray.push(item) } else {//奇 + itemArray.push(item) polygonArray.push(itemArray) itemArray = [] } @@ -694,10 +698,15 @@ const vueGis = { let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组 coorArray.forEach((item, index) => { - itemArray.push(item) + // itemArray.push(item) if (index % 2 == 0) {//偶 + // item = (parseFloat(item) + xoffset) + '' + itemArray.push(item) } else {//奇 + + + itemArray.push(item) polygonArray.push(itemArray) itemArray = [] } @@ -715,7 +724,7 @@ const vueGis = { 'features': featureData }; let feature = (new GeoJSON()).readFeatures(geojsonObject) - + console.log(geojsonObject) polygonSource.addFeatures(feature) From ee3ef9501d0061d7af7793d20d846a977e7019fc Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 24 May 2022 14:23:36 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8F=88=E6=94=B9=E4=BA=86=E4=B8=8B?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/xiangmu/cpts/project-info.vue | 621 ++++++++++-------- 1 file changed, 361 insertions(+), 260 deletions(-) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index b0dd01ac2..e1f05c860 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -1,7 +1,6 @@ @@ -99,7 +138,7 @@ import dateFormat from "dai-js/tools/dateFormat"; function iniData () { return { - + user: {}, projectPageType: 'info', info: {}, @@ -122,6 +161,18 @@ function iniData () { demandUserName: "", demandUserMobile: "", }, + + //满意度评价 + showSatisfy: false, + selBad: false, + selGood: false, + selPerfect: false, + badurl: require('@/assets/img/satisfy-images/face1.png'), + badurl_light: require('@/assets/img/satisfy-images/face1_light.png'), + goodurl: require('@/assets/img/satisfy-images/face2.png'), + goodurl_light: require('@/assets/img/satisfy-images/face2_light.png'), + perfecturl: require('@/assets/img/satisfy-images/face3.png'), + perfecturl_light: require('@/assets/img/satisfy-images/face3_light.png'), }; } @@ -138,6 +189,7 @@ export default { }, eventDetailData: { + type: Object, default () { return {} @@ -158,7 +210,7 @@ export default { }, mounted () { - + this.user = this.$store.state.user if (this.eventId) { this.info = JSON.parse(JSON.stringify(this.eventDetailData)); } @@ -172,17 +224,14 @@ export default { }, handleClose () { - this.showType = '' }, - handleCloseEvent () { - + handleCloseEvent () { this.$emit("handleClose"); }, async getApiData () { - }, handleToProject () { @@ -199,6 +248,62 @@ export default { this.$emit("handleToDemand") }, + //满意度评价 + handleSatisfy () { + + this.showSatisfy = true + }, + + clickSatisfy (type) { + if (type === 'bad') { + this.selGood = false + this.selPerfect = false + this.selBad = true + } else if (type === 'good') { + this.selGood = true + this.selPerfect = false + this.selBad = false + } else if (type === 'perfect') { + this.selGood = false + this.selPerfect = true + this.selBad = false + } + }, + + async handleComfirmSatisfy () { + let satisfyLevel = '' + if (!this.selBad && !this.selGood && !this.selPerfect) { + this.$message.info("请选择评价级别"); + } else { + if (this.selBad) { + satisfyLevel = 'bad' + } else if (this.selGood) { + satisfyLevel = 'good' + } else if (this.selPerfect) { + satisfyLevel = 'perfect' + } + } + const url = "/gov/project/icEvent/comment" + + let params = { + icEventId: this.eventId, + satisfaction: satisfyLevel + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.$message.success("评价成功"); + this.info.satisfactionName = '111' + this.showSatisfy = false + + + } else { + this.$message.error(msg) + } + }, + + }, }; diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 38e9ce64b..d3d656093 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -31,7 +31,7 @@
-
+
-
+

事件处理进展

-
+
-
暂无处理进展
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index c82cd9c05..09bf4e103 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -252,11 +252,11 @@ size="small" class="div-table-button--edit">处理 - 评价 + class="div-table-button--edit">评价 -->
- - -
-
- -
不满意
-
-
- -
满意
-
-
- -
非常满意
-
-
-
- 关闭 - 确定 -
- -
@@ -419,17 +383,7 @@ export default { eventDetailData: {}, - //满意度评价 - showSatisfy: false, - selBad: false, - selGood: false, - selPerfect: false, - badurl: require('@/assets/img/satisfy-images/face1.png'), - badurl_light: require('@/assets/img/satisfy-images/face1_light.png'), - goodurl: require('@/assets/img/satisfy-images/face2.png'), - goodurl_light: require('@/assets/img/satisfy-images/face2_light.png'), - perfecturl: require('@/assets/img/satisfy-images/face3.png'), - perfecturl_light: require('@/assets/img/satisfy-images/face3_light.png'), + }; }, @@ -564,72 +518,20 @@ export default { } }, - //满意度评价 - handleSatisfy (row) { - this.eventId = row.icEventId - this.showSatisfy = true - }, - clickSatisfy (type) { - if (type === 'bad') { - this.selGood = false - this.selPerfect = false - this.selBad = true - } else if (type === 'good') { - this.selGood = true - this.selPerfect = false - this.selBad = false - } else if (type === 'perfect') { - this.selGood = false - this.selPerfect = true - this.selBad = false - } - }, - - async handleComfirmSatisfy () { - let satisfyLevel = '' - if (!this.selBad && !this.selGood && !this.selPerfect) { - this.$message.info("请选择评价级别"); - } else { - if (this.selBad) { - satisfyLevel = 'bad' - } else if (this.selGood) { - satisfyLevel = 'good' - } else if (this.selPerfect) { - satisfyLevel = 'perfect' - } - } - const url = "/gov/project/icEvent/comment" - - let params = { - icEventId: this.eventId, - satisfaction: satisfyLevel - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.$message.success("评价成功"); - this.showSatisfy = false - this.getTableData() - - } else { - this.$message.error(msg) - } - }, - handleClose () { this.pageType = "list"; - this.eventId = "" + this.getTableData() }, handleOk () { this.pageType = "list"; - this.eventId = "" + this.pageNo = 1 this.getTableData() + }, handleEditSuccess () { From 04b8d36f3ea20c8fba702aacb612cddb18147acd Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 24 May 2022 16:53:07 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/shequzhili/event-info.scss | 4 ++++ src/views/modules/shequzhili/event/cpts/event-info.vue | 2 +- .../modules/shequzhili/event/cpts/process-form-demand.vue | 4 ++-- src/views/modules/shequzhili/event/eventList.vue | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index cb97b6361..eddc90d5e 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -56,6 +56,10 @@ .g-page { display: flex; + width:100%; + .g-total{ + width:100%; + } .g-left { box-sizing: border-box; width: 65%; diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index d3d656093..4458df111 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -31,7 +31,7 @@
-
+
{ if (!valid) { app.util.validateRule(messageObj); - + // this.formData.categoryId = this.selCateObj.id } else { - this.okflag = true } }); diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 09bf4e103..cee63d86d 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -440,7 +440,7 @@ export default { }, async handleExport () { - const url = "/epmetuser/icBirthRecord/export"; + const url = "/gov/project/icEvent/export"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, From 974a5ec22ac3a1a4ba0fb05e73e5f78f5d5d5482 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 24 May 2022 16:58:41 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=82=A8=E7=9A=84?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/xiangmu/cpts/project-info.vue | 9 ++++++++- src/views/modules/shequzhili/xiangmu/index.vue | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index e1f05c860..107bab82d 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -199,7 +199,11 @@ - + Date: Tue, 24 May 2022 17:08:48 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/event/cpts/event-info.vue | 25 ++++++++++++------- .../event/cpts/process-form-demand.vue | 5 +++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 4458df111..cf5a75730 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -356,7 +356,6 @@ export default { this.$refs.ref_add.getEventInfo() if (this.$refs.ref_add.okflag) { - this.eventInfoData = this.$refs.ref_add.formData } else { return false @@ -369,18 +368,21 @@ export default { this.formData.operationType = this.$refs.ref_processinfo_add.operationType this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType - // this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList + if (this.formData.operationType === '0') { this.project = {} this.demand = {} this.replayInfo = this.$refs.ref_processinfo_add.replayInfo console.log('replayInfo', this.replayInfo) + //回复属性赋值 this.eventInfoData.content = this.replayInfo.content this.eventInfoData.status = this.replayInfo.status - this.eventInfoData.categoryList = [] - this.eventInfoData.categoryList.push(this.replayInfo.categoryId) + if (this.replayInfo.categoryId) { + this.eventInfoData.categoryList = [] + this.eventInfoData.categoryList.push(this.replayInfo.categoryId) + } } else if (this.formData.operationType === '1') { @@ -389,17 +391,22 @@ export default { this.project = this.$refs.ref_processinfo_add.project //项目的属性同事件一样 this.project.gridId = this.eventInfoData.gridId + + if (this.project.categoryList && this.project.categoryList.length > 0) { + this.eventInfoData.categoryList = [] + this.eventInfoData.categoryList.push(this.project.categoryList[0].id) + } + console.log('projectInfo', this.project) } else if (this.formData.operationType === '2') { this.replayInfo = {} this.project = {} this.demand = this.$refs.ref_processinfo_add.demand + //需求的属性同事件一样 - this.demand.gridId = this.eventInfoData.gridId - this.demand.reportUserName = this.eventInfoData.name//上报人姓名同需求上报人姓名 - this.demand.reportUserMobile = this.eventInfoData.mobile//上报人手机号同需求上报人手机号 - this.demand.reportTime = this.eventInfoData.happenTime//上报时间 + this.eventInfoData.categoryList = [] + this.eventInfoData.categoryList.push(this.demand.categoryId) console.log('demond', this.demand) } @@ -413,7 +420,7 @@ export default { } console.log('this.formData', this.formData) - await this.submit() + // await this.submit() }, async submit () { diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 5f425578e..8458cdc4e 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -363,6 +363,10 @@ export default { this.formData.reportUserName = this.eventDetailCopy.name this.formData.reportTime = this.eventDetailCopy.happenTime this.formData.gridId = this.eventDetailCopy.gridId + this.formData.demandUserId = this.eventDetailCopy.reportUserId + this.formData.demandUserName = this.eventDetailCopy.name + this.formData.demandUserMobile = this.eventDetailCopy.mobile + if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { this.selCategoryArray = [] this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId) @@ -412,7 +416,6 @@ export default { handleChangeCate () { console.log(this.$refs["myCascader"].getCheckedNodes()[0].data) this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data - this.formData.categoryId = this.selCateObj.id }, From 55c24fd42ff45762c215aaf2593214ec9401a4cf Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 24 May 2022 17:24:32 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/xiangmu/cpts/project-info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index 107bab82d..123ab3c39 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -44,7 +44,7 @@ >
-
+
项目评价： 查看项目评价 Date: Tue, 24 May 2022 17:44:09 +0800 Subject: [PATCH 11/11] 11 --- src/views/modules/shequzhili/event/cpts/event-info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index cf5a75730..e1d2075cd 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -420,7 +420,7 @@ export default { } console.log('this.formData', this.formData) - // await this.submit() + await this.submit() }, async submit () {