From edb0f849ff83afbb8468cb014c896c2345153a34 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 25 Nov 2024 15:32:32 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/api/space/space.js | 8 ++++
src/views/pac/components/box/dataContent.vue | 5 ++
src/pages/layout/components/scomponents/layersControl.vue | 82 ++++++++++++++++++++++++++++++++---------
src/views/companyInfo/components/box/fireSource.vue | 17 +++++---
4 files changed, 87 insertions(+), 25 deletions(-)
diff --git a/src/api/space/space.js b/src/api/space/space.js
index b6c5fb0..59ad24a 100644
--- a/src/api/space/space.js
+++ b/src/api/space/space.js
@@ -19,4 +19,12 @@
method: 'get',
params,
});
+};
+export const getGouQu = (params) => {
+ const url = `/yw/emergencySpace/page`;
+ return request({
+ url,
+ method: 'get',
+ params,
+ });
};
\ No newline at end of file
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 2741a8c..9bd460f 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/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-11-24 16:59:40
+ * @LastEditTime: 2024-11-25 15:32:31
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
@@ -59,7 +59,7 @@
})
import panorama from './popup/panorama.vue'
import { getPage } from '@/api/indParkInfo'
-import { getList } from "@/api/space/space"
+import { getList, getGouQu } from "@/api/space/space"
import { getList as getRiskList } from "@/api/riskSource/riskSource"
import { getPanoramaList } from "@/api/panorama/"
import yqfw from "@/assets/json/yqfw"
@@ -192,7 +192,7 @@
addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPupoLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
+ <div>${attrParams.fullName}</div>
<img src="${attrParams.imageUrl}" />
</div>`
let divIcon = new DC.DivIcon(
@@ -271,7 +271,7 @@
subType: 'geojsonPipe',
layerName: 'wsgw',
source: wsgw,
- color: DC.Color.BLACK,
+ color: DC.Color.DARKBLUE,
height: 68,
},
{
@@ -456,6 +456,20 @@
divIcon.on(DC.MouseEventType.CLICK, incident)
addPupoLayers[attrParams.name].addOverlay(divIcon)
}
+ },
+ {
+ id: '3-8',
+ label: '沟渠',
+ type: 'layer',
+ subType: 'geojsonPolygon',
+ method: getGouQu,
+ params: {
+ type: 8,
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/xfs.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'gouqu'
}
]
},
@@ -682,7 +696,7 @@
// })
addTileLayers[item.layerName] = item.urlData.map(m => {
- let tile = new DC.Tileset(m.url, {
+ let tile = new DC.Tileset(m.url, {
maximumMemoryUsage: 512,
maximumScreenSpaceError: 8,
skipLevels: 6,
@@ -692,9 +706,9 @@
baseScreenSpaceError: 1024
})
- tileLayers.addOverlay(tile)
+ tileLayers.addOverlay(tile)
- return tile
+ return tile
})
} else {
addTileLayers[item.layerName].forEach(m => m.show = true)
@@ -773,7 +787,7 @@
addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
window.$viewer.addLayer(addTileLayers[item.layerName])
- function computeCircle(radius) {
+ function computeCircle (radius) {
var positions = []
for (var i = 0; i < 360; i++) {
var radians = DC.Math.toRadians(i)
@@ -799,6 +813,36 @@
} else {
addTileLayers[item.layerName].show = true
}
+ } else if (item.subType == 'geojsonPolygon') {
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
+ item.method(item.params).then(res => {
+ let data = res.data.data.records
+ data.forEach(i => {
+ let stl = ''
+ try {
+ let geom = JSON.parse(i.geom)
+ if (geom && geom.coordinates && geom.coordinates[0]) {
+ stl = geom.coordinates[0][0].map(d => d[0] + ',' + d[1]).join(';')
+ } else {
+ console.error('Invalid geom structure')
+ }
+ } catch (error) {
+ console.error('Failed to parse geom:', error)
+ }
+ let polygon = new DC.Polygon(stl)
+ polygon.setStyle({
+ width: 2,
+ material: DC.Color.BLUE,
+ clampToGround: true
+ })
+ addTileLayers[item.layerName].addOverlay(polygon)
+ })
+ })
+ } else {
+ addTileLayers[item.layerName].show = true
+ }
}
} else {
if (addTileLayers[item.layerName]) {
@@ -810,13 +854,15 @@
addTileLayers[item.layerName].show = false
} else if (item.subType == 'geojsonPipe') {
addTileLayers[item.layerName].show = false
+ } else if (item.subType == 'geojsonPolygon') {
+ addTileLayers[item.layerName].show = false
}
}
}
})
}
-function findObjectById(data, id) {
+function findObjectById (data, id) {
// 遍历数据数组
for (let i = 0; i < data.length; i++) {
const item = data[i]
@@ -866,14 +912,14 @@
// 飞到园区范围
const flyToyqfw = () => {
window.$viewer.zoomToPosition(new DC.Position(
- 115.1021,
- 27.2360,
- 5000,
- 0,
- -45,
- 0
- ), () => {
- })
+ 115.1021,
+ 27.2360,
+ 5000,
+ 0,
+ -45,
+ 0
+ ), () => {
+ })
}
EventBus.on('restHandleCheckChange', restHandleCheckChange)
@@ -891,7 +937,7 @@
// });
// 销毁
-function destroy() {
+function destroy () {
let arr = Object.keys(addPupoLayers)
arr.filter(i => i != 'hgyq').forEach(i => {
addPupoLayers[i] && window.$viewer.removeLayer(addPupoLayers[i])
diff --git a/src/views/companyInfo/components/box/fireSource.vue b/src/views/companyInfo/components/box/fireSource.vue
index 8f5e43b..971e0aa 100644
--- a/src/views/companyInfo/components/box/fireSource.vue
+++ b/src/views/companyInfo/components/box/fireSource.vue
@@ -27,12 +27,13 @@
</div>
<div class="company-info">
+ <div class="" style="text-align: center;margin-top: 10px;">基本信息</div>
<div class="company-info-item" v-for="item in companyInfoList" :key="item.id">
<el-row>
- <el-col :span="8">
+ <el-col :span="6">
<div class="company-info-title">{{ item.title }}</div>
</el-col>
- <el-col :span="16">
+ <el-col :span="18">
<div class="company-info-content">{{ item.content }}</div>
</el-col>
</el-row>
@@ -43,10 +44,10 @@
<div class="" style="text-align: center;margin-top: 10px;">救援队伍</div>
<div class="company-info-item" v-for="item in rescueTeamList" :key="item.id">
<el-row>
- <el-col :span="8">
+ <el-col :span="6">
<div class="company-info-title">{{ item.title }}</div>
</el-col>
- <el-col :span="16">
+ <el-col :span="18">
<div class="company-info-content">{{ item.content }}</div>
</el-col>
</el-row>
@@ -189,15 +190,17 @@
}
.company-info-item {
- margin-top: 13px;
+ // margin-top: 13px;
}
.company-info-title {
- font-weight: bold;
+ // font-weight: bold;
+ margin: 4px 0;
}
.company-info-content {
- font-size: 13px;
+ // font-size: 13px;
+ margin: 4px 0;
}
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index 5ab23ca..e61c21b 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -129,6 +129,11 @@
if (row.type == 2 || row.type == 3) {
EventBus.emit('restHandleCheckChange', `3-3-2`)
EventBus.emit('restHandleCheckChange', `3-3-4`)
+ if (row.type == 3) {
+ EventBus.emit('restHandleCheckChange', `3-8`)
+ } else {
+ EventBus.emit('restHandleDelChange', `3-8`)
+ }
} else {
EventBus.emit('restHandleDelChange', `3-3-2`)
EventBus.emit('restHandleDelChange', `3-3-4`)
--
Gitblit v1.9.3