diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index a3b16a6c1..3019a4754 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -3,7 +3,7 @@ @import '../c/common'; .g-row { - padding: 0 6px 24px; + padding: 0 6px 6px; display: flex; justify-content: space-between; @@ -13,12 +13,12 @@ .g-center { position: relative; - width: 884px; + width: 888px; } .g-center-open { position: relative; - width: 884px; + width: 888px; .m-map { position: relative; @@ -176,7 +176,7 @@ &-top { display: flex; justify-content: space-between; - padding-top: 20px; + padding-top: 10px; } &-card { @@ -209,7 +209,7 @@ } &-content { - margin-top: 15px; + margin-top: 10px; &-item { display: flex; diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue index 3e834e593..be0385b3a 100644 --- a/src/views/dataBoard/overview/components/jdwgy.vue +++ b/src/views/dataBoard/overview/components/jdwgy.vue @@ -144,12 +144,12 @@ export default { /deep/ .table { .el-table { td { - padding: 0 !important; + padding: 9px 14px !important; } - th { - padding: 6px 0 4px !important; - } + // th { + // padding: 6px 0 4px !important; + // } } } diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 938b6b1e8..5f62dbe29 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -9,54 +9,110 @@
- + :text="`${ + currentLevel === 'district' + ? '区' + : currentLevel === 'street' + ? '街道' + : currentLevel === 'community' + ? '社区' + : currentLevel === 'grid' + ? '网格' + : '' + }介绍`" + /> +
- + :text="`${ + currentLevel === 'district' + ? '区' + : currentLevel === 'street' + ? '街道' + : currentLevel === 'community' + ? '社区' + : currentLevel === 'grid' + ? '网格' + : '' + }图谱画像`" + /> +
- +
- +
- +
- - + +
- - + +
-
+
- + + - +
-
+
- + - +
@@ -86,37 +142,75 @@
- + - +
- + - - - + + +
- + - +
- +
@@ -141,8 +235,8 @@ import RankingGridData from "@/views/dataBoard/overview/components/RankingGridDa import FollowUp from "@/views/dataBoard/overview/components/FollowUp.vue"; import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue"; -import {requestPostBi} from "@/js/dai/request-bipass"; -import {requestPost} from "@/js/dai/request"; +import { requestPostBi } from "@/js/dai/request-bipass"; +import { requestPost } from "@/js/dai/request"; export default { name: "renfang", @@ -171,11 +265,11 @@ export default { data() { return { loading: false, - 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"), + rfphDate: this.$moment().subtract(1, "month").format("YYYY-MM"), + sq12345Date: this.$moment().subtract(1, "month").format("YYYY-MM"), + sqzcDate: this.$moment().subtract(1, "month").format("YYYY-MM"), + sjhfDate: this.$moment().subtract(1, "month").format("YYYY-MM"), + sqwggxDate: this.$moment().subtract(1, "month").format("YYYY-MM"), orgData: { children: [], }, //当前组织对象 @@ -185,7 +279,7 @@ export default { currentLevelData: { orgId: this.$store.state.chooseArea.chooseName.orgId, orgLevel: this.$store.state.chooseArea.chooseName.level, - meta: {title: "人房总览"}, + meta: { title: "人房总览" }, }, breadList: [ { @@ -193,7 +287,7 @@ export default { orgLevel: "", id: "", level: "", - meta: {title: "人房总览"}, + meta: { title: "人房总览" }, }, ], peopleList: { @@ -257,10 +351,10 @@ export default { }, }, - methods: { changeCustomerName() { - this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; + this.customerName = + localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; }, changeType(e) { this.peopleType = e; @@ -298,7 +392,7 @@ export default { } }, - clickBreadItem({item}) { + clickBreadItem({ item }) { this.toBread(item); }, @@ -311,7 +405,8 @@ export default { orgLevel: item.level, }; } else { - this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; + this.customerName = + localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; this.currentLevelData = { ...this.$store.state.chooseArea.chooseName, orgLevel: this.$store.state.chooseArea.chooseName.level, @@ -320,7 +415,7 @@ export default { this.toBread({ orgId: item.id, orgLevel: item.level, - meta: {title: item.name}, + meta: { title: item.name }, }); }, goBackMap() { @@ -328,13 +423,13 @@ export default { this.clickAgencyItem(item); }, toBread(item) { - const {orgId} = item; - const {breadList} = this; + const { orgId } = item; + const { breadList } = this; let index = breadList.findIndex((val) => val.orgId === orgId); if (index >= 0) { this.breadList = breadList.slice(0, index + 1); } else { - breadList.push({...item, id: item.orgId, level: item.orgLevel}); + breadList.push({ ...item, id: item.orgId, level: item.orgLevel }); this.breadList = breadList; } this.getMapData(item.orgId, item.orgLevel); @@ -365,59 +460,60 @@ export default { longitude: item.longitude, }); } - }) - }) + }); + }); // if (params.length) { - this.$refs.map.setNum(params) + this.$refs.map.setNum(params); // } - }, upDownShow() { this.listShow = !this.listShow; }, setPoint(data) { // if (data) { - this.$refs.map.setPoint(data) + this.$refs.map.setPoint(data); // } }, //获取地图上显示的组织数据 async getMapData( - orgId = this.$store.state.chooseArea.chooseName.orgId, - level = this.$store.state.chooseArea.chooseName.level + orgId = this.$store.state.chooseArea.chooseName.orgId, + level = this.$store.state.chooseArea.chooseName.level ) { const url = "org_map"; - this.$http.post(`/gov/org/agency/maporg`, {orgId, level}).then(({data: {data}}) => { - this.orgData = data; - this.orgId = this.orgData.id; - console.log(this.orgId); - this.orgLevel = this.orgData.level; - this.currentLevel = this.orgData.agencyLevel; - this.currentLevelData = { - orgId: this.orgId, - orgLevel: this.currentLevel, - }; - // this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency'; - }); + this.$http + .post(`/gov/org/agency/maporg`, { orgId, level }) + .then(({ data: { data } }) => { + this.orgData = data; + this.orgId = this.orgData.id; + console.log(this.orgId); + this.orgLevel = this.orgData.level; + this.currentLevel = this.orgData.agencyLevel; + this.currentLevelData = { + orgId: this.orgId, + orgLevel: this.currentLevel, + }; + // this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency'; + }); }, //获取地图上显示的组织数据 async 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, @@ -428,7 +524,7 @@ export default { coordinates: item.coordinates || "", }; }); - this.orgData = {...orgData}; + this.orgData = { ...orgData }; } else { this.$message.error(msg); } @@ -442,7 +538,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; @@ -492,9 +588,9 @@ export default { }