diff --git a/src/assets/images/home/dangerHome.png b/src/assets/images/home/dangerHome.png index dcd17e5d4..f383f2d53 100644 Binary files a/src/assets/images/home/dangerHome.png and b/src/assets/images/home/dangerHome.png differ diff --git a/src/assets/images/home/dangerHomeBg.png b/src/assets/images/home/dangerHomeBg.png new file mode 100644 index 000000000..a3102ad73 Binary files /dev/null and b/src/assets/images/home/dangerHomeBg.png differ diff --git a/src/assets/images/home/dangerPeople.png b/src/assets/images/home/dangerPeople.png new file mode 100644 index 000000000..b4eb892f2 Binary files /dev/null and b/src/assets/images/home/dangerPeople.png differ diff --git a/src/assets/images/home/freeHome.png b/src/assets/images/home/freeHome.png index 9737f5f25..549d7b344 100644 Binary files a/src/assets/images/home/freeHome.png and b/src/assets/images/home/freeHome.png differ diff --git a/src/assets/images/home/hasPeople.png b/src/assets/images/home/hasPeople.png index cd55e46c0..f1218979c 100644 Binary files a/src/assets/images/home/hasPeople.png and b/src/assets/images/home/hasPeople.png differ diff --git a/src/assets/images/home/homeBottom.png b/src/assets/images/home/homeBottom.png index 53d48ef5d..0c8b8211c 100644 Binary files a/src/assets/images/home/homeBottom.png and b/src/assets/images/home/homeBottom.png differ diff --git a/src/assets/images/home/homeTop.png b/src/assets/images/home/homeTop.png index 2f8e73ea9..065989ed3 100644 Binary files a/src/assets/images/home/homeTop.png and b/src/assets/images/home/homeTop.png differ diff --git a/src/js/store/modules/chooseArea.js b/src/js/store/modules/chooseArea.js index 0619530fb..8e138c8db 100644 --- a/src/js/store/modules/chooseArea.js +++ b/src/js/store/modules/chooseArea.js @@ -3,6 +3,7 @@ const state = { orgId: "", level: "", }, + commonLoading: false, realScale: null, }; @@ -13,6 +14,9 @@ const mutations = { CHOOSE_REAL_SCALE: (state, name) => { state.realScale = name; }, + COMMON_LOADING: (state, flag) => { + state.commonLoading = flag; + }, }; const actions = { @@ -22,6 +26,9 @@ const actions = { chooseScale({ commit }, name) { commit("CHOOSE_REAL_SCALE", name); }, + chooseLoading({ commit }, flag) { + commit("COMMON_LOADING", flag); + }, }; export default { diff --git a/src/views/dataBoard/cpts/details/xqwmz.vue b/src/views/dataBoard/cpts/details/xqwmz.vue index 9c61d5571..1a8fd95ff 100644 --- a/src/views/dataBoard/cpts/details/xqwmz.vue +++ b/src/views/dataBoard/cpts/details/xqwmz.vue @@ -28,27 +28,27 @@ src="@/assets/images/manyidu/tc-title-icon.png" />事项详情 -
+
不满意事项来源： 社区意度自查
不满意事项类型： - {{ item.scopeId && getSxType(item.scopeId) }} + {{ getSxType(item) }}
-
+
不满意事项描述：
-
{{ item.problemDesc }}
+
{{ getSxReason(item) }}
提交人姓名： @@ -58,10 +58,10 @@ 提交人电话： {{ $sensitive(item.reporterMobile, 3, 7) }}
-
+
@@ -94,10 +94,51 @@ export default { logList: [], }, loading: false, - loading1: false, - activities: [], // 不满意类型列表 - satisfactionCategoryOptions: [], + satisfactionCategoryOptions: [ + { + key: "evaCulturalFacility", + value: "文化设施", + }, + { + key: "evaSportsFacility", + value: "体育设施", + }, + { + key: "evaEcologicalEnv", + value: "生态环境", + }, + { + key: "evaSocialSecurity", + value: "社会治安", + }, + { + key: "evaocialAssistance", + value: "社会救助", + }, + { + key: "evaOldPeopleProvide", + value: "老有所养", + }, + { + key: "evaBasicEducation", + value: "基础教育", + }, + { + key: "evaMedical", + value: "病有所医", + }, + ], + reason: [ + "basicEducationReason", + "culturalFacilityReason", + "ecologicalEnvReason", + "medicalReason", + "oldPeopleProvideReason", + "socialAssistanceReason", + "socialSecurityReason", + "sportsFacilityReason", + ], }; }, @@ -128,13 +169,41 @@ export default { return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm"); }, - getSxType(value) { - if (this.satisfactionCategoryOptions.length > 0 && value) { - return this.satisfactionCategoryOptions.filter( - (item) => item.value == value - )[0].label; + getSxType(row) { + let arr = []; + let text = ""; + for (let k in row) { + if (row[k] == "bad") { + arr.push(k); + } } - return ""; + this.satisfactionCategoryOptions.forEach((item) => { + arr.forEach((item1) => { + if (item1 == item.key) { + if (text == "") { + text = item.value; + } else { + text = text + "， " + item.value; + } + } + }); + }); + return text; + }, + getSxReason(row) { + let text = ""; + this.reason.forEach((item) => { + for (let key in row) { + if (item == key && row[key]) { + if (text == "") { + text = row[key]; + } else { + text = text + "；" + row[key]; + } + } + } + }); + return text; }, getMonthData(time) { if (time) { @@ -152,7 +221,7 @@ export default { this.loading = false; const { code, data, msg } = res.data; if (code === 0) { - this.item = {...data.reporter,...data.satisfaction}; + this.item = { ...data.reporter, ...data.satisfaction }; } else { this.$message.error(msg); } @@ -168,18 +237,19 @@ export default { // this.$message.error(msg); // } // }); - this.$http - .get( - "/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource=" - ) - .then(({ data: { data } }) => { - this.satisfactionCategoryOptions = data.map((item) => { - return { - label: item.categoryName, - value: item.categoryCode, - }; - }); - }); + // this.$http + // .get( + // "/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource=" + // ) + // .then(({ data: { data } }) => { + // console.log('data::', data); + // this.satisfactionCategoryOptions = data.map((item) => { + // return { + // label: item.categoryName, + // value: item.categoryCode, + // }; + // }); + // }); }, }, }; diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue b/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue index 469ac6fec..8c1bec5c7 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue @@ -18,7 +18,7 @@
暂无数据
- +
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue b/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue index 3858f601c..aec28a7dc 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue @@ -16,6 +16,7 @@
暂无数据
+ diff --git a/src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue b/src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue new file mode 100644 index 000000000..5c316daf8 --- /dev/null +++ b/src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue index 395b00a6d..6037d4d03 100644 --- a/src/views/dataBoard/cpts/homeDetails/index.vue +++ b/src/views/dataBoard/cpts/homeDetails/index.vue @@ -22,52 +22,100 @@ {{ homeMsg.type === "red" ? "红" : homeMsg.type === "yellow" ? "黄" : "绿" }}色微网格 +
/
-
-
-
-
{{ itm.doorName }}
+
+
+
+
+
+
{{ itm.doorName }}
+
+
{{ itm.doorName }}
+ +
+
+
{{ itm.doorName }}
+ +
+
+
闲置
+
+
+
- +
-
+
+
+ + + + + + + + + + + + 查询 + +
- - - - - - + + + + + + - + + + + + - - + + + + + + @@ -77,9 +125,9 @@
- +
+ +
@@ -89,6 +137,7 @@ import Pagination from "@/views/dataBoard/satisfactionEval/components/Pagination"; import Title from "./Title/index.vue"; import BreadCrumb from "@/views/dataBoard/cpts/personnel/components/Breadcrumb/index.vue"; +import PeopleMount from "./PeopleMount/index.vue"; export default { name: "homeDetails", @@ -96,43 +145,55 @@ export default { Pagination, Title, BreadCrumb, + PeopleMount, }, data() { return { - // total: 0, - // pageNum: 1, - // pageSize: 10, + total: 0, + queryParams: { + pageNo: 1, + pageSize: 10, + unitId: "", + ownerName: "", + ownerPhone: "", + ownerIdCard: "", + riskyFlag: "", + residentTag: "", + }, + orgOptions: [], + peopleTypeList: [], + riskHomeList: [ + { + label: "风险", + value: "1", + }, + { + label: "无风险", + value: "0", + }, + ], flexWidth: 0, loading: false, homeMsg: {}, list: [], homeText: "", buildingList: [], - houseMountArr: [], + houseMountArr: [ + // [ + // { doorName: 101, riskyNum: 0, importanceNum: 0, rentFlag: "0" }, + // { doorName: 102, riskyNum: 1, importanceNum: 0, rentFlag: "0" }, + // { doorName: 103, riskyNum: 0, importanceNum: 1, rentFlag: "0" }, + // { doorName: 104, riskyNum: 0, importanceNum: 0, rentFlag: "2" }, + // ], + ], }; }, - watch: { - // "$route.query.buIding": { - // handler(val) { - // if (val) { - // this.getList(val); - // } - // }, - // immediate: true, - // }, - // "$route.query.typeB": { - // handler(val) { - // console.log("jhjkbhkjhkjhkjhkjhkj"); - // if (val) { - // this.getList(); - // } - // }, - // immediate: true, - // }, - }, + watch: {}, mounted() { const buId = this.$route.query.buId || null; this.getList(buId); + // this.getTableData(this.$route.query.id); + this.getPeopleTypeList(); }, methods: { getDoorNameList(list) { @@ -166,8 +227,20 @@ export default { return doorNameList; }, + getPeopleTypeList() { + this.$http + .post("sys/dict/data/dictlist", { + dictType: "resident_category", + }) + .then((res) => { + const { code, data } = res.data; + if (code === 0) { + this.peopleTypeList = data; + } + }); + }, + getUnitList(id) { - this.loading = true; this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + id).then((res) => { const { code, @@ -175,13 +248,27 @@ export default { } = res.data; if (code === 0) { let unitInfos = unitInfo || {}; - this.list = houseList; this.homeMsg = unitInfos; this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : ""); - this.houseMountArr = this.getDoorNameList(this.list); + this.houseMountArr = this.getDoorNameList(houseList); if (this.houseMountArr.length > 0) { this.flexWidth = this.houseMountArr[0].length * 58; } + } + }); + }, + + getTableData(id) { + this.queryParams.unitId = id; + this.loading = true; + this.$http.get("/actual/base/streetOverview/getUnitHouseOverviewList?" + this.$paramsFormat(this.queryParams)).then((res) => { + const { + code, + data: { list, total }, + } = res.data; + if (code === 0) { + this.list = list; + this.total = total; this.loading = false; } else { this.loading = false; @@ -189,6 +276,11 @@ export default { }); }, + search() { + this.queryParams.pageNo = 1; + this.getTableData(); + }, + getList(buid) { const homeType = this.$route.query.typeB; if (homeType === "building") { @@ -201,10 +293,10 @@ export default { if (this.buildingList && this.buildingList.length > 0) { if (buid) { this.buildingList.forEach((item, i) => { - console.log(item); if (item.id === buid) { item.ifActive = true; this.getUnitList(item.id); + this.getTableData(item.id); } else { item.ifActive = false; } @@ -214,6 +306,7 @@ export default { if (i === 0) { item.ifActive = true; this.getUnitList(item.id); + this.getTableData(item.id); } else { item.ifActive = false; } @@ -227,6 +320,7 @@ export default { }); } else { this.getUnitList(this.$route.query.id); + this.getTableData(this.$route.query.id); } }, @@ -256,6 +350,7 @@ export default { if (item.id === d.id) { d.ifActive = true; this.getUnitList(item.id); + this.getTableData(item.id); } else { d.ifActive = false; } @@ -295,6 +390,22 @@ export default { cursor: pointer; } +@mixin homeCommon { + height: 58px; + background-size: 100% 100%; + display: flex; + flex: 0 0 48px; + align-items: center; + justify-content: center; + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + color: #fff; + &:not(:last-child) { + margin-right: 10px; + } +} + .top-nav-list { display: flex; margin-bottom: 16px; @@ -327,7 +438,7 @@ export default { display: flex; align-items: flex-end; justify-content: center; - margin-top: 100px; + margin-top: 60px; .apar_comtent { display: flex; @@ -338,10 +449,9 @@ export default { .apar_center { min-width: 244px; max-width: 488px; - height: 584px; + height: 578px; overflow: auto; - background: url("@/assets/images/home/homeCenter.png") no-repeat; - background-size: 100% 100%; + background: #caab93; padding: 30px 30px 10px 30px; display: flex; // align-items: flex-end; @@ -362,26 +472,34 @@ export default { margin-bottom: 20px; .households { - height: 58px; + @include homeCommon; background: url("@/assets/images/home/hasPeople.png") no-repeat; - background-size: 100% 100%; - display: flex; - flex: 0 0 48px; - align-items: center; - justify-content: center; - font-size: 14px; - font-family: PingFang SC; - font-weight: 500; - color: #7fceff; - &:not(:last-child) { - margin-right: 10px; - } } + .dangerHome, + .dangerPeople { + @include homeCommon; + background: url("@/assets/images/home/dangerHomeBg.png") no-repeat; + } + .freeHome { + @include homeCommon; + background: url("@/assets/images/home/freeHome.png") no-repeat; + } + } + } + + .dangerClass { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + div:first-child { + margin-bottom: 5px; + font-weight: bold; } } .apar_bottom { - width: 244px; + width: 100%; margin-top: -1px; img { @@ -390,9 +508,9 @@ export default { } } - .apar_right { - margin-left: -3px; - } + // .apar_right { + // margin-left: -3px; + // } } .more { @@ -427,5 +545,39 @@ export default { color: yellow; } } + .mount { + margin-top: 25px; + } + + .screen { + margin: 5px 0 40px; + + .el-select, + .el-input { + width: 150px; + margin-right: 4px; + border: 1px solid #126ac5; + border-radius: 2px; + + /deep/ .el-input__inner { + background: none; + border: none; + color: #fff; + } + } + + .searchSelect { + width: 200px; + /deep/ .el-select__tags { + width: 200px !important; + max-width: 200px !important; + } + } + + .btn { + margin-left: 46px; + height: 32px; + } + } } diff --git a/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue b/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue index 55d3c2e62..f5c8f03b4 100644 --- a/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue +++ b/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue @@ -17,7 +17,7 @@
暂无数据
- +
- + @@ -12,20 +17,27 @@ -
- +
+
暂无数据
- +
@@ -1054,49 +1047,47 @@ export default { @import "~@/assets/scss/c/function.scss"; .u-categorys { - display: flex; - flex-wrap: wrap; - - + display: flex; + flex-wrap: wrap; } .u-categorys span { - display: block; - width: 90px; - } + display: block; + width: 90px; +} .m-tabs { - margin-top: 30px; - display: flex; - align-items: center; - padding-left: 20px; + margin-top: 30px; + display: flex; + align-items: center; + padding-left: 20px; - .tab-btn { - width: 30px; - text-align: center; - cursor: pointer; - } + .tab-btn { + width: 30px; + text-align: center; + cursor: pointer; + } - .tab { - @include toe; - margin: 0 5px; - min-width: 72px; - padding: 0 8px; - height: 24px; - box-shadow: inset 0px 0px 12px 0px rgba(26, 149, 255, 0.45); - border-radius: 2px; - border: 1px solid #1a95ff; - border-radius: 2px; - text-align: center; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 23px; - cursor: pointer; - transition: all ease 0.5s; - &.z-on { - background: linear-gradient(90deg, #1a5afd, #009cff); - box-shadow: none; - } - } + .tab { + @include toe; + margin: 0 5px; + min-width: 72px; + padding: 0 8px; + height: 24px; + box-shadow: inset 0px 0px 12px 0px rgba(26, 149, 255, 0.45); + border-radius: 2px; + border: 1px solid #1a95ff; + border-radius: 2px; + text-align: center; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 23px; + cursor: pointer; + transition: all ease 0.5s; + &.z-on { + background: linear-gradient(90deg, #1a5afd, #009cff); + box-shadow: none; + } + } } diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue index af9b3e2b3..b6b5f6a3c 100644 --- a/src/views/dataBoard/overview/components/jdwgy.vue +++ b/src/views/dataBoard/overview/components/jdwgy.vue @@ -126,9 +126,11 @@ export default { getData() { this.loading = true; if (this.currentLevelData.orgLevel == "grid") { + this.$store.dispatch("chooseArea/chooseLoading", true); const personType = this.ifUnit && this.peopleType === "unit" ? "unit" : this.peopleType; this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + personType + "&level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId).then(({ data: { data } }) => { this.loading = false; + this.$store.dispatch("chooseArea/chooseLoading", false); this.wglist = data; this.$emit( "setPoint", diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index 14c1e1440..10f28bc7e 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -261,7 +261,6 @@ export default { // 获取pieChart配置 this.pieOption = pieOption(); const {pandectData} = this - console.log(pandectData); // 设置三个配置值 this.pieOption.title.text = (pandectData.homeCount != 0 diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue index a498e359d..ebea4003f 100644 --- a/src/views/dataBoard/renfang/cpts/jmgl.vue +++ b/src/views/dataBoard/renfang/cpts/jmgl.vue @@ -7,6 +7,7 @@ class="" @myChartMethod="pieInitOk" ref="pieChart" + v-if="pandectData.totalResidents" >
@@ -31,7 +32,7 @@
居民总数
-
{{ info.resident_count }}
+
{{ pandectData.totalResidents }}
人
@@ -50,7 +51,7 @@
- {{ info.inhabitant_count }} + {{ pandectData.permanentResiCount }}
人
@@ -70,7 +71,7 @@
流动人口
-
{{ info.floating_count }}
+
{{ pandectData.floatingResiCount }}
人
@@ -145,6 +146,7 @@ export default { inhabitant_count: 0, floating_count: 0, }, + pandectData:{} }; }, watch: { @@ -153,7 +155,9 @@ export default { }, }, mounted() { - this.getData(); + this.$nextTick(()=>{ + this.getData(); + }) }, methods: { toListPage(type = "", type_name = "") { @@ -233,21 +237,19 @@ export default { async iniPieChart() { this.$refs.pieChart.clear(); // this.$refs.pieChart.showLoading() - // 获取pieChart配置 this.pieOption = pieOption(); - - const { info } = this; + const { pandectData } = this; // 设置三个配置值 this.pieOption.title.text = - (info.resident_count != 0 + (pandectData.totalResidents != 0 ? parseInt( - (100 * info.inhabitant_count) / info.resident_count + (100 * pandectData.permanentResiCount) / pandectData.totalResidents ) : "--") + "%"; this.pieData = [ - { value: info.inhabitant_count, name: "常住人口" }, - { value: info.floating_count, name: "流动人口" }, + { value: pandectData.permanentResiCount, name: "常住人口" }, + { value: pandectData.floatingResiCount, name: "流动人口" }, ]; this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); @@ -260,14 +262,14 @@ export default { fromActionPayload: { dataIndexInside }, } = params; this.pieOption.title.text = - (info.resident_count != 0 + (pandectData.totalResidents != 0 ? parseInt( (100 * [ - info.inhabitant_count, - info.floating_count, + pandectData.permanentResiCount, + pandectData.floatingResiCount, ][dataIndexInside]) / - info.resident_count + pandectData.totalResidents ) : "--") + "%"; this.$refs.pieChart.myChart.setOption(this.pieOption); diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 43ddcdf17..0664e1ee3 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -17,7 +17,7 @@
- +
@@ -31,7 +31,7 @@
- +
@@ -553,6 +553,7 @@ export default { if (data) { this.$nextTick(()=>{ this.$refs['fwgl'].pandectData = data + this.$refs['jmgl'].pandectData = data } ) } diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue index fce7569c4..cd48fc444 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue @@ -91,7 +91,7 @@ import Pagination from "@/views/dataBoard/satisfactionEval/components/Pagination import DissatisfiedDetail from "./detail.vue"; export default { - name: "dissatisfied", + name: "dissatisfiedPage", components: { Breadcrumb, DissatisfiedDetail, Pagination }, data() { return { diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue index 08a4415b1..d0b753961 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue @@ -1,19 +1,14 @@ - + - + - + - + - + @@ -59,7 +53,7 @@ import Title from "@/views/dataBoard/satisfactionEval/components/Title"; export default { name: "dissatisfied", - components: {Breadcrumb, Pagination, Title}, + components: { Breadcrumb, Pagination, Title }, data() { return { queryParams: { @@ -78,11 +72,11 @@ export default { }, ], monthOptions: new Array(12).fill(0).map((_, index) => { - return {label: index - 0 + 1 + "月", value: index - 0 + 1}; + return { label: index - 0 + 1 + "月", value: index - 0 + 1 }; }), list: [], title: "", - loading: true + loading: true, }; }, activated() { @@ -97,14 +91,14 @@ export default { }, methods: { getList() { - this.loading = true - this.$http.get("/governance/satisfactionOverview/satisfactionCrowdList?" + this.$paramsFormat(this.queryParams)).then(({data: {data}}) => { + this.loading = true; + this.$http.get("/governance/satisfactionOverview/satisfactionCrowdList?" + this.$paramsFormat(this.queryParams)).then(({ data: { data } }) => { this.list = data.list; this.total = data.total; - this.loading = false + this.loading = false; }); }, - handleView({restName, restId}) { + handleView({ restName, restId }) { this.$router.push("/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail?name=" + restName + "&user_id=" + restId); }, }, diff --git a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue index fcd2f8c99..b1bef450f 100644 --- a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue @@ -26,7 +26,12 @@ 事件未解决
上报人数 -
{{ unSolvedNum ? unSolvedNum : 0 }}人
+
+ {{ + unSolvedNum ? unSolvedNum : 0 + }}人 +
人数
-
{{ unFinishNum ? unFinishNum : 0 }}人
+
+ {{ + unFinishNum ? unFinishNum : 0 + }}人 +
服务人数
-
{{ noServiceNum ? noServiceNum : 0 }}人
+
+ {{ + noServiceNum ? noServiceNum : 0 + }}人 +
@@ -174,7 +189,8 @@ export default { .imgIcon { width: 30px; height: 30px; - margin-top: -100px; + position: relative; + top: -58px; } .imgBg { display: block; diff --git a/src/views/dataBoardMain/main-content.vue b/src/views/dataBoardMain/main-content.vue index bab5bc7f7..d62d01192 100644 --- a/src/views/dataBoardMain/main-content.vue +++ b/src/views/dataBoardMain/main-content.vue @@ -5,7 +5,7 @@