From bd1e222a894e903bd28390df132320a7975c1f18 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 02 Dec 2024 21:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/pages/map/components/scomponents/layersControl.vue | 74 ++++++++++++++++++------------------
src/views/survey/components/box/dataContent.vue | 9 +---
public/img/mapicon/fxy-jd.png | 0
public/img/mapicon/fxy-yb.png | 0
vite.config.js | 14 +++---
5 files changed, 46 insertions(+), 51 deletions(-)
diff --git a/public/img/mapicon/fxy-jd.png b/public/img/mapicon/fxy-jd.png
new file mode 100644
index 0000000..290285f
--- /dev/null
+++ b/public/img/mapicon/fxy-jd.png
Binary files differ
diff --git a/public/img/mapicon/fxy-yb.png b/public/img/mapicon/fxy-yb.png
new file mode 100644
index 0000000..f021e19
--- /dev/null
+++ b/public/img/mapicon/fxy-yb.png
Binary files differ
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 0948af1..4e6c14c 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/components/scomponents/layersControl.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-31 10:47:29
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-12-02 19:46:13
+ * @LastEditTime: 2024-12-02 21:12:23
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -238,16 +238,6 @@
children: [
// 给水管网、污水管网、燃气管网、雨水管网
{
- id: '3-3-1',
- label: '给水管网',
- type: 'layer',
- subType: 'geojsonPipe',
- layerName: 'gsgw',
- source: gsgw,
- color: DC.Color.BLUE.withAlpha(0.9),
- height: 65,
- },
- {
id: '3-3-2',
label: '污水管网',
type: 'layer',
@@ -255,17 +245,7 @@
layerName: 'wsgw',
source: wsgw,
color: DC.Color.DARKBLUE.withAlpha(0.9),
- height: 68,
- },
- {
- id: '3-3-3',
- label: '燃气管网',
- type: 'layer',
- subType: 'geojsonPipe',
- layerName: 'rqgw',
- source: rqgw,
- color: DC.Color.RED.withAlpha(0.9),
- height: 71,
+ height: 60.2,
},
{
id: '3-3-4',
@@ -275,7 +255,27 @@
layerName: 'ysgw',
source: ysgw,
color: DC.Color.CYAN.withAlpha(0.9),
- height: 75,
+ height: 60,
+ },
+ {
+ id: '3-3-1',
+ label: '给水管网',
+ type: 'layer',
+ subType: 'geojsonPipe',
+ layerName: 'gsgw',
+ source: gsgw,
+ color: DC.Color.BLUE.withAlpha(0.9),
+ height: 60.4,
+ },
+ {
+ id: '3-3-3',
+ label: '燃气管网',
+ type: 'layer',
+ subType: 'geojsonPipe',
+ layerName: 'rqgw',
+ source: rqgw,
+ color: DC.Color.RED.withAlpha(0.9),
+ height: 60.6,
},
]
},
@@ -480,7 +480,7 @@
},
showParams: 'category',
className: 'fxy-ordinary',
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-yb.png',
showPanel: false,
layerName: 'fxyOrdinary',
incident: (e) => {
@@ -517,7 +517,7 @@
},
showParams: 'category',
className: 'fxy-larger',
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-jd.png',
showPanel: false,
layerName: 'fxyLarger',
incident: (e) => {
@@ -685,7 +685,7 @@
// })
addTileLayers[item.layerName] = []
item.urlData.forEach((m, ind) => {
- let tile = new DC.Tileset(m.url, {
+ addTileLayers[item.layerName][ind] = new DC.Tileset(m.url, {
maximumMemoryUsage: 1024,
maximumScreenSpaceError: 8,
skipLevels: 5,
@@ -694,13 +694,12 @@
progressiveResolutionHeightFraction: 0.5,
baseScreenSpaceError: 1024
})
- tile.setSplitDirection(1)
+ addTileLayers[item.layerName][ind].setSplitDirection(1)
// tile.setHeight(-420)
// tile.setSplitDirection(-1)
- window.$viewer.sceneSplit.addTileset(tile)
- tileLayers.addOverlay(tile)
+ window.$viewer.sceneSplit.addTileset(addTileLayers[item.layerName][ind])
+ tileLayers.addOverlay(addTileLayers[item.layerName][ind])
window.$viewer.sceneSplit.enable = false
- addTileLayers[item.layerName][ind] = tile
})
} else {
addTileLayers[item.layerName].forEach(m => m.show = true)
@@ -794,7 +793,7 @@
item.source.features.forEach(i => {
let polylineVolume = new DC.PolylineVolume(
i.geometry.coordinates.map(d => [d[0], d[1], item.height].join(',')).join(';'),
- computeCircle(2)
+ computeCircle(1.6)
)
polylineVolume.setStyle({
@@ -971,15 +970,10 @@
}
onUnmounted(() => {
- if (tileLayers) {
- tileLayers.clear()
- window.$viewer && window.$viewer.removeLayer(tileLayers)
- tileLayers = null
- }
-
let arr = Object.keys(addTileLayers)
arr.forEach(i => {
if (i == 'hgyq') {
+ tileLayers.removeOverlay(addTileLayers[i])
addTileLayers[i] = null
delete addTileLayers[i]
} else {
@@ -989,6 +983,12 @@
}
})
addTileLayers = null
+
+ if (tileLayers) {
+ tileLayers.remove()
+ window.$viewer && window.$viewer.removeLayer(tileLayers)
+ tileLayers = null
+ }
// 弹窗销毁
destroy()
addPupoLayers = null
diff --git a/src/views/survey/components/box/dataContent.vue b/src/views/survey/components/box/dataContent.vue
index 90df6b9..ceac229 100644
--- a/src/views/survey/components/box/dataContent.vue
+++ b/src/views/survey/components/box/dataContent.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-11-04 16:32:04
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-27 15:44:25
+ * @LastEditTime: 2024-12-02 21:00:44
* @FilePath: \bigScreen\src\views\survey\components\box\dataContent.vue
* @Description:
*
@@ -33,12 +33,7 @@
})
myEcharts.chart.setOption({
- tooltip: {
- trigger: "axis",
- axisPointer: {
- type: "shadow",
- },
- },
+ tooltip: {},
grid: {
top: "6%",
left: "6%",
diff --git a/vite.config.js b/vite.config.js
index 596d4e2..a2a675a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-25 10:56:27
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-12-01 21:17:55
+ * @LastEditTime: 2024-12-02 19:53:54
* @FilePath: \bigScreen\vite.config.js
* @Description:
*
@@ -116,12 +116,12 @@
rewrite: path => path.replace(/^\/zhyq\/newMx/, ''),
},
- // '/zhyq/mx': {
- // // target: 'http://localhost',
- // target: 'https://wrj.shuixiongit.com/zhyq/mx',
- // changeOrigin: true,
- // rewrite: path => path.replace(/^\/zhyq\/mx/, ''),
- // },
+ '/zhyq/mx': {
+ // target: 'http://localhost',
+ target: 'https://wrj.shuixiongit.com/zhyq/mx',
+ changeOrigin: true,
+ rewrite: path => path.replace(/^\/zhyq\/mx/, ''),
+ },
'/zhyqapi': {
// target: 'http://localhost:8082',
--
Gitblit v1.9.3