From f552aad2d257123675990b0036b93c8d85a78f07 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 13 Jan 2025 19:57:40 +0800
Subject: [PATCH] 瑞昌相关调整
---
src/pages/map/components/scomponents/layersControl.vue | 84 ++++++++++++++++++++++++++++++++++++-----
src/views/survey/components/box/fireContent.vue | 10 ++++-
.env.development | 2
.env.production | 2
vite.config.js | 6 +-
5 files changed, 86 insertions(+), 18 deletions(-)
diff --git a/.env.development b/.env.development
index 0de9942..c60cd01 100644
--- a/.env.development
+++ b/.env.development
@@ -13,7 +13,7 @@
VITE_APP_ENV = 'development'
#接口地址
-VITE_APP_API=/zhyqapi
+VITE_APP_API=/zhyqrcapi
#页面基础路径
VITE_APP_BASE=/zhyq-rc/
diff --git a/.env.production b/.env.production
index 2ef2e04..4afbfac 100644
--- a/.env.production
+++ b/.env.production
@@ -14,7 +14,7 @@
#接口地址
#填写前缀 [/api] 需要用nginx进行反向代理
#填写地址 [https://api.bladex.cn] 只需要保证接口支持跨域即可, 无需再做代理
-VITE_APP_API=/zhyqapi
+VITE_APP_API=/zhyqrcapi
#页面基础路径
VITE_APP_BASE=/zhyq-rc/
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index e0ba461..b24309f 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: 2025-01-12 00:48:59
+ * @LastEditTime: 2025-01-13 19:28:23
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -118,13 +118,37 @@
subType: '3Dtile',
urlData: [
{
- url: '/3Dtile/rcmx/tiles_01/tileset.json',
- label: 'tiles_01'
+ url: '/3Dtile/rcmx/tile_01/tileset.json',
+ label: 'tile_01'
},
{
- url: '/3Dtile/rcmx/tiles_02/tileset.json',
- label: 'tiles_02'
+ url: '/3Dtile/rcmx/tile_02/tileset.json',
+ label: 'tile_02'
},
+ {
+ url: '/3Dtile/rcmx/tile_03/tileset.json',
+ label: 'tile_03'
+ },
+ {
+ url: '/3Dtile/rcmx/tile_04/tileset.json',
+ label: 'tile_04'
+ },
+ {
+ url: '/3Dtile/rcmx/tile_05/tileset.json',
+ label: 'tile_05'
+ },
+ {
+ url: '/3Dtile/rcmx/tile_06/tileset.json',
+ label: 'tile_06'
+ },
+ {
+ url: '/3Dtile/rcmx/tile_07/tileset.json',
+ label: 'tile_07'
+ },
+ {
+ url: '/3Dtile/rcmx/tile_08/tileset.json',
+ label: 'tile_08'
+ }
],
layerName: 'hgyq'
},
@@ -461,16 +485,55 @@
addPopLayers[attrParams.name].addOverlay(divIcon)
}
},
-
{
parentId: '4',
id: '4-2',
- label: '重大',
+ label: '较大',
type: 'layer',
subType: 'labelPoint',
method: getRiskList,
params: {
riskLevel: 2,
+ size: 1000
+ },
+ showParams: 'category',
+ className: 'fxy-larger',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd-b.png',
+ showPanel: false,
+ layerName: 'fxyLarger',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ // 删除
+ destroyPop()
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
+ let iconEl = `<div class="marsBlueGradientPnl">
+ <li>企业名称：${attrParams.firmName || ''}</li>
+ <li>风险等级：${attrParams.riskLevelName || ''}</li>
+ <li>行业类别：${attrParams.name || ''}</li>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+ `<div class="public-map-popup-three">
+ ${iconEl}
+ </div>`
+ )
+ let incident = () => {
+ destroyPop()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
+ }
+ },
+ {
+ parentId: '4',
+ id: '4-3',
+ label: '重大',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getRiskList,
+ params: {
+ riskLevel: 3,
size: 1000
},
showParams: 'category',
@@ -502,11 +565,10 @@
addPopLayers[attrParams.name].addOverlay(divIcon)
}
},
-
{
parentId: '4',
id: '4-9',
- label: '暂定',
+ label: '其他',
type: 'layer',
subType: 'labelPoint',
method: getRiskList,
@@ -702,7 +764,7 @@
skipLevelOfDetail: true,
baseScreenSpaceError: 1024,
- maximumScreenSpaceError: 32, // 数值加大，能让最终成像变模糊
+ maximumScreenSpaceError: 16, // 数值加大，能让最终成像变模糊
skipScreenSpaceErrorFactor: 128,
skipLevels: 5,
immediatelyLoadDesiredLevelOfDetail: false,
@@ -712,7 +774,7 @@
cullRequestsWhileMovingMultiplier: 10, // 值越小能够更快的剔除
preloadWhenHidden: true,
preferLeaves: true,
- maximumMemoryUsage: 1024, // 内存分配变小有利于倾斜摄影数据回收，提升性能体验
+ maximumMemoryUsage: 64, // 内存分配变小有利于倾斜摄影数据回收，提升性能体验
progressiveResolutionHeightFraction: 0.3, // 数值偏于0能够让初始加载变得模糊
dynamicScreenSpaceErrorDensity: 0.5, // 数值加大，能让周边加载变快
dynamicScreenSpaceErrorFactor: 1, // 不知道起了什么作用没，反正放着吧先
diff --git a/src/views/survey/components/box/fireContent.vue b/src/views/survey/components/box/fireContent.vue
index 29a91e2..c6239bd 100644
--- a/src/views/survey/components/box/fireContent.vue
+++ b/src/views/survey/components/box/fireContent.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-11-04 16:32:04
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2025-01-12 00:52:38
+ * @LastEditTime: 2025-01-12 01:00:02
* @FilePath: \bigScreen\src\views\survey\components\box\fireContent.vue
* @Description:
*
@@ -21,7 +21,7 @@
let typeLevel = [
{
- name: '暂定',
+ name: '其他',
itemStyle: {
color: '#ADADAD'
}
@@ -35,6 +35,12 @@
{
name: '较大',
itemStyle: {
+ color: '#FFA500'
+ }
+ },
+ {
+ name: '重大',
+ itemStyle: {
color: '#FF0000'
}
}
diff --git a/vite.config.js b/vite.config.js
index a47317e..c48f585 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: 2025-01-08 17:14:17
+ * @LastEditTime: 2025-01-12 01:00:49
* @FilePath: \bigScreen\vite.config.js
* @Description:
*
@@ -129,11 +129,11 @@
// rewrite: path => path.replace(/^\/zhyq-rc\/mx/, ''),
// },
- '/zhyqapi': {
+ '/zhyqrcapi': {
// target: 'http://localhost:8082',
target: 'https://wrj.shuixiongit.com/zhyqrcapi',
changeOrigin: true,
- rewrite: path => path.replace(/^\/zhyqapi/, ''),
+ rewrite: path => path.replace(/^\/zhyqrcapi/, ''),
},
},
},
--
Gitblit v1.9.3