diff --git a/src/assets/images/manyidu/hx_bg.png b/src/assets/images/manyidu/hx_bg.png index cd4eccd10..d24752f78 100644 Binary files a/src/assets/images/manyidu/hx_bg.png and b/src/assets/images/manyidu/hx_bg.png differ diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index ad4046ce4..55e0cba68 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -242,10 +242,6 @@ margin-top: 6px; height: 232px; - &-xiaoqipao {} - - &-line {} - &-content { margin: 0 auto; width: 240px; diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index c8dbfad2c..baee65d98 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -160,6 +160,7 @@ export default { // level: item.level, center: [item.longitude, item.latitude], ...item, + parentName: srcGridData.parentName, }, geometry: { type: "Polygon", @@ -283,7 +284,7 @@ export default { securityJsCode: "92ea2c965c6cf1ba7ee3a8fe01449ef2", }; const scale = this.$store.state.chooseArea.realScale; - console.log(scale); + // console.log(scale); if (scale) { this.setStartScale(scale); } @@ -350,7 +351,7 @@ export default { // 初始化底图 iniMapBase(scene) { - console.log("-----------------iniMapBase"); + // console.log("-----------------iniMapBase"); // 底图服务 const baseLayer = new RasterLayer({ zIndex: 1, @@ -393,7 +394,7 @@ export default { // 初始化底图 天地图山东政务网瓦片 iniMapBase2(scene) { - console.log("-----------------iniMapBase"); + // console.log("-----------------iniMapBase"); // 底图服务 const baseLayer = new RasterLayer({ zIndex: 1, @@ -421,7 +422,7 @@ export default { styleConfig = lightStyle; } - console.log("地图初始化数据", polygonData); + // console.log("地图初始化数据", polygonData); // 画区域面积 polygonLayer = new PolygonLayer({ @@ -502,7 +503,6 @@ export default { offsets: [0, 0], }); // scene.addLayer(posLayer); - console.log(this.level); /* if (this.level === 'grid') { posLayer.show() } else { @@ -555,7 +555,6 @@ export default { popup.remove(); }); polygonLayer.on("click", (e) => { - console.log(this.level); if (this.level === "grid") { return; } @@ -565,7 +564,6 @@ export default { if (pointMarker) { scene.removeMarkerLayer(pointMarker); } - console.log("e", e); this.$emit("clickAgency", e.feature.properties); }); posLayer.on("click", (e) => { diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 2a259be5d..9422e1ff6 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -43,15 +43,32 @@
- +
- +
- +
@@ -384,7 +401,12 @@ export default { clickAgencyItem(item) { this.$refs.map.clearMarkert(); if (item.id) { - this.customerName = item.name || item.meta.title; + if (item.level == "grid") { + this.customerName = + item.parentName + "-" + item.name; + } else { + this.customerName = item.name || item.meta.title; + } this.currentLevelData = { orgId: item.id, orgLevel: item.level, @@ -401,6 +423,8 @@ export default { orgId: item.id, orgLevel: item.level, meta: { title: item.name }, + name: item.name, + parentName: item.parentName, }); }, goBackMap() { @@ -425,10 +449,12 @@ export default { if (!item.longitude) { return this.$message.error("请先设置坐标"); } - this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]); + this.$refs.map.setDotMarker(item, [ + parseFloat(item.longitude), + parseFloat(item.latitude), + ]); }, setNum(data) { - console.log(this.orgData, data, "111"); // data let params = []; let org = this.orgData.children; @@ -457,20 +483,25 @@ export default { // } }, //获取地图上显示的组织数据 - async getMapData(orgId = this.$store.state.chooseArea.chooseName.orgId, level = this.$store.state.chooseArea.chooseName.level) { + async getMapData( + 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; + 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"; + }); }, //获取地图上显示的组织数据 diff --git a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue index 5d3d4b3ab..0718b6eed 100644 --- a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue @@ -1,38 +1,92 @@