From 1579b916e4be4f51b0302414114fdc44ef966f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Fri, 29 Dec 2023 10:12:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataBoard/overview/components/Bmysxxq.vue | 68 +++++- .../overview/components/EventDetail.vue | 6 +- .../components/MapResourceInfoMore.vue | 3 +- .../overview/components/ServiceDetails.vue | 56 +++-- .../dataBoard/overview/components/map-top.vue | 1 + src/views/dataBoard/overview/index.vue | 14 +- src/views/dataBoard/renfang/cpts/rkfx.vue | 1 + src/views/dataBoard/renfang/resi/analyze.vue | 210 +++++++++--------- .../Problem/tddtlxsj/detail.vue | 84 ++++--- .../Problem/tddtlxsj/list.vue | 26 +-- .../Problem/tyqybtlx/detail.vue | 82 ++++--- .../Problem/tyqybtlx/list.vue | 26 +-- .../satisfactionEval/Problem/tyry/detail.vue | 28 +++ .../satisfactionEval/Problem/tyry/list.vue | 26 +-- 14 files changed, 405 insertions(+), 226 deletions(-) diff --git a/src/views/dataBoard/overview/components/Bmysxxq.vue b/src/views/dataBoard/overview/components/Bmysxxq.vue index 98a7ca574..0147acf9d 100644 --- a/src/views/dataBoard/overview/components/Bmysxxq.vue +++ b/src/views/dataBoard/overview/components/Bmysxxq.vue @@ -36,6 +36,50 @@ + + @@ -116,16 +160,17 @@ + @@ -315,13 +360,13 @@ export default { } }); this.form.serviceScopeList = arr; - + let params = { ...this.detail, assignFlag: 1, assignInfo: { serviceScopeList: this.form.serviceScopeList, - noticeApproches: this.form.noticeApproches.length > 0? this.form.noticeApproches: 0, + noticeApproches: this.form.noticeApproches.length > 0 ? this.form.noticeApproches : 0, serviceTimeStart: this.form.date[0], serviceTimeEnd: this.form.date[1], serverOrgType: this.form.serverOrgType, @@ -474,8 +519,9 @@ export default { border-bottom: solid 1px #006cff; } } + /deep/ .el-cascader__tags .el-tag { + color: #fff !important; background-color: rgba(#409eff, .5) !important; - color: #fff!important; } diff --git a/src/views/dataBoard/overview/components/EventDetail.vue b/src/views/dataBoard/overview/components/EventDetail.vue index 86141a71e..bcddea5d2 100644 --- a/src/views/dataBoard/overview/components/EventDetail.vue +++ b/src/views/dataBoard/overview/components/EventDetail.vue @@ -198,7 +198,8 @@ -
+
资源调度 催办督办
@@ -259,7 +260,8 @@ export default { loading: false, loading1: false, activities: [], - isEventDispatchOrder: false + isEventDispatchOrder: false, + user: this.$store.state.user }; }, diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue index 636a2e23d..1c6c1d7d0 100644 --- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue +++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue @@ -200,7 +200,8 @@ - + + diff --git a/src/views/dataBoard/overview/components/ServiceDetails.vue b/src/views/dataBoard/overview/components/ServiceDetails.vue index 5bc0aa97e..92f6b18af 100644 --- a/src/views/dataBoard/overview/components/ServiceDetails.vue +++ b/src/views/dataBoard/overview/components/ServiceDetails.vue @@ -93,13 +93,33 @@
{{ detail.serviceShowName }}
- + @@ -137,16 +157,18 @@ -
- 资源调度 - 催办督办 -
+ @@ -207,14 +229,14 @@ export default { this.$refs.ResourceScheduling.open() }, handleSupervision() { - this.$refs.supervision.open(this.detail, this.demandRecId,'services') + this.$refs.supervision.open(this.detail, this.demandRecId, 'services') }, handleCancel() { this.isSelect = false; this.form = {} }, handleSure() { - this.$http.post('/governance/userdemand/assign',{ + this.$http.post('/governance/userdemand/assign', { ...this.form, demandRecId: this.demandRecId }).then(res => { diff --git a/src/views/dataBoard/overview/components/map-top.vue b/src/views/dataBoard/overview/components/map-top.vue index 816dd626b..67aea9ba8 100644 --- a/src/views/dataBoard/overview/components/map-top.vue +++ b/src/views/dataBoard/overview/components/map-top.vue @@ -148,6 +148,7 @@ export default { console.log(this.searchUrl); const {data} = await requestGet(this.searchUrl, params); console.log(data, 'data'); + this.$emit('search',data) } catch (error) { console.error('Error fetching suggestions:', error); } diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index c3b3d9ab5..ef18bf3d3 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -20,7 +20,7 @@
+ @changeType="changeType" @search="search"/>
@@ -458,7 +458,17 @@ export default { resourcesPointClick(data) { this.$refs.MapResourceInfo.open(data.id, data.dataClass) }, - + search(data) { + data = data.filter(item => item.latitude && item.longitude) + data = data.map(item => { + return { + ...item, + latitude: item.latitude * 1, + longitude: item.longitude * 1 + } + }) + this.$refs.map.setResourcesPoint(data) + }, setResourcesPoint({agencyId}) { this.$http.get('/actual/base/dataBoard/resource/search?keyword=&agencyId=' + agencyId).then(res => { let data = res.data.data; diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue index c31800aec..6c4917a66 100644 --- a/src/views/dataBoard/renfang/cpts/rkfx.vue +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -135,6 +135,7 @@ export default { type, name } = item.data; + console.log(item,'itemitemitemitem') this.$router.push({ path: "/dataBoard/renfang/resi-analyze", query: { diff --git a/src/views/dataBoard/renfang/resi/analyze.vue b/src/views/dataBoard/renfang/resi/analyze.vue index 9cb9a0ab2..e573cc0a9 100644 --- a/src/views/dataBoard/renfang/resi/analyze.vue +++ b/src/views/dataBoard/renfang/resi/analyze.vue @@ -2,34 +2,34 @@
- +
{{ tableTitle }}
@@ -80,8 +80,7 @@ export default { srcTableData: [], list: [], - query: { - }, + query: {}, colList: [ { @@ -135,7 +134,8 @@ export default { ], displayedResiId: "", - popupShow: false + popupShow: false, + key: 'type' }; }, @@ -143,26 +143,37 @@ export default { this.org_id = getQueryPara("org_id"); this.resiType = getQueryPara("type"); const type_name = getQueryPara("type_name"); + const type_category = getQueryPara("type_category"); this.breadList[1].meta.title = type_name + "居民列表"; this.tableTitle = type_name + "居民列表"; + if(type_category === '年龄') { + this.key = 'ageType' + } else if(type_category === '志愿者类别') { + this.key = 'volunteerType' + } else { + this.key = 'type' + } + this.pageNo = 1; this.getList(); }, methods: { - handleClickBreadItem({ item }) { + handleClickBreadItem({item}) { if (item.type == "back") { this.$router.back(); } }, - handleSearch() {}, + handleSearch() { + }, showInfo(index) { - this.popupShow = true + // this.popupShow = true let item = this.srcTableData[index]; - this.displayedResiId = item.resiId; + this.$router.push('/dataBoard/renfang/resident?user_id='+item.resiId) + // this.displayedResiId = item.resiId; }, handlePageNoChange(pageNo) { @@ -177,7 +188,7 @@ export default { }, async getList() { - const { org_id, resiType, pageNo, pageSize } = this; + const {org_id, resiType, pageNo, pageSize} = this; this.loading = true; const url = "/actual/base/residentBaseInfo/page"; @@ -186,17 +197,18 @@ export default { this.getQueryByResiType(resiType); this.query = { - ...this.query, - agencyId:org_id, - pageNo, - pageSize, - }; - - const { data, code, msg } = await requestPost( - url,this.query, - { - // mockId: 60069169, - } + ...this.query, + [this.key]: this.resiType, + agencyId: org_id, + pageNo, + pageSize, + }; + + const {data, code, msg} = await requestPost( + url, this.query, + { + // mockId: 60069169, + } ); this.loading = false; @@ -204,7 +216,7 @@ export default { if (code === 0) { this.srcTableData = data.list; this.total = data.total; - + this.list = data.list.map((item, index) => { return [ index + 1, @@ -215,7 +227,7 @@ export default { item.idNum ? item.idNum : "--", item.gender === "1" ? "男" : (item.gender === "2" ? "女" : "--"), item.birthday ? item.birthday : "--", - { type: "operate", list: ["查看"] }, + {type: "operate", list: ["查看"]}, ]; }); } else { @@ -223,67 +235,67 @@ export default { } }, - getQueryByResiType(resiType){ - if(resiType == "male_count"){ - this.query = {gender:"1" }; - }else if (resiType == "female_count") { - this.query = {gender:"2" }; - }else if (resiType == "local_count") { - this.query = {localResidenceFlag:"1" }; - }else if (resiType == "field_count") { - this.query = {localResidenceFlag:"0" }; - }else if (resiType == "resi_y_house_y_count") { - this.query = {householdSituation:"rhyz" }; - }else if (resiType == "resi_y_house_n_count") { - this.query = {householdSituation:"rzhbz" }; - }else if (resiType == "resi_n_house_y_count") { - this.query = {householdSituation:"hzrbz" }; - }else if (resiType == "age50_count") { - this.query = {gender:"2" }; - }else if (resiType == "age5059_count") { - this.query = {gender:"2" }; - }else if (resiType == "age6069_count") { - this.query = {gender:"2" }; - }else if (resiType == "age7079_count") { - this.query = {gender:"2" }; - }else if (resiType == "age80_count") { - this.query = {gender:"2" }; - }else if (resiType == "culture_count") { - this.query = {gender:"2" }; - }else if (resiType == "committee_count") { - this.query = {gender:"2" }; - }else if (resiType == "capable_count") { - this.query = {gender:"2" }; - }else if (resiType == "friend_count") { - this.query = {gender:"2" }; - }else if (resiType == "agent_count") { - this.query = {gender:"2" }; - }else if (resiType == "mediator_count") { - this.query = {gender:"2" }; - }else if (resiType == "collector_count") { - this.query = {gender:"2" }; - }else if (resiType == "security_count") { - this.query = {gender:"2" }; - }else if (resiType == "party_mem_count") { - this.query = {gender:"2" }; - }else if (resiType == "primary_count") { - this.query = {cultureLevel:"0",categoryKey:"PARTY_FLAG"}; - }else if (resiType == "junior_high_count") { - this.query = {cultureLevel:"1",categoryKey:"PARTY_FLAG"}; - }else if (resiType == "second_speci_count") { - this.query = {cultureLevel:"2",categoryKey:"PARTY_FLAG"}; - }else if (resiType == "high_school_count") { - this.query = {cultureLevel:"3",categoryKey:"PARTY_FLAG"}; - }else if (resiType == "junior_college_count") { - this.query = {cultureLevel:"4",categoryKey:"PARTY_FLAG"}; - }else if (resiType == "undergrad_count") { - this.query = {cultureLevel:"5",categoryKey:"PARTY_FLAG"}; - }else if (resiType == "master_count") { - this.query = {cultureLevel:"6",categoryKey:"PARTY_FLAG"}; - }else if (resiType == "doctor_count") { - this.query = {cultureLevel:"7",categoryKey:"PARTY_FLAG"}; - } - }, + getQueryByResiType(resiType) { + if (resiType == "male_count") { + this.query = {gender: "1"}; + } else if (resiType == "female_count") { + this.query = {gender: "2"}; + } else if (resiType == "local_count") { + this.query = {localResidenceFlag: "1"}; + } else if (resiType == "field_count") { + this.query = {localResidenceFlag: "0"}; + } else if (resiType == "resi_y_house_y_count") { + this.query = {householdSituation: "rhyz"}; + } else if (resiType == "resi_y_house_n_count") { + this.query = {householdSituation: "rzhbz"}; + } else if (resiType == "resi_n_house_y_count") { + this.query = {householdSituation: "hzrbz"}; + } else if (resiType == "age50_count") { + this.query = {gender: "2"}; + } else if (resiType == "age5059_count") { + this.query = {gender: "2"}; + } else if (resiType == "age6069_count") { + this.query = {gender: "2"}; + } else if (resiType == "age7079_count") { + this.query = {gender: "2"}; + } else if (resiType == "age80_count") { + this.query = {gender: "2"}; + } else if (resiType == "culture_count") { + this.query = {gender: "2"}; + } else if (resiType == "committee_count") { + this.query = {gender: "2"}; + } else if (resiType == "capable_count") { + this.query = {gender: "2"}; + } else if (resiType == "friend_count") { + this.query = {gender: "2"}; + } else if (resiType == "agent_count") { + this.query = {gender: "2"}; + } else if (resiType == "mediator_count") { + this.query = {gender: "2"}; + } else if (resiType == "collector_count") { + this.query = {gender: "2"}; + } else if (resiType == "security_count") { + this.query = {gender: "2"}; + } else if (resiType == "party_mem_count") { + this.query = {gender: "2"}; + } else if (resiType == "primary_count") { + this.query = {cultureLevel: "0", categoryKey: "PARTY_FLAG"}; + } else if (resiType == "junior_high_count") { + this.query = {cultureLevel: "1", categoryKey: "PARTY_FLAG"}; + } else if (resiType == "second_speci_count") { + this.query = {cultureLevel: "2", categoryKey: "PARTY_FLAG"}; + } else if (resiType == "high_school_count") { + this.query = {cultureLevel: "3", categoryKey: "PARTY_FLAG"}; + } else if (resiType == "junior_college_count") { + this.query = {cultureLevel: "4", categoryKey: "PARTY_FLAG"}; + } else if (resiType == "undergrad_count") { + this.query = {cultureLevel: "5", categoryKey: "PARTY_FLAG"}; + } else if (resiType == "master_count") { + this.query = {cultureLevel: "6", categoryKey: "PARTY_FLAG"}; + } else if (resiType == "doctor_count") { + this.query = {cultureLevel: "7", categoryKey: "PARTY_FLAG"}; + } + }, }, destroyed() { @@ -292,4 +304,4 @@ export default { }; - + diff --git a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue index 3b08f8893..2f6ee5bcc 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue @@ -14,20 +14,20 @@ - + @@ -78,10 +78,10 @@ export default { path: "/dataBoard/satisfactionEval/index", name: "满意度评价", }, - /* { - path: "/dataBoard/satisfactionEval/Problem/tddtlxsj", - name: "同地点同类型重复投诉问题列表", - },*/ + /* { + path: "/dataBoard/satisfactionEval/Problem/tddtlxsj", + name: "同地点同类型重复投诉问题列表", + },*/ { path: "", name: "详情", @@ -98,6 +98,34 @@ export default { }, activated() { // this.breadcrumbList[2].name = this.address + '' + let type = this.$route.query.type; + if (type === 'list') { + this.breadcrumbList = [ + { + path: "/dataBoard/satisfactionEval/index", + name: "满意度评价", + }, + { + path: "/dataBoard/satisfactionEval/Problem/tddtlxsj", + name: "同地点同类型重复投诉问题列表", + }, + { + path: "", + name: "详情", + } + ] + } else { + this.breadcrumbList = [ + { + path: "/dataBoard/satisfactionEval/index", + name: "满意度评价", + }, + { + path: "", + name: "详情", + } + ] + } this.recId = this.$route.query.recId; this.departId = this.$route.query.departId; this.address = this.$route.query.address; @@ -109,30 +137,30 @@ export default { this.queryParams.pageNo = 1; this.getList(); }, - async getList() { + async getList() { this.loading = true; let params = { ...this.queryParams, } try { const url = "/governance/dwdEvent/list"; - if(this.recId){ + if (this.recId) { params.secondIdList = [this.recId]; } - if(this.departId){ + if (this.departId) { params.departId = this.departId; } - if(this.address){ + if (this.address) { params.content = this.address; } - if(this.mobile){ + if (this.mobile) { params.mobile = this.mobile; } - const { data, code, msg } = await requestPost(url, { + const {data, code, msg} = await requestPost(url, { ...params, }); if (code == 0) { @@ -152,14 +180,14 @@ export default { }, // 查看 handleLook(row) { - let { reportUserId } = row - this.$router.push({ - path: "/dataBoard/overview/resident", - query: { - user_id: reportUserId, - type:'renfang' - }, - }); + let {reportUserId} = row + this.$router.push({ + path: "/dataBoard/overview/resident", + query: { + user_id: reportUserId, + type: 'renfang' + }, + }); }, }, }; diff --git a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue index 36f70d18e..a0e6b85fe 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/list.vue @@ -121,36 +121,36 @@ export default { ...this.timeChange(this.typeCondition) } requestPost('/governance/dwdEvent/eventList',params).then(({data}) => { - this.total = data.total; - this.list = data.list; + this.total = data?data.total : 0; + this.list = data?data.list : []; this.loading = false; }); }, timeChange(type) { - let startTime = "", - endTime = ""; + let queryDateStart = "", + queryDateEnd = ""; if (type == 1) { - startTime = this.$moment().startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().startOf("month").format("YYYY-MM-DD"); } if (type == 2) { - startTime = this.$moment().subtract(1, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(1, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 3) { - startTime = this.$moment().subtract(2, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(2, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 4) { - startTime = this.$moment().subtract(5, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(5, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 5) { - startTime = this.$moment().subtract(11, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(11, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 2) { - endTime = this.$moment().subtract(1, "months").endOf("month").format("YYYY-MM-DD"); + queryDateEnd = this.$moment().subtract(1, "months").endOf("month").format("YYYY-MM-DD"); } else { - endTime = this.$moment().endOf("month").format("YYYY-MM-DD"); + queryDateEnd = this.$moment().endOf("month").format("YYYY-MM-DD"); } - return {startTime, endTime}; + return {queryDateStart, queryDateEnd}; }, handleView(row) { let params = { @@ -158,7 +158,7 @@ export default { address: row.address } - this.$router.push('/dataBoard/satisfactionEval/Problem/tddtlxsj/detail?'+this.$paramsFormat(params)) + this.$router.push('/dataBoard/satisfactionEval/Problem/tddtlxsj/detail?type=list&'+this.$paramsFormat(params)) }, }, }; diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue index f4aabba98..512ea30bd 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue @@ -14,20 +14,20 @@ - + @@ -78,10 +78,10 @@ export default { path: "/dataBoard/satisfactionEval/index", name: "满意度评价", }, - /* { - path: "/dataBoard/satisfactionEval/Problem/tyqybtlx", - name: "同一区域不同类型重复投诉问题列表", - },*/ + /* { + path: "/dataBoard/satisfactionEval/Problem/tyqybtlx", + name: "同一区域不同类型重复投诉问题列表", + },*/ { path: "", name: "详情", @@ -98,6 +98,34 @@ export default { }, activated() { // this.breadcrumbList[2].name = this.address + '' + let type = this.$route.query.type + if (type === 'list') { + this.breadcrumbList = [ + { + path: "/dataBoard/satisfactionEval/index", + name: "满意度评价", + }, + { + path: "/dataBoard/satisfactionEval/Problem/tyqybtlx", + name: "同一区域不同类型重复投诉问题列表", + }, + { + path: "", + name: "详情", + }, + ] + } else { + this.breadcrumbList = [ + { + path: "/dataBoard/satisfactionEval/index", + name: "满意度评价", + }, + { + path: "", + name: "详情", + }, + ] + } this.recId = this.$route.query.recId; this.departId = this.$route.query.departId; this.address = this.$route.query.address; @@ -116,23 +144,23 @@ export default { } try { const url = "/governance/dwdEvent/list"; - if(this.recId){ + if (this.recId) { params.secondIdList = [this.recId]; } - if(this.departId){ + if (this.departId) { params.departId = this.departId; } - if(this.address){ + if (this.address) { params.content = this.address; } - if(this.mobile){ + if (this.mobile) { params.mobile = this.mobile; } - const { data, code, msg } = await requestPost(url, { + const {data, code, msg} = await requestPost(url, { ...params, }); if (code == 0) { @@ -152,14 +180,14 @@ export default { }, // 查看 handleLook(row) { - let { reportUserId } = row - this.$router.push({ - path: "/dataBoard/overview/resident", - query: { - user_id: reportUserId, - type:'renfang' - }, - }); + let {reportUserId} = row + this.$router.push({ + path: "/dataBoard/overview/resident", + query: { + user_id: reportUserId, + type: 'renfang' + }, + }); }, }, }; diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue index 3cb6c5587..2d5e2dcd3 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue @@ -161,39 +161,39 @@ export default { ...this.timeChange(this.typeCondition) } requestPost('/governance/dwdEvent/eventList',params).then(({data}) => { - this.total = data.total; - this.data = data.list; + this.total = data?data.total : 0; + this.list = data?data.list : []; this.loading = false; }); }, timeChange(type) { - let startTime = "", - endTime = ""; + let queryDateStart = "", + queryDateEnd = ""; if (type == 1) { - startTime = this.$moment().startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().startOf("month").format("YYYY-MM-DD"); } if (type == 2) { - startTime = this.$moment().subtract(1, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(1, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 3) { - startTime = this.$moment().subtract(2, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(2, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 4) { - startTime = this.$moment().subtract(5, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(5, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 5) { - startTime = this.$moment().subtract(11, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(11, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 2) { - endTime = this.$moment().subtract(1, "months").endOf("month").format("YYYY-MM-DD"); + queryDateEnd = this.$moment().subtract(1, "months").endOf("month").format("YYYY-MM-DD"); } else { - endTime = this.$moment().endOf("month").format("YYYY-MM-DD"); + queryDateEnd = this.$moment().endOf("month").format("YYYY-MM-DD"); } - return {startTime, endTime}; + return {queryDateStart, queryDateEnd}; }, handleView({address}) { - this.$router.push('/dataBoard/satisfactionEval/Problem/tyqybtlx/detail?address=' + address) + this.$router.push('/dataBoard/satisfactionEval/Problem/tyqybtlx/detail?type=list&address=' + address) }, }, }; diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue b/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue index 641683426..0a9b44902 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue @@ -98,6 +98,34 @@ export default { }, activated() { // this.breadcrumbList[2].name = this.address + '' + let type = this.$route.query.type; + if(type === 'list') { + this.breadcrumbList = [ + { + path: "/dataBoard/satisfactionEval/index", + name: "满意度评价", + }, + { + path: "/dataBoard/satisfactionEval/Problem/tyry", + name: "同一人员重复投诉问题列表", + }, + { + path: "", + name: "详情", + } + ] + } else { + this.breadcrumbList = [ + { + path: "/dataBoard/satisfactionEval/index", + name: "满意度评价", + }, + { + path: "", + name: "详情", + } + ] + } this.recId = this.$route.query.recId; this.departId = this.$route.query.departId; this.address = this.$route.query.address; diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue index ae4442bb2..a3abd4a35 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue @@ -136,40 +136,40 @@ export default { ...this.timeChange(this.typeCondition) } requestPost('/governance/dwdEvent/eventList',params).then(({data}) => { - this.total = data.total; - this.list = data.list; + this.total = data?data.total : 0; + this.list = data?data.list : []; this.loading = false; }); }, timeChange(type) { - let startTime = "", - endTime = ""; + let queryDateStart = "", + queryDateEnd = ""; if (type == 1) { - startTime = this.$moment().startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().startOf("month").format("YYYY-MM-DD"); } if (type == 2) { - startTime = this.$moment().subtract(1, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(1, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 3) { - startTime = this.$moment().subtract(2, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(2, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 4) { - startTime = this.$moment().subtract(5, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(5, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 5) { - startTime = this.$moment().subtract(11, "months").startOf("month").format("YYYY-MM-DD"); + queryDateStart = this.$moment().subtract(11, "months").startOf("month").format("YYYY-MM-DD"); } if (type == 2) { - endTime = this.$moment().subtract(1, "months").endOf("month").format("YYYY-MM-DD"); + queryDateEnd = this.$moment().subtract(1, "months").endOf("month").format("YYYY-MM-DD"); } else { - endTime = this.$moment().endOf("month").format("YYYY-MM-DD"); + queryDateEnd = this.$moment().endOf("month").format("YYYY-MM-DD"); } - return {startTime, endTime}; + return {queryDateStart, queryDateEnd}; }, handleView(row) { - this.$router.push('/dataBoard/satisfactionEval/Problem/tyry/detail?mobile='+row.mobile) + this.$router.push('/dataBoard/satisfactionEval/Problem/tyry/detail?type=list&mobile='+row.mobile) }, // 查看 handleLook(row) {