From 9e019d77bf6c3d0d4c92af01eeed754377881c56 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 12 Sep 2023 09:20:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitySelfInsp/formList.vue | 12 +- .../satisfaction/communitySelfInsp/index.vue | 313 +++++++++--------- .../satisfactionProvince/index.vue | 26 +- 3 files changed, 177 insertions(+), 174 deletions(-) diff --git a/src/views/modules/satisfaction/communitySelfInsp/formList.vue b/src/views/modules/satisfaction/communitySelfInsp/formList.vue index fdffc671a..e705fc626 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/formList.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/formList.vue @@ -92,6 +92,8 @@ export default { await this.getTableData() if (this.satisfactionCategoryStr) { this.formData.satisfactionCategory = this.satisfactionCategoryStr + this.formData.inspRecordId = this.inspRecordId + console.log(this.formData.satisfactionCategory); } }, //方法 @@ -137,12 +139,13 @@ export default { this.getTableData(); }, async getTableData() { - try { - let params = { + console.log(this.formData); + var params = { ...this.formData, - pageNo: this.currentPage, + pageNo: this.pageNo, pageSize: this.pageSize, }; + console.log(params); let url = '/governance/satisfaction/communitySelfInsp/inspResult/list' const { data, code, msg } = await requestGet(url, params) if (code == 0) { @@ -151,9 +154,6 @@ export default { } else { console.log(err); } - } catch (err) { - console.log(err); - } }, }, //子组件注册 diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index 6c3030dbf..bdec7deb8 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -5,8 +5,6 @@
- @@ -23,16 +21,16 @@
- 生成本月社区自查问卷表 + 生成本月社区自查问卷表
-
本月已参与调研人数 500人
+
本月已参与调研人数 {{ personQty }}人
Image
-
85.12
+
{{ synthesisScore }}
综合得分
@@ -57,32 +55,29 @@
+ class="dialog-h" @closed="showFormList = false"> - - - - - - + @handelDetail="handelDetail" @handelFollowUpList="handelFollowUpList" :period="formData.period" :inspRecordId="formData.inspRecordId"> + + + + + + - - -
- 加载中... -
+ + +
+ 加载中... +
-
- 问卷链接： {{questionnaireUrl}} -
- - +
+ 问卷链接： {{ questionnaireUrl }} +
+ +
@@ -96,12 +91,12 @@ import followDetail from "./followUpDetail"; import util from "@js/util.js"; export default { - components: { formList, followList,followDetail }, + components: { formList, followList, followDetail }, data() { return { searchH: 20, - + formData: { period: "",//月份 inspRecordId: "", @@ -133,7 +128,7 @@ export default { containLabel: true, }, toolbox: {}, - + xAxis: { type: "category", boundaryGap: true, @@ -149,19 +144,19 @@ export default { lineStyle: { width: 60, // 设置阴影的宽度 color: "#000", - opacity:0 + opacity: 0 }, - // 控制间隔，这里设置为2表示左右两侧有间隔，可以根据需要调整 + // 控制间隔，这里设置为2表示左右两侧有间隔，可以根据需要调整 }, - + }, - + yAxis: { type: "value", name: "单位(个)", min: 0, - + }, series: [ { @@ -202,7 +197,7 @@ export default { }, ], }, - + satisfactionCategory: [],//类目 satisfactionCategoryName: [], score: [], //综合得分 @@ -210,10 +205,12 @@ export default { showFormList: false, //自查列表弹框 showFollowUpDetail: false,//自查列表中查看弹框 showFollowUpList: false,//回访记录弹框 - showTduckImage:false, + showTduckImage: false, - qrCodeImgUrl:'',//生成二维码图片链接 - questionnaireUrl:'' + qrCodeImgUrl: '',//生成二维码图片链接 + questionnaireUrl: '', + synthesisScore: '', + personQty: '' }; }, @@ -231,11 +228,16 @@ export default { this.agencyId = this.user.agencyId; await this.getDicts(); await this.getTableData(); - await this.initEcharts(); + this.$nextTick(() => { + this.initEcharts(); + }) }, - created(){ + created() { let date = new Date() - this.formData.period = util.formatDate(date,'yyyy-MM') + this.formData.period = util.formatDate(date, 'yyyy-MM') + }, + activated() { + this.handleWindowResize() }, methods: { // ------------------------------------字典------------------------------------------ @@ -267,16 +269,16 @@ export default { handelFollowUpList() { this.showFollowUpList = true; }, - async handleCreateMonthlySurvey(){ - try{ + async handleCreateMonthlySurvey() { + try { let url = '/governance/satisfaction/communitySelfInsp/generateQuestionnaire' - const {data,code} = await requestPost(url) - if(code == 0){ + const { data, code } = await requestPost(url) + if (code == 0) { this.showTduckImage = true this.qrCodeImgUrl = data.qrCodeImgUrl this.questionnaireUrl = data.questionnaireUrl } - }catch(err){ + } catch (err) { console.log(err); } }, @@ -290,7 +292,6 @@ export default { // console.log(params.seriesName); // 对应的系列名称 than.handelClickChart(params.name); }); - window.addEventListener("resize", this.handleWindowResize); }, handleWindowResize() { @@ -303,6 +304,7 @@ export default { this.satisfactionCategoryStr = this.dicts.satisfaction_category.filter( (item) => item.label == name )[0].value; + console.log(this.satisfactionCategoryStr); }, handleClose() { this.showFormList = false; @@ -315,113 +317,116 @@ export default { // 获取列表 async getTableData() { - this.tableLoading = true; - this.tableData = [ - { - satisfactionCategory: "culturalFacility", - satisfactionCategoryName: "文化设施", - score: "20", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - { - satisfactionCategory: "sportsFacility", - satisfactionCategoryName: "体育设施", - score: "50", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - { - satisfactionCategory: "ecologicalEnv", - satisfactionCategoryName: "生态环境", - score: "50", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - { - satisfactionCategory: "socialSecurity", - satisfactionCategoryName: "社会治安", - score: "50", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - { - satisfactionCategory: "socialAssistance", - satisfactionCategoryName: "社会救助", - score: "50", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - { - satisfactionCategory: "oldPeopleProvide", - satisfactionCategoryName: "老有所养", - score: "50", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - { - satisfactionCategory: "basicEducation", - satisfactionCategoryName: "基础教育", - score: "50", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - { - satisfactionCategory: "medical", - satisfactionCategoryName: "病有所医", - score: "50", - badQty: 40, - goodQty: 20, - veryGoodQty: 30, - }, - ]; - const allowedCategories = this.dicts.satisfaction_category.map( - (item) => item.value - ); - this.tableData.forEach((item) => { - if (allowedCategories.includes(item.satisfactionCategory)) { - this.option.series[0].data.push(item.veryGoodQty); - this.option.series[1].data.push(item.goodQty); - this.option.series[2].data.push(item.badQty); - this.option.xAxis.data.push(item.satisfactionCategoryName); - this.satisfactionCategory.push(item.satisfactionCategory); - this.score.push({ - score: item.score, - satisfactionCategoryName: item.satisfactionCategoryName, - imgUrl: require(`../../../../assets/img/satisfaction/${item.satisfactionCategory}.png`), - }); - } - }); - console.log(this.score, "综合得分"); - // const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis"; - - // const { formData } = this; - // const { data, code, msg } = await requestGet(url, {...formData}); - // this.tableLoading = false; - // if (code === 0) { - // this.total = data.total || 0; - // this.tableData = data.categoryDatas; - // const allowedCategories = this.dicts.satisfaction_category.map(item => item.value) - // this.tableData.forEach(item => { + // this.tableLoading = true; + // this.tableData = [ + // { + // satisfactionCategory: "culturalFacility", + // satisfactionCategoryName: "文化设施", + // score: "20", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // { + // satisfactionCategory: "sportsFacility", + // satisfactionCategoryName: "体育设施", + // score: "50", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // { + // satisfactionCategory: "ecologicalEnv", + // satisfactionCategoryName: "生态环境", + // score: "50", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // { + // satisfactionCategory: "socialSecurity", + // satisfactionCategoryName: "社会治安", + // score: "50", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // { + // satisfactionCategory: "socialAssistance", + // satisfactionCategoryName: "社会救助", + // score: "50", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // { + // satisfactionCategory: "oldPeopleProvide", + // satisfactionCategoryName: "老有所养", + // score: "50", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // { + // satisfactionCategory: "basicEducation", + // satisfactionCategoryName: "基础教育", + // score: "50", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // { + // satisfactionCategory: "medical", + // satisfactionCategoryName: "病有所医", + // score: "50", + // badQty: 40, + // goodQty: 20, + // veryGoodQty: 30, + // }, + // ]; + // const allowedCategories = this.dicts.satisfaction_category.map( + // (item) => item.value + // ); + // this.tableData.forEach((item) => { // if (allowedCategories.includes(item.satisfactionCategory)) { - // this.option.series[0].data.push(item.veryGoodQty) - // this.option.series[1].data.push(item.goodQty) - // this.option.series[2].data.push(item.badQty) - // this.option.xAxis.data.push(item.satisfactionCategoryName) - // this.satisfactionCategory.push(item.satisfactionCategory) - // this.score.push({ score: item.score, satisfactionCategoryName: item.satisfactionCategoryName, imgUrl: require(`../../../../assets/img/satisfaction/${item.satisfactionCategory}.png`) }); + // this.option.series[0].data.push(item.veryGoodQty); + // this.option.series[1].data.push(item.goodQty); + // this.option.series[2].data.push(item.badQty); + // this.option.xAxis.data.push(item.satisfactionCategoryName); + // this.satisfactionCategory.push(item.satisfactionCategory); + // this.score.push({ + // score: item.score, + // satisfactionCategoryName: item.satisfactionCategoryName, + // imgUrl: require(`../../../../assets/img/satisfaction/${item.satisfactionCategory}.png`), + // }); // } // }); - // } else { - // this.$message.error(msg); - // } + // console.log(this.score, "综合得分"); + const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis"; + + const { formData } = this; + const { data, code, msg } = await requestGet(url, { ...formData }); + this.tableLoading = false; + if (code === 0) { + this.total = data.total || 0; + this.tableData = data.categoryDatas; + this.formData.inspRecordId = data.inspRecordId; + this.synthesisScore = data.synthesisScore; + this.personQty = data.personQty + const allowedCategories = this.dicts.satisfaction_category.map(item => item.value) + this.tableData.forEach(item => { + if (allowedCategories.includes(item.satisfactionCategory)) { + this.option.series[0].data.push(item.veryGoodQty) + this.option.series[1].data.push(item.goodQty) + this.option.series[2].data.push(item.badQty) + this.option.xAxis.data.push(item.satisfactionCategoryName) + this.satisfactionCategory.push(item.satisfactionCategory) + this.score.push({ score: item.score, satisfactionCategoryName: item.satisfactionCategoryName, imgUrl: require(`../../../../assets/img/satisfaction/${item.satisfactionCategory}.png`) }); + } + }); + } else { + this.$message.error(msg); + } }, // 重置 diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index f77b81151..952b377ab 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -42,8 +42,8 @@ @handelClickEdit="handelClickEdit"> - +
@@ -150,7 +150,6 @@ export default { }, ...mapGetters(["clientHeight", "iframeHeight"]), }, - watch: {}, created() { let date = new Date() this.formData.periodStart = util.formatDate(date, 'yyyy-MM') @@ -167,11 +166,11 @@ export default { // --------------------------------------字典------------------------------------------ async getDicts() { try { + const requests = [ this.$http.post("sys/dict/data/dictlist", { dictType: "satisfaction_category", }), - ]; const dictKeys = ['satisfaction_category']; // 对应的键名 @@ -187,8 +186,6 @@ export default { console.log("获取字典失败: ", error); } }, - - // ------------------------------------事件------------------------------------------ initEcharts() { this.myChart = echarts.init(document.getElementById('myCharts')); @@ -204,7 +201,6 @@ export default { window.addEventListener('resize', this.handleWindowResize); }, - handleWindowResize() { if (this.myChart) { this.myChart.resize(); @@ -231,20 +227,20 @@ export default { this.showProvinceFollowUpDetail = false this.save(form) }, - async save(form) { - try{ + async save(form) { + try { const url = '/governance/provinceEvaluationRecord/updateInfo' form.periodName = null - const {code} = await requestPost(url,form) - if(code == 0){ + const { code } = await requestPost(url, form) + if (code == 0) { this.getTableData() this.$refs['ref_form_list'].getTableData() this.$message.success('保存成功') this.showProvinceFollowUpDetail = false } - }catch(err){ + } catch (err) { console.log(err); - } + } }, // 搜索事件 handleSearch(val) { @@ -361,7 +357,9 @@ export default { this.getTableData(); }, }, - + activated() { + this.handleWindowResize() + }, props: {}, }; From 8a02cc9b95571868b60351017108dab9177b097c Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 12 Sep 2023 10:09:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8D=E6=BB=A1=E6=84=8F=E4=BA=BA?= =?UTF-8?q?=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiInfo.vue | 5019 ++++++++--------- src/views/modules/base/resi.vue | 2696 +++++---- .../modules/satisfaction/detail/eventInfo.vue | 49 + .../modules/satisfaction/detail/index.vue | 530 ++ .../modules/shequzhili/event/cpts/add.vue | 38 +- .../shequzhili/event/cpts/event-detail.vue | 164 +- .../shequzhili/event/cpts/event-info.vue | 25 +- .../modules/shequzhili/event/eventList.vue | 41 +- 8 files changed, 4427 insertions(+), 4135 deletions(-) create mode 100644 src/views/modules/satisfaction/detail/eventInfo.vue create mode 100644 src/views/modules/satisfaction/detail/index.vue diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index 965f67b1a..055ea214d 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -1,914 +1,847 @@ \ No newline at end of file diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 624270a63..e4efdd534 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1,58 +1,39 @@ @@ -1361,182 +1228,213 @@ export default { @import "@/assets/scss/buttonstyle.scss"; ::v-deep .el-tabs__nav-next { - box-shadow: 2px 0px 9px 0px; + box-shadow: 2px 0px 9px 0px; } + ::v-deep .el-tabs__nav-prev { - box-shadow: -1px 0px 7px 0px; + box-shadow: -1px 0px 7px 0px; } + .dialog-h { - .el-dialog__body { - position: relative; - max-height: 83vh; - box-sizing: border-box; - padding: 0 0 20px !important; - .dialog-h-content { - max-height: calc(83vh - 80px); - box-sizing: border-box; - padding: 50px 70px; - overflow: auto; + .el-dialog__body { + position: relative; + max-height: 83vh; + box-sizing: border-box; + padding: 0 0 20px !important; + + .dialog-h-content { + max-height: calc(83vh - 80px); + box-sizing: border-box; + padding: 50px 70px; + overflow: auto; + } } - } } + .resi-container ::v-deep .el-row { - margin-right: 0; + margin-right: 0; } + .tabs-other-info { - // ::v-deep .el-tabs__nav-wrap::after, - ::v-deep .el-tabs__active-bar_active { - background-color: #0055d7; - } + + // ::v-deep .el-tabs__nav-wrap::after, + ::v-deep .el-tabs__active-bar_active { + background-color: #0055d7; + } } + ::v-deep .el-tabs__item { - // width: 50px; - box-sizing: border-box; - padding: 0 10px !important; - font-size: 14px; - font-weight: 600; - color: #666666; - border-radius: 2px; - &:hover { - color: #0056d6; - } + // width: 50px; + box-sizing: border-box; + padding: 0 10px !important; + font-size: 14px; + font-weight: 600; + color: #666666; + border-radius: 2px; + + &:hover { + color: #0056d6; + } } + ::v-deep .el-tabs__item.is-active { - color: #0056d6; + color: #0056d6; } + ::v-deep .el-tabs__active-bar { - background-color: #0056d6; + background-color: #0056d6; } + .resi-container .resi-card { - position: relative; - overflow: visible; + position: relative; + overflow: visible; } + ::v-deep .el-button--primary.is-plain { - color: #0055d7; - background: #ffffff; - border-color: #0055d7; + color: #0055d7; + background: #ffffff; + border-color: #0055d7; } + .resi-container .resi-card-table { - ::v-deep .el-table th { - color: #fff; - background-color: rgba(33, 149, 254, 1); - // border-right: 1px solid rgba(33, 149, 254, 1); - } + ::v-deep .el-table th { + color: #fff; + background-color: rgba(33, 149, 254, 1); + // border-right: 1px solid rgba(33, 149, 254, 1); + } } + .collapse-title { - font-weight: bold; + font-weight: bold; } .resi-table { - ::v-deep .el-button--text { - text-decoration: underline; - } - ::v-deep .btn-color-del { - margin-left: 10px; - color: rgba(213, 16, 16, 1); - } - ::v-deep .btn-color-edit { - color: rgba(0, 167, 169, 1); - } + ::v-deep .el-button--text { + text-decoration: underline; + } + + ::v-deep .btn-color-del { + margin-left: 10px; + color: rgba(213, 16, 16, 1); + } + + ::v-deep .btn-color-edit { + color: rgba(0, 167, 169, 1); + } } + .resi-search { - // padding-right: 20px; - margin-top: 10px; - .el-col { - text-align: right; - } + // padding-right: 20px; + margin-top: 10px; + + .el-col { + text-align: right; + } } + .resi-down { - position: absolute; - left: 50%; - bottom: -10px; - display: flex; - justify-content: center; - align-items: center; - width: 46px; - height: 12px; - box-sizing: border-box; - margin-left: -23rpx; - cursor: pointer; - background: #ffffff; - border-radius: 0 0 10px 10px; - img { - display: block; - } + position: absolute; + left: 50%; + bottom: -10px; + display: flex; + justify-content: center; + align-items: center; + width: 46px; + height: 12px; + box-sizing: border-box; + margin-left: -23rpx; + cursor: pointer; + background: #ffffff; + border-radius: 0 0 10px 10px; + + img { + display: block; + } } .resi-card-table { - margin-top: 20px; + margin-top: 20px; } + .resi-row-btn { - display: flex; - margin-bottom: 13px; - .el-button { - margin-left: 10px; - border: 0; - } - // .el-button--success { - // background: rgba(34, 193, 195, 1); - // } - // .el-button--warning { - // background: rgba(254, 179, 73, 1); - // } - // .el-button--danger { - // background: rgba(254, 98, 82, 1); - // } + display: flex; + margin-bottom: 13px; + + .el-button { + margin-left: 10px; + border: 0; + } + + // .el-button--success { + // background: rgba(34, 193, 195, 1); + // } + // .el-button--warning { + // background: rgba(254, 179, 73, 1); + // } + // .el-button--danger { + // background: rgba(254, 98, 82, 1); + // } } + .resi-other { - width: 100%; - display: flex; - .resi-other-title { - flex-shrink: 0; - // display: inline-block; - width: 100px; - box-sizing: border-box; - margin-bottom: 10px; - // padding: 6px 12px 0 0; - font-size: 16px; - font-weight: 500; - color: #333; - text-align: center; - } - .tabs-other-info { - // display: inline-block; - // flex: 1; - // padding-left: 60px; - width: calc(100% - 100px); - } + width: 100%; + display: flex; + + .resi-other-title { + flex-shrink: 0; + // display: inline-block; + width: 100px; + box-sizing: border-box; + margin-bottom: 10px; + // padding: 6px 12px 0 0; + font-size: 16px; + font-weight: 500; + color: #333; + text-align: center; + } + + .tabs-other-info { + // display: inline-block; + // flex: 1; + // padding-left: 60px; + width: calc(100% - 100px); + } } .resi-btns { - margin-top: 20px; - text-align: center; - text-align: right; - margin-right: 16px; + margin-top: 20px; + text-align: center; + text-align: right; + margin-right: 16px; } + .div-flex { - display: flex; - justify-content: space-between; - align-items: center; - width: 100%; - .div_del { - margin-top: 15px; - } - .m-page { - margin-left: auto; - } + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + + .div_del { + margin-top: 15px; + } + + .m-page { + margin-left: auto; + } } + .el-dropdown-menu { - ::v-deep .el-dropdown-menu__item { - &:hover { - color: #0056d6; + ::v-deep .el-dropdown-menu__item { + &:hover { + color: #0056d6; + } } - } } + .resiCategoryInfoBox { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - word-wrap: normal; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + word-wrap: normal; } diff --git a/src/views/modules/satisfaction/detail/eventInfo.vue b/src/views/modules/satisfaction/detail/eventInfo.vue new file mode 100644 index 000000000..581411779 --- /dev/null +++ b/src/views/modules/satisfaction/detail/eventInfo.vue @@ -0,0 +1,49 @@ + + + \ No newline at end of file diff --git a/src/views/modules/satisfaction/detail/index.vue b/src/views/modules/satisfaction/detail/index.vue new file mode 100644 index 000000000..03412a8e9 --- /dev/null +++ b/src/views/modules/satisfaction/detail/index.vue @@ -0,0 +1,530 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 0025cc77f..f448450c4 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -17,7 +17,9 @@ - + + + @@ -30,12 +32,7 @@ - - - + @@ -129,7 +126,6 @@ var geocoder; // 新建一个正逆地址解析类 function iniFmData() { return { - gridId: "", //所属网格 reportUserId: "", // 上报人ID name: "", // 上报人姓名 @@ -143,7 +139,8 @@ function iniFmData() { address: "", //事件地址 latitude: "", // 经度 longitude: "", //维度 - // operationType: '',// 处理方式 + workOrderNum : "" //工单号 + // operationType: '0',// 处理方式 // content: '',//回复内容 // status: '',// 处理中：processing；已办结：closed_case }; @@ -157,10 +154,8 @@ export default { searchValue: '', resultList: [], loading: false, - btnDisable: false, gridList: [], //所属网格list--场所区域 - qudaoArray: [ { value: "1", @@ -212,31 +207,16 @@ export default { components: {}, computed: { dataRule() { - let checkIdCard = (rule, value, callback) => { - if (value === "") { - callback(new Error("请输入证件号")); - } else { - if (!isCard(value)) { - callback(new Error("证件号格式不正确")); - } - callback(); - } - }; - return { gridId: [ { required: true, message: "所属组织不能为空", trigger: "blur" }, ], + workOrderNum :[ + { required: true, message: "工单号不能为空", trigger: "blur" } + ], name: [ { required: true, message: "联系人不能为空", trigger: "blur" } ], - mobile: [ - //{ required: true, message: "联系电话不能为空", trigger: "blur" }, - ], - // idCard: [ - // { required: true, message: "证件号不能为空", trigger: "blur" }, - // { required: true, validator: checkIdCard, trigger: "blur" }, - // ], sourceType: [ { required: true, message: "反映渠道不能为空", trigger: "blur" }, ], diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index ff9675ffc..773f769f5 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -15,114 +15,82 @@ 接收时间： {{ info.happenTime }} -
+
+ 工单号： + {{ info.workOrderNum }} +
+
事件内容： {{ info.eventContent }}
-
+
图片：
-
+
语音：
-
+
上报渠道： {{ info.sourceTypeName }}
-
+
详细地址 {{ info.address }}
-
+
联系人： {{ info.name }}
-
+
联系电话： {{ info.mobile }}
-
+
标记： {{ info.markTypeName || "--" }}
-
+
满意度：
{{ info.satisfactionName }}
-
+ 显示关闭： + 1、状态=完成 (已评价)||(没评价&&不是本人) + 2、状态=未完成 （有操作id） + --> +
关闭
- - +

满意度评价

-
- -
不满意
-
-
- -
满意
-
-
- -
非常满意
-
+ + 满意 + 基本满意 + 不满意 +
-
关闭 查看详情
-
+
-
+
处理
-
关闭
-
-
{{ item.processName }}
+ + +
{{ item.processTime }}
-