From cb7dad20899f24c79bba29f26e09377ced0d3499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Thu, 21 Sep 2023 09:20:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=A6=82=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/gailan/tag_blue.png | Bin 0 -> 390 bytes src/assets/images/gailan/tag_orange.png | Bin 0 -> 432 bytes src/assets/images/gailan/yuan_bg.png | Bin 0 -> 18755 bytes src/assets/images/gailan/zq_bg.png | Bin 0 -> 3144 bytes src/assets/scss/dataBoard/overview/index.scss | 6 +- src/views/dataBoard/cpts/map/index.vue | 22 +- .../overview/components/CommunityResult.vue | 148 ++++++++++ .../components/DynamicHumanRoomData.vue | 103 +++++++ .../overview/components/EventAndFollowUp.vue | 194 +++++++++++++ .../overview/components/RankingGridData.vue | 99 +++++++ .../dataBoard/overview/components/jdjs.vue | 45 ++- .../dataBoard/overview/components/jdtphx.vue | 114 ++++---- .../dataBoard/overview/components/map-top.vue | 4 +- .../dataBoard/overview/components/rfsjtj.vue | 78 ++++- .../dataBoard/overview/components/sq12345.vue | 89 +++--- .../dataBoard/overview/components/sqrfph.vue | 89 +++--- src/views/dataBoard/overview/index.vue | 269 +++++++++++------- .../components/Tabs/index.vue | 5 +- .../satisfactionEval/dissatisfied/detail.vue | 2 +- 19 files changed, 964 insertions(+), 303 deletions(-) create mode 100644 src/assets/images/gailan/tag_blue.png create mode 100644 src/assets/images/gailan/tag_orange.png create mode 100644 src/assets/images/gailan/yuan_bg.png create mode 100644 src/assets/images/gailan/zq_bg.png create mode 100644 src/views/dataBoard/overview/components/CommunityResult.vue create mode 100644 src/views/dataBoard/overview/components/DynamicHumanRoomData.vue create mode 100644 src/views/dataBoard/overview/components/EventAndFollowUp.vue create mode 100644 src/views/dataBoard/overview/components/RankingGridData.vue diff --git a/src/assets/images/gailan/tag_blue.png b/src/assets/images/gailan/tag_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..ff745ad2c175eb9e69810302113316e2c8cdc9de GIT binary patch literal 390 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 z ({}), }, }, - - computed: {}, - components: { cptPopup, }, - - watch: {}, - async mounted() { // 临时这么用吧 window._AMapSecurityConfig = { @@ -327,12 +325,14 @@ export default { if (mapType != "qq") { myMap = new Map({ center: iniCenter, + mapStyle: 'amap://styles/darkblue', zoom: 18, }); } else { myMap = new GaodeMap({ // pitch: this.pitch, - style: styleConfig.style, + mapStyle: 'amap://styles/darkblue', + // style: styleConfig.style, center: iniCenter, token: "fc14b42e0ca18387866d68ebd4f150c1", zoom: 18, diff --git a/src/views/dataBoard/overview/components/CommunityResult.vue b/src/views/dataBoard/overview/components/CommunityResult.vue new file mode 100644 index 000000000..592ab9318 --- /dev/null +++ b/src/views/dataBoard/overview/components/CommunityResult.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/DynamicHumanRoomData.vue b/src/views/dataBoard/overview/components/DynamicHumanRoomData.vue new file mode 100644 index 000000000..00ff17177 --- /dev/null +++ b/src/views/dataBoard/overview/components/DynamicHumanRoomData.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/EventAndFollowUp.vue b/src/views/dataBoard/overview/components/EventAndFollowUp.vue new file mode 100644 index 000000000..8d4d7f6ee --- /dev/null +++ b/src/views/dataBoard/overview/components/EventAndFollowUp.vue @@ -0,0 +1,194 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/RankingGridData.vue b/src/views/dataBoard/overview/components/RankingGridData.vue new file mode 100644 index 000000000..6d6509890 --- /dev/null +++ b/src/views/dataBoard/overview/components/RankingGridData.vue @@ -0,0 +1,99 @@ + + + + diff --git a/src/views/dataBoard/overview/components/jdjs.vue b/src/views/dataBoard/overview/components/jdjs.vue index f674448a0..163c97be3 100644 --- a/src/views/dataBoard/overview/components/jdjs.vue +++ b/src/views/dataBoard/overview/components/jdjs.vue @@ -5,8 +5,7 @@
- XX街道，现有房屋4600间，自 住房屋3800间、出租房屋600、闲 - 置房屋200，现有居民4000户、 8400 + {{overview}}
@@ -17,8 +16,7 @@
总结报告
- 根据数据分析结果，建议重点关注租户、党员、保障房人员三类 - 群体，开展相关的社区服务和活动。 + {{report}}
@@ -26,12 +24,39 @@ - + diff --git a/src/views/dataBoard/overview/components/map-top.vue b/src/views/dataBoard/overview/components/map-top.vue index bc4bffd12..1ca21563c 100644 --- a/src/views/dataBoard/overview/components/map-top.vue +++ b/src/views/dataBoard/overview/components/map-top.vue @@ -72,7 +72,9 @@ diff --git a/src/views/dataBoard/overview/components/rfsjtj.vue b/src/views/dataBoard/overview/components/rfsjtj.vue index 11303d1da..1cb40889d 100644 --- a/src/views/dataBoard/overview/components/rfsjtj.vue +++ b/src/views/dataBoard/overview/components/rfsjtj.vue @@ -3,33 +3,74 @@
采集房屋数
- {{ numFormat(2317) }} + {{ numFormat(house.sumNum) }} 间
+
今日
-
新增31
-
更新217
+
新增{{ house.dayAddNum }}
+
更新{{ house.dayUpdateNum }}
采集人口数
- {{ numFormat(6302) }} + {{ numFormat(resident.sumNum) }} 人
今日
-
新增24
-
更新466
+
新增{{ resident.dayAddNum }}
+
更新{{ resident.dayUpdateNum }}
diff --git a/src/views/dataBoard/overview/components/sq12345.vue b/src/views/dataBoard/overview/components/sq12345.vue index ba0622bfb..16a67796a 100644 --- a/src/views/dataBoard/overview/components/sq12345.vue +++ b/src/views/dataBoard/overview/components/sq12345.vue @@ -8,14 +8,14 @@
处理中
已办结
-
-
- {{ item.num }} +
+
+ {{ index - 0 + 1 }}
-
{{ item.shequ }}
-
{{ item.fwgxs }}
-
{{ item.rkgxs }}
-
{{ item.rfgxzs }}
+
{{ item.orgName }}
+
{{ item.sumNum }}
+
{{ item.processNum }}
+
{{ item.closedNum }}
@@ -23,55 +23,40 @@ diff --git a/src/views/dataBoard/overview/components/sqrfph.vue b/src/views/dataBoard/overview/components/sqrfph.vue index d7d23363c..591adcb70 100644 --- a/src/views/dataBoard/overview/components/sqrfph.vue +++ b/src/views/dataBoard/overview/components/sqrfph.vue @@ -8,14 +8,14 @@
人口更新数
人房更新总数
-
-
- {{ item.num }} +
+
+ {{ index - 0 + 1 }}
-
{{ item.shequ }}
-
{{ item.fwgxs }}
-
{{ item.rkgxs }}
-
{{ item.rfgxzs }}
+
{{ item.orgName }}
+
{{ item.houseNum }}
+
{{ item.residentNum }}
+
{{ item.sumNum }}
@@ -23,55 +23,40 @@ diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index a2fceff2b..eb50fe5c1 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -1,83 +1,147 @@ @@ -93,8 +157,15 @@ import jdwgy from "@/views/dataBoard/overview/components/jdwgy.vue"; import rfsjtj from "@/views/dataBoard/overview/components/rfsjtj.vue"; import sqrfph from "@/views/dataBoard/overview/components/sqrfph.vue"; import sq12345 from "@/views/dataBoard/overview/components/sq12345.vue"; -import { requestPostBi } from "@/js/dai/request-bipass"; -import { requestPost } from "@/js/dai/request"; + +import DynamicHumanRoomData from "@/views/dataBoard/overview/components/DynamicHumanRoomData.vue"; +import CommunityResult from "@/views/dataBoard/overview/components/CommunityResult.vue"; +import EventAndFollowUp from "@/views/dataBoard/overview/components/EventAndFollowUp.vue"; +import RankingGridData from "@/views/dataBoard/overview/components/RankingGridData.vue"; + + +import {requestPostBi} from "@/js/dai/request-bipass"; +import {requestPost} from "@/js/dai/request"; import getQueryPara from "dai-js/modules/getQueryPara"; export default { @@ -112,22 +183,31 @@ export default { rfsjtj, sqrfph, sq12345, + DynamicHumanRoomData, + CommunityResult, + EventAndFollowUp, + RankingGridData }, data() { return { loading: false, - rfphDate: "2023-03", + rfphDate: this.$moment().format('YYYY-MM'), + sq12345Date: this.$moment().format('YYYY-MM'), + sqzcDate: this.$moment().format('YYYY-MM'), + sjhfDate: this.$moment().format('YYYY-MM'), + sqwggxDate: this.$moment().format('YYYY-MM'), orgData: { children: [], }, //当前组织对象 orgId: "", orgLevel: "", + currentLevel: "", breadList: [ { orgId: "", orgLevel: "", - meta: { title: "人房总览" }, + meta: {title: "人房总览"}, }, ], @@ -137,12 +217,19 @@ export default { }, mounted() { - const queryOrgId = getQueryPara("orgId"); - const queryOrgLevel = getQueryPara("orgLevel"); - this.init(queryOrgId, queryOrgLevel); + // const queryOrgId = getQueryPara("orgId"); + // const queryOrgLevel = getQueryPara("orgLevel"); + // this.init(queryOrgId, queryOrgLevel); + if(this.$store.state.chooseArea.chooseName.orgId) { + this.getMapData() + } }, - watch: {}, + watch: { + "$store.state.chooseArea.chooseName"(val){ + this.getMapData() + } + }, methods: { async init(queryOrgId, queryOrgLevel) { @@ -157,12 +244,12 @@ export default { //加载组织数据 this.loading = false; await this.getMapData(); - await this.getSubMapData(); + // await this.getSubMapData(); this.loading = true; }, - changeDate(e){ - this.rfphDate=e; + changeDate(e) { + this.rfphDate = e; }, handleClickDotBtn(type, info) { console.log("handleClickDotBtn", type, info); @@ -173,21 +260,23 @@ export default { } }, - clickBreadItem({ item }) { + clickBreadItem({item}) { this.toBread(item); }, clickAgencyItem(item) { + console.log(item, 'item') this.toBread({ orgId: item.id, orgLevel: item.level, - meta: { title: item.name }, + meta: {title: item.name}, }); + this.getMapData(item.id,item.level) }, toBread(item) { - const { orgId } = item; - const { breadList } = this; + const {orgId} = item; + const {breadList} = this; let index = breadList.findIndex((val) => val.orgId === orgId); // return console.log(item, breadList, index); if (index >= 0) { @@ -212,39 +301,17 @@ export default { }, //获取地图上显示的组织数据 - async getMapData() { + async getMapData(orgId=this.$store.state.chooseArea.chooseName.orgId,level=this.$store.state.chooseArea.chooseName.level) { console.log("=========================getMapData"); const url = "org_map"; - - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - org_id: this.orgId, - }, - }, - { - // mockId: 60810589, - } - ); - - if (code === 0) { - console.log("data::", data); - let info = data[0]; - this.orgData = { - ...info, - id: info.org_id, - name: info.org_name, - latitude: parseFloat(info.latitude), - longitude: parseFloat(info.longitude), - coordinates: info.coordinates || "", - children: [], - }; + this.$http.post(`/gov/org/agency/maporg`, {orgId, level}).then(({data: {data}}) => { + console.log(data,'datadatadata') + this.orgData = data; this.orgId = this.orgData.org_id; this.orgLevel = this.orgData.level; - } else { - this.$message.error(msg); - } + this.currentLevel = this.orgData.agencyLevel; + console.log(this.orgData, 'orgData') + }) }, //获取地图上显示的组织数据 @@ -252,20 +319,20 @@ export default { console.log("=========================getSubMapData"); const url = "sub_org_map"; - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - org_id: this.orgId, + const {data, code, msg} = await requestPostBi( + url, + { + queryParam: { + org_id: this.orgId, + }, }, - }, - { - // mockId: 61831860, - } + { + // mockId: 61831860, + } ); if (code === 0) { - const { orgData } = this; + const {orgData} = this; orgData.children = data.map((item) => { return { ...item, @@ -276,10 +343,10 @@ export default { coordinates: item.coordinates || "", }; }); - this.orgData = { ...orgData }; + this.orgData = {...orgData}; console.log( - "==========================getSubMapData:result", - this.orgData + "==========================getSubMapData:result", + this.orgData ); } else { this.$message.error(msg); @@ -294,7 +361,7 @@ export default { level: this.orgLevel, }; - const { data, code, msg } = await requestPost(url, params); + const {data, code, msg} = await requestPost(url, params); if (code === 0) { this.orgData = data; this.orgId = this.orgId; @@ -311,7 +378,7 @@ export default { diff --git a/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue b/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue index 70597d2a8..93d9bfb22 100644 --- a/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue +++ b/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue @@ -1,6 +1,7 @@