From f9fdfe6a82c54be94cf4516edf70d79c8c93efd8 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 23 Feb 2023 10:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E4=BA=BA=E6=88=BF=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/assets/images/main/联建单位列表.xls | Bin 0 -> 6778 bytes src/assets/images/main/联建活动列表.xls | Bin 0 -> 5404 bytes src/assets/scss/dataBoard/renfang/index.scss | 19 ++ src/js/dai/request-bipass.js | 2 +- src/views/dataBoard/cpts/bread.vue | 2 +- src/views/dataBoard/cpts/house-details.vue | 2 +- src/views/dataBoard/cpts/resi-details.vue | 22 +- src/views/dataBoard/cpts/tb.vue | 6 +- src/views/dataBoard/renfang/cpts/bread.vue | 2 +- src/views/dataBoard/renfang/cpts/fwgl.vue | 78 +++-- src/views/dataBoard/renfang/cpts/jmgl.vue | 80 +++-- src/views/dataBoard/renfang/cpts/rkfx.vue | 68 ++-- src/views/dataBoard/renfang/cpts/rkyj.vue | 14 +- src/views/dataBoard/renfang/cpts/szsq.vue | 18 +- src/views/dataBoard/renfang/house/list.vue | 12 +- src/views/dataBoard/renfang/index.vue | 218 ++++++++----- src/views/dataBoard/renfang/resi/analyze.vue | 10 +- src/views/dataBoard/renfang/resi/class.vue | 14 +- src/views/dataBoard/renfang/resi/list.vue | 10 +- src/views/dataBoard/renfang/warn/building.vue | 11 +- src/views/dataBoard/renfang/warn/resi.vue | 13 +- src/views/main-sidebar-sub-menu.vue | 1 - src/views/modules/zhinengtianbao/index.vue | 303 ++++++++++++++++++ vue.config.js | 107 ++++--- 25 files changed, 729 insertions(+), 285 deletions(-) create mode 100644 src/assets/images/main/联建单位列表.xls create mode 100644 src/assets/images/main/联建活动列表.xls create mode 100644 src/views/modules/zhinengtianbao/index.vue diff --git a/.env.development b/.env.development index dcf5228ce..65bdf2296 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ VUE_APP_API_SERVER = http://192.168.1.144/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api -VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route +VUE_APP_BIPASS_API_SERVER = /linkdata/linkdata-gateway/route # VUE_APP_NODE_ENV=dev_sdtdt VUE_APP_NODE_ENV=dev diff --git a/src/assets/images/main/联建单位列表.xls b/src/assets/images/main/联建单位列表.xls new file mode 100644 index 0000000000000000000000000000000000000000..5ebfc6972b0389909af98c9727c0c7f6a1ac1b90 GIT binary patch literal 6778 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 PB)I&*E~km@FW3J95znJr literal 0 HcmV?d00001 diff --git a/src/assets/images/main/联建活动列表.xls b/src/assets/images/main/联建活动列表.xls new file mode 100644 index 0000000000000000000000000000000000000000..952c6c2e2f21e5a1e1c7fbf32251bbba45424d54 GIT binary patch literal 5404 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 img { + display: block; + width: 120px; + margin: 0 auto; + margin-top: 80px; + } + > span { + margin-top: 8px; + display: block; + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(255, 255, 255, 0.65); + line-height: 20px; + text-align: center; + } + } } .m-subbox { diff --git a/src/js/dai/request-bipass.js b/src/js/dai/request-bipass.js index 6c30b8965..260796b87 100644 --- a/src/js/dai/request-bipass.js +++ b/src/js/dai/request-bipass.js @@ -74,7 +74,7 @@ const request = curry((method, uri, data = {}, params = {}) => { dispatcherSystem: "dataservice", param: { ds_code: uri, - app_code: "empet", + app_code: "empt", orderby: "[]", ...data, }, diff --git a/src/views/dataBoard/cpts/bread.vue b/src/views/dataBoard/cpts/bread.vue index c2ba6f0ba..d3e4901bc 100644 --- a/src/views/dataBoard/cpts/bread.vue +++ b/src/views/dataBoard/cpts/bread.vue @@ -52,7 +52,7 @@ export default { }, data() { return { - pageSize: 10, + pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, }; }, diff --git a/src/views/dataBoard/cpts/house-details.vue b/src/views/dataBoard/cpts/house-details.vue index 5d53c42f5..aaedebeef 100644 --- a/src/views/dataBoard/cpts/house-details.vue +++ b/src/views/dataBoard/cpts/house-details.vue @@ -118,7 +118,7 @@ export default { }, }, { - mockId: 60235478, + // mockId: 60235478, } ); diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue index 1c0671469..238a039b2 100644 --- a/src/views/dataBoard/cpts/resi-details.vue +++ b/src/views/dataBoard/cpts/resi-details.vue @@ -11,21 +11,21 @@
所属网格：
- {{ info.community + " - " + info.grid }} + {{ + info.community + }} + - {{ info.grid }}
所属房屋：
- {{ - info.village + - " - " + - info.building + - " - " + - info.unit + - " - " + - info.room - }} + {{ info.village }} + + - {{ info.building }} + - {{ info.unit }} + - {{ info.room }}
@@ -899,7 +899,7 @@ export default { }, }, { - mockId: 61172054, + // mockId: 61172054, } ); diff --git a/src/views/dataBoard/cpts/tb.vue b/src/views/dataBoard/cpts/tb.vue index aec02a806..81d308a02 100644 --- a/src/views/dataBoard/cpts/tb.vue +++ b/src/views/dataBoard/cpts/tb.vue @@ -117,7 +117,7 @@
@@ -201,7 +201,8 @@ export default { }, data() { return { - pageSize: 10, + pageSize: + parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, }; }, @@ -347,6 +348,7 @@ export default { right: 0; bottom: 0; margin: auto; + width: 120px; } } } diff --git a/src/views/dataBoard/renfang/cpts/bread.vue b/src/views/dataBoard/renfang/cpts/bread.vue index da8c680f6..93fe0e611 100644 --- a/src/views/dataBoard/renfang/cpts/bread.vue +++ b/src/views/dataBoard/renfang/cpts/bread.vue @@ -50,7 +50,7 @@ export default { }, data() { return { - pageSize: 10, + pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, }; }, diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index 723667e01..7f40bc05e 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -161,10 +161,10 @@ export default { pieData: [], info: { - house_count: "--", - self_dwelling_count: "--", - lease_count: "--", - unused_count: "--", + house_count: 0, + self_dwelling_count: 0, + lease_count: 0, + unused_count: 0, }, }; }, @@ -230,13 +230,22 @@ export default { }, }, { - mockId: 60007107, + // mockId: 60007107, } ); - if (code === 0 && data && Array.isArray(data) && data.length > 0) { - let info = data[0]; - this.info = { ...this.info, ...info }; + if (code === 0) { + if (data && Array.isArray(data) && data.length > 0) { + let info = data[0]; + this.info = { ...this.info, ...info }; + } else { + this.info = { + house_count: 0, + self_dwelling_count: 0, + lease_count: 0, + unused_count: 0, + }; + } } else { this.$message.error(msg); } @@ -252,8 +261,11 @@ export default { const { info } = this; // 设置三个配置值 this.pieOption.title.text = - parseInt((100 * info.self_dwelling_count) / info.house_count) + - "%"; + (info.house_count != 0 + ? parseInt( + (100 * info.self_dwelling_count) / info.house_count + ) + : "--") + "%"; this.pieData = [ { value: info.self_dwelling_count, name: "自住房屋" }, { value: info.lease_count, name: "出租房屋" }, @@ -270,15 +282,17 @@ export default { fromActionPayload: { dataIndexInside }, } = params; this.pieOption.title.text = - parseInt( - (100 * - [ - info.self_dwelling_count, - info.lease_count, - info.unused_count, - ][dataIndexInside]) / - info.house_count - ) + "%"; + (info.house_count != 0 + ? parseInt( + (100 * + [ + info.self_dwelling_count, + info.lease_count, + info.unused_count, + ][dataIndexInside]) / + info.house_count + ) + : "--") + "%"; this.$refs.pieChart.myChart.setOption(this.pieOption); }); }, @@ -296,23 +310,25 @@ export default { }, }, { - mockId: 60388110, + // mockId: 60388110, } ); - if (code === 0 && data && Array.isArray(data) && data.length > 0) { + if (code === 0) { let xaxis = []; let series = [{ data: [] }, { data: [] }, { data: [] }]; - for (const { - month, - self_dwelling_count, - lease_count, - unused_count, - } of data) { - xaxis.push(month); - series[0].data.push(self_dwelling_count); - series[1].data.push(lease_count); - series[2].data.push(unused_count); + if (data && Array.isArray(data) && data.length > 0) { + for (const { + month, + self_dwelling_count, + lease_count, + unused_count, + } of data) { + xaxis.push(month); + series[0].data.push(self_dwelling_count); + series[1].data.push(lease_count); + series[2].data.push(unused_count); + } } this.iniBarChart(xaxis, series); this.$refs.barChart.hideLoading(); diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue index 0fef5153b..39bb790e1 100644 --- a/src/views/dataBoard/renfang/cpts/jmgl.vue +++ b/src/views/dataBoard/renfang/cpts/jmgl.vue @@ -38,7 +38,7 @@
0) { - let info = data[0]; - this.info = { ...this.info, ...info }; + if (code === 0) { + if (data && Array.isArray(data) && data.length > 0) { + let info = data[0]; + this.info = { ...this.info, ...info }; + } else { + this.info = { + resident_count: 0, + inhabitant_count: 0, + floating_count: 0, + }; + } } else { this.$message.error(msg); } @@ -232,8 +240,11 @@ export default { const { info } = this; // 设置三个配置值 this.pieOption.title.text = - parseInt((100 * info.inhabitant_count) / info.resident_count) + - "%"; + (info.resident_count != 0 + ? parseInt( + (100 * info.inhabitant_count) / info.resident_count + ) + : "--") + "%"; this.pieData = [ { value: info.inhabitant_count, name: "常住人口" }, { value: info.floating_count, name: "流动人口" }, @@ -249,13 +260,16 @@ export default { fromActionPayload: { dataIndexInside }, } = params; this.pieOption.title.text = - parseInt( - (100 * - [info.inhabitant_count, info.floating_count][ - dataIndexInside - ]) / - info.resident_count - ) + "%"; + (info.resident_count != 0 + ? parseInt( + (100 * + [ + info.inhabitant_count, + info.floating_count, + ][dataIndexInside]) / + info.resident_count + ) + : "--") + "%"; this.$refs.pieChart.myChart.setOption(this.pieOption); }); }, @@ -273,24 +287,26 @@ export default { }, }, { - mockId: 60389779, + // mockId: 60389779, } ); - if (code === 0 && data && Array.isArray(data) && data.length > 0) { - let xaxis = []; - let series = [{ data: [] }, { data: [] }]; - for (const { - month, - inhabitant_count, - floating_count, - } of data) { - xaxis.push(month); - series[0].data.push(inhabitant_count); - series[1].data.push(floating_count); + if (code === 0) { + if (data && Array.isArray(data) && data.length > 0) { + let xaxis = []; + let series = [{ data: [] }, { data: [] }]; + for (const { + month, + inhabitant_count, + floating_count, + } of data) { + xaxis.push(month); + series[0].data.push(inhabitant_count); + series[1].data.push(floating_count); + } + this.iniBarChart(xaxis, series); + this.$refs.barChart.hideLoading(); } - this.iniBarChart(xaxis, series); - this.$refs.barChart.hideLoading(); } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue index b6110fc79..6715005ab 100644 --- a/src/views/dataBoard/renfang/cpts/rkfx.vue +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -149,14 +149,16 @@ export default { }, }, { - mockId: 60041615, + // mockId: 60041615, } ); this.$refs.pieChart.hideLoading(); - if (code === 0 && data && Array.isArray(data) && data.length > 0) { - let info = data[0]; - this.info = { ...this.info, ...info }; + if (code === 0) { + if (data && Array.isArray(data) && data.length > 0) { + let info = data[0]; + this.info = { ...this.info, ...info }; + } } else { this.$message.error(msg); } @@ -191,12 +193,12 @@ export default { if (currentTab == "性别") { this.pieData = [ { - value: info.male_count, + value: info.male_count || 0, type: "male_count", name: "男性", }, { - value: info.female_count, + value: info.female_count || 0, type: "female_count", name: "女性", }, @@ -204,12 +206,12 @@ export default { } else if (currentTab == "户籍") { this.pieData = [ { - value: info.local_count, + value: info.local_count || 0, type: "local_count", name: "本地户籍", }, { - value: info.field_count, + value: info.field_count || 0, type: "field_count", name: "外地户籍", }, @@ -217,17 +219,17 @@ export default { } else if (currentTab == "人户状况") { this.pieData = [ { - value: info.resi_y_house_y_count, + value: info.resi_y_house_y_count || 0, type: "resi_y_house_y_count", name: "人户一致", }, { - value: info.resi_y_house_n_count, + value: info.resi_y_house_n_count || 0, type: "resi_y_house_n_count", name: "人在户不在", }, { - value: info.resi_n_house_y_count, + value: info.resi_n_house_y_count || 0, type: "resi_n_house_y_count", name: "户在人不在", }, @@ -235,27 +237,27 @@ export default { } else if (currentTab == "年龄") { this.pieData = [ { - value: info.age50_count, + value: info.age50_count || 0, type: "age50_count", name: "50岁以下", }, { - value: info.age5059_count, + value: info.age5059_count || 0, type: "age5059_count", name: "50-59岁", }, { - value: info.age6069_count, + value: info.age6069_count || 0, type: "age6069_count", name: "60-69岁", }, { - value: info.age7079_count, + value: info.age7079_count || 0, type: "age7079_count", name: "70-79岁", }, { - value: info.age80_count, + value: info.age80_count || 0, type: "age80_count", name: "80岁以上", }, @@ -263,47 +265,47 @@ export default { } else if (currentTab == "志愿者类别") { this.pieData = [ { - value: info.culture_count, + value: info.culture_count || 0, type: "culture_count", name: "文化队伍", }, { - value: info.committee_count, + value: info.committee_count || 0, type: "committee_count", name: "楼委会", }, { - value: info.capable_count, + value: info.capable_count || 0, type: "capable_count", name: "能人达人", }, { - value: info.friend_count, + value: info.friend_count || 0, type: "friend_count", name: "老友俱乐部", }, { - value: info.agent_count, + value: info.agent_count || 0, type: "agent_count", name: "代办员", }, { - value: info.mediator_count, + value: info.mediator_count || 0, type: "mediator_count", name: "调解员", }, { - value: info.collector_count, + value: info.collector_count || 0, type: "collector_count", name: "采集员", }, { - value: info.security_count, + value: info.security_count || 0, type: "security_count", name: "治安巡逻员", }, { - value: info.party_mem_count, + value: info.party_mem_count || 0, type: "party_mem_count", name: "党员中心户", }, @@ -311,42 +313,42 @@ export default { } else if (currentTab == "党员文化程度") { this.pieData = [ { - value: info.primary_count, + value: info.primary_count || 0, type: "primary_count", name: "小学及文盲", }, { - value: info.junior_high_count, + value: info.junior_high_count || 0, type: "junior_high_count", name: "初中", }, { - value: info.second_speci_count, + value: info.second_speci_count || 0, type: "second_speci_count", name: "中专", }, { - value: info.high_school_count, + value: info.high_school_count || 0, type: "high_school_count", name: "高中", }, { - value: info.junior_college_count, + value: info.junior_college_count || 0, type: "junior_college_count", name: "大专", }, { - value: info.undergrad_count, + value: info.undergrad_count || 0, type: "undergrad_count", name: "本科", }, { - value: info.master_count, + value: info.master_count || 0, type: "master_count", name: "硕士", }, { - value: info.doctor_count, + value: info.doctor_count || 0, type: "doctor_count", name: "博士", }, diff --git a/src/views/dataBoard/renfang/cpts/rkyj.vue b/src/views/dataBoard/renfang/cpts/rkyj.vue index 7999c1bff..9de02d590 100644 --- a/src/views/dataBoard/renfang/cpts/rkyj.vue +++ b/src/views/dataBoard/renfang/cpts/rkyj.vue @@ -102,6 +102,12 @@ export default { mounted() { this.getList(); }, + + watch: { + orgId() { + this.getList(); + }, + }, methods: { toListPage(level, type_id = "", type_name) { this.$router.push({ @@ -126,12 +132,14 @@ export default { }, }, { - mockId: 60040087, + // mockId: 60040087, } ); - if (code === 0 && data && Array.isArray(data) && data.length > 0) { - this.list = data; + if (code === 0) { + if (data && Array.isArray(data) && data.length > 0) { + this.list = data; + } } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/cpts/szsq.vue b/src/views/dataBoard/renfang/cpts/szsq.vue index b2a767e4a..7b42cf36c 100644 --- a/src/views/dataBoard/renfang/cpts/szsq.vue +++ b/src/views/dataBoard/renfang/cpts/szsq.vue @@ -97,17 +97,19 @@ export default { }, }, { - mockId: 61305622, + // mockId: 61305622, } ); - if (code === 0 && data && Array.isArray(data) && data.length > 0) { - let info = data[0]; - this.info.community_count = info.community_count; - this.info.account_count = info.account_count; - this.info.per = parseInt( - (100 * info.account_count) / info.community_count - ); + if (code === 0) { + if (data && Array.isArray(data) && data.length > 0) { + let info = data[0]; + this.info.community_count = info.community_count; + this.info.account_count = info.account_count; + this.info.per = parseInt( + (100 * info.account_count) / info.community_count + ); + } } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue index 9be4bfbf9..4c943ec90 100644 --- a/src/views/dataBoard/renfang/house/list.vue +++ b/src/views/dataBoard/renfang/house/list.vue @@ -76,7 +76,7 @@ export default { houseType: "", // 流动 常驻 全部 loading: true, - pageSize: 10, + pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, total: 0, srcTableData: [], @@ -158,6 +158,7 @@ export default { const type_name = getQueryPara("type_name"); this.breadList[1].meta.title = type_name + "房屋列表"; this.tableTitle = type_name + "房屋列表"; + this.pageNo = 1; this.getList(); this.getCount(); }, @@ -182,6 +183,7 @@ export default { }, handleSizeChange(pageSize) { + localStorage.setItem('dataBoard_PageSize', pageSize); this.pageSize = pageSize; this.getList(); }, @@ -203,7 +205,7 @@ export default { }, }, { - mockId: 60068051, + // mockId: 60068051, } ); @@ -235,7 +237,7 @@ export default { } }, - async getList() { + async getCount() { const { org_id, houseType, pageNo, pageSize } = this; const url = "house_list_total"; @@ -251,12 +253,12 @@ export default { }, }, { - mockId: 63070189, + // mockId: 63070189, } ); if (code === 0) { - this.total = data[0].count; + this.total = parseInt(data[0].count); } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 8a7d90acb..97f89d650 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -13,7 +13,7 @@
- +
@@ -27,7 +27,7 @@
- +
@@ -245,8 +245,12 @@ src="~@/assets/images/shuju/main/card-title-bg-800.png" class="box-title-bg" /> -
居民分类分析
-
居民分类分析-智能预测
+
+ 居民分类分析 +
+
+ 居民分类分析-智能预测 +
-
-
-
{{ ("0" + (index + 1)).substr(-2) }}.
-
{{ item.name }}
-
- {{ item.count }} 人 -
-
- -
-
- 较上月 - - - {{ item.growthAbs }} - 人 +
+
+
+
{{ ("0" + (index + 1)).substr(-2) }}.
+
{{ item.name }}
+
+ {{ item.count }} 人 +
+
+ +
+
+ 较上月 + + + {{ item.growthAbs }} + 人 +
-
-
+
+ +
+
+
-
{{ ("0" + (index + 1)).substr(-2) }}.
-
{{ item.name }}
-
- {{ item.count }} 人 -
-
- -
+
+
{{ ("0" + (index + 1)).substr(-2) }}.
+
{{ item.name }}
+
+ {{ item.count }} 人 +
+
+ +
-
- 较上一年 - - - {{ item.growthAbs }} - 人 +
+ 较上一年 + + + {{ item.growthAbs }} + 人 +
+ +
+ +
@@ -356,7 +380,7 @@
- +
@@ -378,7 +402,7 @@ orgLevel == 'city', }" > - +
@@ -391,7 +415,7 @@
- +
@@ -448,7 +472,9 @@ export default { return { loading: false, - orgData: {}, //当前组织对象 + orgData: { + children: [], + }, //当前组织对象 orgId: "", orgLevel: "", @@ -510,9 +536,9 @@ export default { //加载组织数据 this.loading = false; - await this.loadOrgData(); - // await this.getMapData(); - // await this.getSubMapData(); + // await this.loadOrgData(); + await this.getMapData(); + await this.getSubMapData(); this.getResiCategoryData(); this.getResiCategoryForecastData(); this.getPerInfo(); @@ -597,13 +623,13 @@ export default { url, { queryParam: { - org_id: this.orgData.id, + org_id: this.orgId, name: this.searchModule.keyword, }, }, { // mockId: 60044224, - mockId: 60048067, + // mockId: 60048067, } ); @@ -611,7 +637,9 @@ export default { this.searchModule.result = data.map((item) => { let type = item.type || searchModule.resultTab; let title = ""; - if (type == "1") { + if (searchModule.resultTab == 0) { + title = item.name; + } else if (type == "1") { title = item.user_name; } else if (type == "2") { title = item.village_name; @@ -635,22 +663,25 @@ export default { //地图上居民分类百分比数据 ps:感觉有点重复显示 async getPerInfo() { console.log("=========================getPerInfo"); - const url = "house_view"; + const url = "resident_ratio"; const { data, code, msg } = await requestPostBi( url, { queryParam: { - org_id: this.orgData.id, + org_id: this.orgId, }, }, { - mockId: 61167746, + // mockId: 61167746, } ); if (code === 0) { - this.perInfo = data[0]; + this.perInfo = { + ...this.perInfo, + ...data[0], + }; } else { this.$message.error(msg); } @@ -665,18 +696,18 @@ export default { url, { queryParam: { - org_id: this.orgData.id, + org_id: this.orgId, }, }, { - mockId: 60031937, + // mockId: 60031937, } ); if (code === 0) { this.resiCategoryData = data.map((item) => { return { - code: item.label, + code: item.label_id, name: item.label, count: item.count, ratio: item.ratio, @@ -698,11 +729,11 @@ export default { url, { queryParam: { - org_id: this.orgData.id, + org_id: this.orgId, }, }, { - mockId: 60064667, + // mockId: 60064667, } ); @@ -735,14 +766,22 @@ export default { }, }, { - mockId: 60810589, + // mockId: 60810589, } ); if (code === 0) { let info = data[0]; - this.orgData = info; - this.orgId = this.orgData.id; + this.orgData = { + ...info, + id: info.org_id, + name: info.org_name, + latitude: parseFloat(info.latitude), + longitude: parseFloat(info.longitude), + coordinates: info.coordinates || "", + children: [], + }; + this.orgId = this.orgData.org_id; this.orgLevel = this.orgData.level; } else { this.$message.error(msg); @@ -751,7 +790,7 @@ export default { //获取地图上显示的组织数据 async getSubMapData() { - console.log("=========================getMapData"); + console.log("=========================getSubMapData"); const url = "sub_org_map"; const { data, code, msg } = await requestPostBi( @@ -762,12 +801,27 @@ export default { }, }, { - mockId: 61831860, + // mockId: 61831860, } ); if (code === 0) { - this.orgData.children = data; + const { orgData } = this; + orgData.children = data.map((item) => { + return { + ...item, + id: item.org_id, + name: item.org_name, + latitude: parseFloat(item.latitude), + longitude: parseFloat(item.longitude), + coordinates: item.coordinates || "", + }; + }); + this.orgData = { ...orgData }; + console.log( + "==========================getSubMapData:result", + this.orgData + ); } else { this.$message.error(msg); } @@ -785,7 +839,7 @@ export default { if (code === 0) { this.orgData = data; - this.orgId = this.orgData.id; + this.orgId = this.orgId; this.orgLevel = this.orgData.level; } else { this.$message.error(msg); diff --git a/src/views/dataBoard/renfang/resi/analyze.vue b/src/views/dataBoard/renfang/resi/analyze.vue index a528129cf..97207f0d8 100644 --- a/src/views/dataBoard/renfang/resi/analyze.vue +++ b/src/views/dataBoard/renfang/resi/analyze.vue @@ -78,7 +78,7 @@ export default { resiType: "", // 流动 常驻 全部 loading: true, - pageSize: 10, + pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, total: 0, srcTableData: [], @@ -146,6 +146,7 @@ export default { this.breadList[1].meta.title = type_name + "居民列表"; this.tableTitle = type_name + "居民列表"; + this.pageNo = 1; this.getList(); this.getCount(); }, @@ -170,6 +171,7 @@ export default { }, handleSizeChange(pageSize) { + localStorage.setItem('dataBoard_PageSize', pageSize); this.pageSize = pageSize; this.getList(); }, @@ -191,7 +193,7 @@ export default { }, }, { - mockId: 60069169, + // mockId: 60069169, } ); @@ -236,12 +238,12 @@ export default { }, }, { - mockId: 63070408, + // mockId: 63070408, } ); if (code === 0) { - this.total = data[0].count; + this.total = parseInt(data[0].count); } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue index 1b920a505..94f507f4e 100644 --- a/src/views/dataBoard/renfang/resi/class.vue +++ b/src/views/dataBoard/renfang/resi/class.vue @@ -95,7 +95,8 @@ export default { type_id: "", // 居民类别 loading: true, - pageSize: 10, + pageSize: + parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, total: 0, srcTableData: [], @@ -166,6 +167,7 @@ export default { this.breadList[1].meta.title = type_name + "居民列表"; this.tableTitle = type_name + "居民列表"; + this.pageNo = 1; this.getList(); this.getCount(); if (this.type_id == "6") { @@ -175,6 +177,7 @@ export default { watch: { subclassId() { + this.pageNo = 1; this.getList(); this.getCount(); }, @@ -200,6 +203,7 @@ export default { }, handleSizeChange(pageSize) { + localStorage.setItem("dataBoard_PageSize", pageSize); this.pageSize = pageSize; this.getList(); }, @@ -220,7 +224,7 @@ export default { }, }, { - mockId: 62648939, + // mockId: 62648939, } ); @@ -256,7 +260,7 @@ export default { }, }, { - mockId: 60069169, + // mockId: 60069169, } ); @@ -302,12 +306,12 @@ export default { }, }, { - mockId: 63070913, + // mockId: 63070913, } ); if (code === 0) { - this.total = data[0].count; + this.total = parseInt(data[0].count); } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue index 9a65ce06f..92fbf1976 100644 --- a/src/views/dataBoard/renfang/resi/list.vue +++ b/src/views/dataBoard/renfang/resi/list.vue @@ -78,7 +78,7 @@ export default { resiType: "", // 流动 常驻 全部 loading: true, - pageSize: 10, + pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, total: 0, srcTableData: [], @@ -146,6 +146,7 @@ export default { this.breadList[1].meta.title = type_name + "居民列表"; this.tableTitle = type_name + "居民列表"; + this.pageNo = 1; this.getList(); this.getCount(); }, @@ -170,6 +171,7 @@ export default { }, handleSizeChange(pageSize) { + localStorage.setItem('dataBoard_PageSize', pageSize); this.pageSize = pageSize; this.getList(); }, @@ -191,7 +193,7 @@ export default { }, }, { - mockId: 60069169, + // mockId: 60069169, } ); @@ -236,12 +238,12 @@ export default { }, }, { - mockId: 63070408, + // mockId: 63070408, } ); if (code === 0) { - this.total = data[0].count; + this.total = parseInt(data[0].count); } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue index fab8ab7e9..3cdf7390f 100644 --- a/src/views/dataBoard/renfang/warn/building.vue +++ b/src/views/dataBoard/renfang/warn/building.vue @@ -77,7 +77,8 @@ export default { level: "", loading: true, - pageSize: 10, + pageSize: + parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, total: 0, srcTableData: [], @@ -131,6 +132,7 @@ export default { this.tableTitle = type_name + (this.level == "red" ? "红色" : "黄色") + "预警楼栋"; this.breadList[1].meta.title = this.tableTitle; + this.pageNo = 1; this.getList(); this.getCount(); }, @@ -166,6 +168,7 @@ export default { }, handleSizeChange(pageSize) { + localStorage.setItem("dataBoard_PageSize", pageSize); this.pageSize = pageSize; this.getList(); }, @@ -188,7 +191,7 @@ export default { }, }, { - mockId: 60071540, + // mockId: 60071540, } ); @@ -231,12 +234,12 @@ export default { }, }, { - mockId: 63071730, + // mockId: 63071730, } ); if (code === 0) { - this.total = data[0].count; + this.total = parseInt(data[0].count); } else { this.$message.error(msg); } diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue index 28429f6a6..4c1a9ad4d 100644 --- a/src/views/dataBoard/renfang/warn/resi.vue +++ b/src/views/dataBoard/renfang/warn/resi.vue @@ -62,7 +62,7 @@ export default { type_id: "", // 预警人员列表 loading: true, - pageSize: 10, + pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20, pageNo: 1, total: 0, srcTableData: [], @@ -140,6 +140,7 @@ export default { }, handleSizeChange(pageSize) { + localStorage.setItem("dataBoard_PageSize", pageSize); this.pageSize = pageSize; this.getList(); }, @@ -161,7 +162,7 @@ export default { }, }, { - mockId: 60069169, + // mockId: 60069169, } ); @@ -206,12 +207,14 @@ export default { }, }, { - mockId: 63071800, + // mockId: 63071800, } ); - if (code === 0 && Array.isArray(data) && data.length > 0) { - this.total = data[0].count; + if (code === 0) { + if (Array.isArray(data) && data.length > 0) { + this.total = parseInt(data[0].count); + } } else { this.$message.error(msg); } diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue index 77882123a..7177401af 100644 --- a/src/views/main-sidebar-sub-menu.vue +++ b/src/views/main-sidebar-sub-menu.vue @@ -9,7 +9,6 @@ > + + + + diff --git a/vue.config.js b/vue.config.js index 43c126071..32ae7f1f3 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,54 +1,61 @@ /** * 配置参考: https://cli.vuejs.org/zh/config/ */ -const IS_PROD = ['production', 'test'].includes(process.env.NODE_ENV) +const IS_PROD = ["production", "test"].includes(process.env.NODE_ENV); module.exports = { - baseUrl: process.env.NODE_ENV === 'production' ? '' : '/epmet-work-pc', - css: { - // 是否使用css分离插件 ExtractTextPlugin - extract: IS_PROD, - // 开启 CSS source maps? - sourceMap: false, - // css预设器配置项 - loaderOptions: {}, - // 启用 CSS modules for all css / pre-processor files. - modules: false - }, - chainWebpack: (config) => { - const svgRule = config.module.rule('svg') - svgRule.uses.clear() - svgRule - .test(/\.svg$/) - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - }, - productionSourceMap: false, - outputDir: 'epmet-work-pc', - assetsDir: 'static', - devServer: { - open: true, - port: 9001, - overlay: { - errors: true, - warnings: true - } - }, - // webpack简单配置 - configureWebpack: { - // debuge调试配置 - devtool: 'source-map', - externals: { - AMap: 'AMap' - }, - resolve: { - //配置路径别名 - // /node_modules/@vue/cli-service/lib/config/base.js中已经配好的@路径，所以这里可以直接使用@ - alias: { - '@js': '@/js', - '@c': '@/views/components', - '@v': '@/views', - '@m': '@/img' - } - } - } -} + baseUrl: process.env.NODE_ENV === "production" ? "" : "/epmet-work-pc", + css: { + // 是否使用css分离插件 ExtractTextPlugin + extract: IS_PROD, + // 开启 CSS source maps? + sourceMap: false, + // css预设器配置项 + loaderOptions: {}, + // 启用 CSS modules for all css / pre-processor files. + modules: false, + }, + chainWebpack: (config) => { + const svgRule = config.module.rule("svg"); + svgRule.uses.clear(); + svgRule + .test(/\.svg$/) + .use("svg-sprite-loader") + .loader("svg-sprite-loader"); + }, + productionSourceMap: false, + outputDir: "epmet-work-pc", + assetsDir: "static", + devServer: { + proxy: { + // 如果请求地址以/api打头,就出触发代理机制 + // http://localhost:9588/api/login -> http://localhost:3000/api/login + "/linkdata/linkdata-gateway/route": { + target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址 + }, + }, + open: true, + port: 9001, + overlay: { + errors: true, + warnings: true, + }, + }, + // webpack简单配置 + configureWebpack: { + // debuge调试配置 + devtool: "source-map", + externals: { + AMap: "AMap", + }, + resolve: { + //配置路径别名 + // /node_modules/@vue/cli-service/lib/config/base.js中已经配好的@路径，所以这里可以直接使用@ + alias: { + "@js": "@/js", + "@c": "@/views/components", + "@v": "@/views", + "@m": "@/img", + }, + }, + }, +};