From f33fb1a61a00d3ec5d6868def0b146bb69be4dc5 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Nov 2024 16:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/pages/layout/components/scomponents/layersControl.vue | 35 ++++-------------
src/views/pd/components/dynamicPanel.vue | 49 ++++++++++++++----------
2 files changed, 36 insertions(+), 48 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index cd94a0c..6c275cd 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-25 15:32:31
+ * @LastEditTime: 2024-11-25 16:37:03
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
@@ -103,10 +103,6 @@
type: 'layer',
subType: '3Dtile',
urlData: [
- // {
- // url: VITE_APP_BASE + 'mx/tileset.json',
- // label: 'tile_01'
- // },
{
url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
label: 'tile_01'
@@ -127,27 +123,6 @@
url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
label: 'tile_05'
},
-
- // {
- // url: 'http://localhost:9003/model/ZOebpNa0/tileset.json',
- // label: 'tile_01'
- // },
- // {
- // url: 'http://localhost:9003/model/QKYdBZ0b/tileset.json',
- // label: 'tile_02'
- // },
- // {
- // url: 'http://localhost:9003/model/QrimOmf3/tileset.json',
- // label: 'tile_03'
- // },
- // {
- // url: 'http://localhost:9003/model/S7E9aUgj/tileset.json',
- // label: 'tile_04'
- // },
- // {
- // url: 'http://localhost:9003/model/WYUq33vu/tileset.json',
- // label: 'tile_05'
- // },
],
layerName: 'hgyq'
},
@@ -641,7 +616,13 @@
},
]
-console.log(data, 12112213213)
+// let modellayer = new DC.VectorLayer("modellayer").addTo(window.$viewer)
+// let model = new DC.Model("121.46748793889597,31.22345700031846,200", VITE_APP_BASE + 'gltf/dajiang.gltf')
+// model.setStyle({
+// scale: 10000
+// })
+// modellayer.addOverlay(model)
+// window.$viewer.flyToPosition("121.46748793889597,31.22345700031846,300,0,-90")
const defaultProps = {
children: 'children',
diff --git a/src/views/pd/components/dynamicPanel.vue b/src/views/pd/components/dynamicPanel.vue
index 5f3a936..6559af4 100644
--- a/src/views/pd/components/dynamicPanel.vue
+++ b/src/views/pd/components/dynamicPanel.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-11-09 15:41:35
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-25 11:26:01
+ * @LastEditTime: 2024-11-25 16:27:34
* @FilePath: \bigScreen\src\views\pd\components\dynamicPanel.vue
* @Description:
*
@@ -25,7 +25,7 @@
title: '典型案例1',
content: '南片区松节油储罐区泄漏事故: 南片区某企业松节油储罐泄漏，如不采取措施，将造成污染事故，影响到赣江下游水质。',
- oneCentent: '企业关闭前置阀门切断泄漏源，向罐内适量注水，抬高液位。',
+ oneCentent: '2024年11月11日11时，南片区江西殷莱特化工有限公司松节油储罐泄漏。企业关闭前置阀门切断泄漏源，向罐内适量注水，抬高液位。',
onePointPosition: {
lng: 115.10175740,
lat: 27.27356477
@@ -54,10 +54,10 @@
title: '典型案例2',
content: '北片区碱类腐蚀性物质泄漏事故: 北片区某企业在生产过程中操作失误，大量含碱废水泄漏，如不采取措施，将造成污染事故，影响到赣江下游水质。',
- oneCentent: '企业关闭前置阀门，切断泄漏源，用砂土等筑堤堵截泄漏液体或者引流到安全地点。',
+ oneCentent: '2024年09月16日14时，北片区江西东玶科技有限公司在生产过程中操作失误，大量含碱废水泄漏。企业关闭前置阀门，切断泄漏源，用砂土等筑堤堵截泄漏液体或者引流到安全地点。',
onePointPosition: {
- lng: 115.10505420,
- lat: 27.28806335
+ lng: 115.10467136,
+ lat: 27.29415383
},
twoContent: '园区关闭北区雨水排口，拦截污染水体。',
@@ -68,8 +68,8 @@
threeContent: '园区启用北区公共应急池，将已拦截废水泵入应急池。',
threePointPosition: {
- lng: 115.10467136,
- lat: 27.29415383
+ lng: 115.10418532,
+ lat: 27.29444603
},
fourContent: '将拦截废水从应急池中通过北区污水提升泵站转移至绿源污水处理厂进行处置。',
@@ -88,22 +88,28 @@
{
key: 3,
title: '典型案例3',
- content: '危险化学品运输事故: 化工集中区北区（吉兴路以南）某企业的危化品运输车辆金工大道危化品运专用运输道上发生侧翻，大量盐酸流至路面，如不采取措施，将造成污染事故，影响到赣江下游水质。',
+ content: '危险化学品运输事故: 北片区某企业某企业的危化品运输车辆发生侧翻，大量盐酸流至路面，如不采取措施，将造成污染事故，影响到赣江下游水质。',
- oneCentent: '调度金龙水库清水，稀释污染团。',
+ oneCentent: '2024年09月16日14时，北片区江西粤鹏环保高新技术开发有限公司的危化品运输车辆发生侧翻，大量盐酸流至路面。',
onePointPosition: {
+ lng: 115.10248629,
+ lat: 27.28112873
+ },
+
+ twoContent: '调度金龙水库清水，稀释污染团。',
+ twoPointPosition: {
lng: 115.10488545,
lat: 27.27678110
},
- twoContent: '转输至江西粤鹏环保高新技术开发有限公司事故应急池、初期雨水池。',
- twoPointPosition: {
+ threeContent: '转输至江西粤鹏环保高新技术开发有限公司事故应急池、初期雨水池。',
+ threePointPosition: {
lng: 115.10545135,
lat: 27.28043872
},
- threeContent: '转输至江西腾龙源环保科技有限公司事故应急池、初期雨水池。',
- threePointPosition: {
+ fourContent: '转输至江西腾龙源环保科技有限公司事故应急池、初期雨水池。',
+ fourPointPosition: {
lng: 115.10332118,
lat: 27.27831698
},
@@ -174,16 +180,17 @@
dynamicHtmlLayer.addOverlay(twoContent)
// 执行对应的事件函数
window.$viewer.flyToPosition(new DC.Position(item.twoPointPosition.lng, item.twoPointPosition.lat, 400, 0, -90, 0), () => { }, 3)
- }, 5000)
+ }, 10000)
timeThree = setTimeout(() => {
let threeCenter = DC.Position.fromObject(item.threePointPosition)
let threeCircle = new DC.Circle(threeCenter, 30)
threeCircle.setStyle({
- classificationType: 0,
- material: new DC.CircleSpiralMaterialProperty({
- color: DC.Color.BLUE.withAlpha(0.2),
- speed: 8.0
+ material: new DC.CircleWaveMaterialProperty({
+ color: DC.Color.fromRandom(),
+ speed: 20,
+ count: 5,
+ gradient: 0.5
})
})
dynamicVectorLayer.addOverlay(threeCircle)
@@ -202,7 +209,7 @@
dynamicHtmlLayer.addOverlay(threeContent)
window.$viewer.flyToPosition(new DC.Position(item.threePointPosition.lng, item.threePointPosition.lat, 400, 0, -90, 0), () => { }, 3)
- }, 10000)
+ }, 15000)
item.fourPointPosition && (timeFour = setTimeout(() => {
let FourCenter = DC.Position.fromObject(item.fourPointPosition)
@@ -231,7 +238,7 @@
dynamicHtmlLayer.addOverlay(fourContent)
// 执行对应的事件函数
window.$viewer.flyToPosition(new DC.Position(item.fourPointPosition.lng, item.fourPointPosition.lat, 400, 0, -90, 0), () => { }, 3)
- }, 15000))
+ }, 20000))
item.fivePointPosition && (timeFive = setTimeout(() => {
let fiveCenter = DC.Position.fromObject(item.fivePointPosition)
@@ -260,7 +267,7 @@
dynamicHtmlLayer.addOverlay(fiveContent)
// 执行对应的事件函数
window.$viewer.flyToPosition(new DC.Position(item.fivePointPosition.lng, item.fivePointPosition.lat, 400, 0, -90, 0), () => { }, 3)
- }, 20000))
+ }, 25000))
}
const clearAll = () => {
--
Gitblit v1.9.3