diff --git a/src/assets/img/satisfy-images/face1.png b/src/assets/img/satisfy-images/face1.png new file mode 100644 index 00000000..044aa15d Binary files /dev/null and b/src/assets/img/satisfy-images/face1.png differ diff --git a/src/assets/img/satisfy-images/face1_light.png b/src/assets/img/satisfy-images/face1_light.png new file mode 100644 index 00000000..51e427f4 Binary files /dev/null and b/src/assets/img/satisfy-images/face1_light.png differ diff --git a/src/assets/img/satisfy-images/face2.png b/src/assets/img/satisfy-images/face2.png new file mode 100644 index 00000000..0733ff1a Binary files /dev/null and b/src/assets/img/satisfy-images/face2.png differ diff --git a/src/assets/img/satisfy-images/face2_light.png b/src/assets/img/satisfy-images/face2_light.png new file mode 100644 index 00000000..071cf7a5 Binary files /dev/null and b/src/assets/img/satisfy-images/face2_light.png differ diff --git a/src/assets/img/satisfy-images/face3.png b/src/assets/img/satisfy-images/face3.png new file mode 100644 index 00000000..f85b027e Binary files /dev/null and b/src/assets/img/satisfy-images/face3.png differ diff --git a/src/assets/img/satisfy-images/face3_light.png b/src/assets/img/satisfy-images/face3_light.png new file mode 100644 index 00000000..ec20e184 Binary files /dev/null and b/src/assets/img/satisfy-images/face3_light.png differ diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index a038ad1d..2b5ebb5f 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -134,8 +134,16 @@ margin: 10px 0; display: flex; padding-left: 15px; + + .line{ + text-decoration:underline; + color: #3e8ef7; + } + .line:hover{ + cursor:pointer + } .info-title-2 { - width: 70px; + width: 100px; flex: 0 0 1; font-size: 14px; } @@ -215,9 +223,6 @@ } } - - - .m-process { margin-top: 30px; margin-left: 15px; @@ -367,3 +372,19 @@ .m-chart { min-height: 200px; } + +.div-satisfy{ + padding:50px; + display:flex ; + justify-content: space-around; +text-align: center; + img{ + width:100px; + height:100px; + } + + .tip-satisfy{ + text-align: center; + margin-top:20px + } +} diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 92fb7831..0d257d33 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -36,7 +36,7 @@ const request = curry( // retData = Vue.$afterRequestHook(retData); // } if (res.data.code > 8000 && res.data.code < 10000) { - // Message.error(res.data.msg); + Message.error(res.data.msg); } if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 362d8ca6..0bced147 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -426,13 +426,28 @@ export default { }, handleComfirmSelPerson () { - this.personTableShow = true; + + if (this.selPersonIndex === 0 || this.selPersonIndex) { + let selPerson = this.demandUserList[this.selPersonIndex] + this.formData.name = selPerson.demandUserName + this.formData.mobile = selPerson.demandUserMobile + this.formData.reportUserId = selPerson.demandUserId + this.formData.idCard = selPerson.idCard + console.log(selPerson) + + this.personTableShow = false; + + } else { + this.$message.info("请选择人员"); + } }, async handleChangeGrid () { + + const url = "/epmetuser/icresiuser/demandusers" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" let params = { diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 6bb7c4eb..b36be6fd 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -1,63 +1,91 @@ @@ -65,14 +93,34 @@ diff --git a/src/views/modules/shequzhili/event/cpts/event-info copy.vue b/src/views/modules/shequzhili/event/cpts/event-info copy.vue new file mode 100644 index 00000000..165a825a --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/event-info copy.vue @@ -0,0 +1,489 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index e952ece1..0bfd349a 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -1,6 +1,6 @@ diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 5bc4f19c..ef7066da 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -220,6 +220,12 @@ :show-overflow-tooltip="true" label="上报时间"> + + @@ -286,6 +289,43 @@ @handleOk="handleOk" @dialogOk="handleEditSuccess" /> + + + +
+
+ +
不满意
+
+
+ +
满意
+
+
+ +
非常满意
+
+
+
+ 关闭 + 确定 +
+ + @@ -317,6 +357,7 @@ export default { return { pageType: "list", // 列表list 新增add 处理dispose 详情info + user: {}, agencyId: '', gridList: [],//所属网格list--场所区域 tableData: [], @@ -378,6 +419,18 @@ 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'), + }; }, computed: { @@ -390,13 +443,18 @@ export default { }, watch: { "formData.endTime": function (val) { - let arrayTemp = val.split(' ') - this.formData.endTime = arrayTemp[0] + ' 23:59:59' + if (val && val != '') { + let arrayTemp = val.split(' ') + this.formData.endTime = arrayTemp[0] + ' 23:59:59' + } + }, }, mounted () { - const { user } = this.$store.state - this.agencyId = user.agencyId + console.log(this.$store.state) + this.user = this.$store.state.user + + this.agencyId = this.user.agencyId this.loadGrid(); this.getTableData(); }, @@ -466,10 +524,24 @@ export default { this.pageType = "add"; }, - async handleWatch (rowIndex) { - let item = this.tableData[rowIndex]; + async handleWatch (row) { + this.eventId = row.icEventId + + this.eventId = row.icEventId + const url = "/gov/project/icEvent/detail"; + // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; + + const { data, code, msg } = await requestPost(url, { + icEventId: this.eventId, + }); - this.pageType = "info"; + if (code === 0) { + + this.eventDetailData = { ...data }; + this.pageType = "info"; + } else { + this.$message.error(msg); + } }, //加载组织数据 @@ -491,6 +563,58 @@ 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 () { @@ -526,7 +650,7 @@ export default { this.$message.success("删除成功！"); this.getTableData(); } else { - this.$message.success("操作失败！"); + this.$message.error("操作失败！"); } }, @@ -547,6 +671,19 @@ export default { return item; }) : []; + + this.tableData.forEach(item => { + if (item.operationType === '2') { + item.operationTypeShow = '已转需求' + } + if (item.operationType === '1') { + item.operationTypeShow = '已立项' + } + if (item.operationType === '0') { + item.operationTypeShow = '已回复' + } + + }); } else { } }, @@ -586,4 +723,5 @@ export default { diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index 21197f74..bf84a2ea 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -1,6 +1,7 @@