diff --git a/.env.development b/.env.development index f7a1145d..fa857bf2 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,7 @@ NODE_ENV=development # 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-cloud.elinkservice.cn/api +# VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api #家中开发连级的后端服务 # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index 08dbf0f1..cb97b636 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 1935079f..d22ccc17 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: {}, @@ -481,7 +484,8 @@ export default { const url = "/gov/org/customergrid/gridoption" let params = { - agencyId: this.agencyId + agencyId: this.agencyId, + purpose: "addorupdate" } const { data, code, msg } = await requestPost(url, params) @@ -587,6 +591,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 +747,14 @@ export default { > - - - - diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 36a6b318..74df7aa3 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -75,6 +75,10 @@
+ 满意度评价 关闭 @@ -87,6 +91,41 @@ @close="handleClose" @afterEdit="handleClose" />
--> + + +
+
+ +
不满意
+
+
+ +
满意
+
+
+ +
非常满意
+
+
+
+ 关闭 + 确定 +
+ @@ -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 38e9ce64..d3d65609 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/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue index 715019ec..8096461e 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/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index c35141f1..09bf4e10 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'), + }; }, @@ -470,7 +424,8 @@ export default { const url = "/gov/org/customergrid/gridoption" let params = { - agencyId: this.agencyId + agencyId: this.agencyId, + purpose: "query" } const { data, code, msg } = await requestPost(url, params) @@ -563,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 () { diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index bf12af80..c304c20c 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -172,6 +172,9 @@ let iconSource; // icon let polygonSource;//变电站标注多边形 let select;//选中标注 +let xoffset = 0.0051 +let yoffset = 0.0002 + //url图标 @@ -629,10 +632,14 @@ 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 {//奇 + item = (parseFloat(item) + yoffset) + '' + itemArray.push(item) + polygonArray.push(itemArray) itemArray = [] } @@ -694,10 +701,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 {//奇 + + item = (parseFloat(item) + yoffset) + '' + itemArray.push(item) polygonArray.push(itemArray) itemArray = [] } @@ -715,6 +727,8 @@ const vueGis = { 'features': featureData }; let feature = (new GeoJSON()).readFeatures(geojsonObject) + console.log(geojsonObject) + polygonSource.addFeatures(feature) let iconFeatures = [];