From c532f35dff316106802df5c6f67cfb8626d86aca Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 24 Dec 2024 16:52:39 +0800
Subject: [PATCH] 临川相关调整
---
src/assets/json/yqfw_01.json | 171 ++++++++++++++++++++++++++++
src/pages/single/index.vue | 2
src/pages/login.vue | 2
src/pages/map/components/scomponents/layersControl.vue | 138 ++++++----------------
.env.development | 2
src/components/global/MapContainer.vue | 8
index.html | 4
.env.production | 2
src/views/supplies/components/dataContent.vue | 2
vite.config.js | 8
src/assets/json/yqfw_02.json | 3
src/pages/main/index.vue | 2
src/views/space/components/box/dataContent.vue | 2
13 files changed, 229 insertions(+), 117 deletions(-)
diff --git a/.env.development b/.env.development
index fcfda8b..c76556c 100644
--- a/.env.development
+++ b/.env.development
@@ -13,7 +13,7 @@
VITE_APP_ENV = 'development'
#接口地址
-VITE_APP_API=/zhyqapi
+VITE_APP_API=/zhyqhbapi
#页面基础路径
VITE_APP_BASE=/zhyq/
diff --git a/.env.production b/.env.production
index 16d9b5e..7c8da06 100644
--- a/.env.production
+++ b/.env.production
@@ -14,7 +14,7 @@
#接口地址
#填写前缀 [/api] 需要用nginx进行反向代理
#填写地址 [https://api.bladex.cn] 只需要保证接口支持跨域即可, 无需再做代理
-VITE_APP_API=/zhyqapi
+VITE_APP_API=/zhyqhbapi
#页面基础路径
VITE_APP_BASE=/zhyq/
diff --git a/index.html b/index.html
index f808a0d..d91f8c2 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-25 10:56:27
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-10-31 18:36:26
+ * @LastEditTime: 2024-12-24 15:05:44
* @FilePath: \bigScreen\index.html
* @Description:
*
@@ -21,7 +21,7 @@
rel="stylesheet"
type="text/css"
/> -->
- <title>吉水化工园区“一园一策一图”VR平台</title>
+ <title>临川化工园区“一园一策一图”VR平台</title>
</head>
<body>
diff --git a/src/assets/json/yqfw_01.json b/src/assets/json/yqfw_01.json
new file mode 100644
index 0000000..62226fa
--- /dev/null
+++ b/src/assets/json/yqfw_01.json
@@ -0,0 +1,171 @@
+{
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ 116.282746864,
+ 28.03552684,
+ 0
+ ],
+ [
+ 116.2794316341,
+ 28.0401575361,
+ 0
+ ],
+ [
+ 116.2790575944,
+ 28.0406250829,
+ 0
+ ],
+ [
+ 116.2786585421,
+ 28.0405150976,
+ 0
+ ],
+ [
+ 116.2745404153,
+ 28.0379522385,
+ 0
+ ],
+ [
+ 116.273289057,
+ 28.0396001479,
+ 0
+ ],
+ [
+ 116.2692475658,
+ 28.0371512987,
+ 0
+ ],
+ [
+ 116.2662341569,
+ 28.0352113775,
+ 0
+ ],
+ [
+ 116.2669964284,
+ 28.0336029753,
+ 0
+ ],
+ [
+ 116.2669091417,
+ 28.0333475977,
+ 0
+ ],
+ [
+ 116.2679866161,
+ 28.0313519894,
+ 0
+ ],
+ [
+ 116.2696485093,
+ 28.0294181963,
+ 0
+ ],
+ [
+ 116.277560396,
+ 28.0342157385,
+ 0
+ ],
+ [
+ 116.2784995546,
+ 28.0329934826,
+ 0
+ ],
+ [
+ 116.282746864,
+ 28.03552684,
+ 0
+ ]
+ ]
+ ]
+ },
+ "properties": {
+ "name": "未命名面_1",
+ "visibility": true,
+ "LinePattern": "65535",
+ "altitudeMode": "clampToGround"
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ 116.281744052219,
+ 27.9943137209334,
+ 51.461275727192
+ ],
+ [
+ 116.28650765543,
+ 27.9942420523086,
+ 47.7485232296367
+ ],
+ [
+ 116.290434409428,
+ 27.9942956964889,
+ 49.436595916748
+ ],
+ [
+ 116.290466595936,
+ 27.9953363935866,
+ 47.7976223402328
+ ],
+ [
+ 116.290702630329,
+ 27.9965916674056,
+ 43.7296502780014
+ ],
+ [
+ 116.291292716312,
+ 27.9978254835525,
+ 42.6472279717363
+ ],
+ [
+ 116.291378547001,
+ 27.9985979597487,
+ 41.4828713227727
+ ],
+ [
+ 116.290927935886,
+ 27.9988018076339,
+ 39.5690351009656
+ ],
+ [
+ 116.28827791338,
+ 27.9988876383223,
+ 41.0453694721982
+ ],
+ [
+ 116.284158040333,
+ 27.9987374346175,
+ 46.0993896276404
+ ],
+ [
+ 116.281722594547,
+ 27.9983726541915,
+ 43.9637113716594
+ ],
+ [
+ 116.281744052219,
+ 27.9943137209334,
+ 51.461275727192
+ ]
+ ]
+ ]
+ },
+ "properties": {
+ "name": "临川2",
+ "description": "",
+ "tessellate": true
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/assets/json/yqfw_02.json b/src/assets/json/yqfw_02.json
new file mode 100644
index 0000000..ff5e2f8
--- /dev/null
+++ b/src/assets/json/yqfw_02.json
@@ -0,0 +1,3 @@
+{"type":"FeatureCollection", "features":[
+{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[116.281744052219,27.9943137209334,51.461275727192],[116.28650765543,27.9942420523086,47.7485232296367],[116.290434409428,27.9942956964889,49.436595916748],[116.290466595936,27.9953363935866,47.7976223402328],[116.290702630329,27.9965916674056,43.7296502780014],[116.291292716312,27.9978254835525,42.6472279717363],[116.291378547001,27.9985979597487,41.4828713227727],[116.290927935886,27.9988018076339,39.5690351009656],[116.28827791338,27.9988876383223,41.0453694721982],[116.284158040333,27.9987374346175,46.0993896276404],[116.281722594547,27.9983726541915,43.9637113716594],[116.281744052219,27.9943137209334,51.461275727192]]]},"properties":{"name":"临川2","description":"","tessellate":true}}
+]}
diff --git a/src/components/global/MapContainer.vue b/src/components/global/MapContainer.vue
index 877ce7b..c55fb41 100644
--- a/src/components/global/MapContainer.vue
+++ b/src/components/global/MapContainer.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-25 15:07:51
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-12-03 12:21:28
+ * @LastEditTime: 2024-12-24 15:04:25
* @FilePath: \bigScreen\src\components\global\MapContainer.vue
* @Description:
*
@@ -45,9 +45,9 @@
window.$viewer.locationBar.enable = true
window.$viewer.zoomToPosition(new DC.Position(
- 115.1021,
- 27.2360,
- 5000,
+ 116.2819,
+ 27.9400,
+ 8000,
0,
-45,
0
diff --git a/src/pages/login.vue b/src/pages/login.vue
index 5022c57..7980eef 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -2,7 +2,7 @@
<div class="box">
<div class="login">
<div class="logintitle">
- 吉水化工园区“一园一策一图”VR平台
+ 临川化工园区“一园一策一图”VR平台
</div>
<div class="getingo">
<p class="title">用户登录</p>
diff --git a/src/pages/main/index.vue b/src/pages/main/index.vue
index 8023500..37c038c 100644
--- a/src/pages/main/index.vue
+++ b/src/pages/main/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="w100 h100 relative">
<div class="main-header">
- <div class="title">吉水化工园区“一园一策一图”VR平台</div>
+ <div class="title">临川化工园区“一园一策一图”VR平台</div>
<div class="login-out" @click="signOut">
<img :src="loginOutBg" class="img" />
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 1694931..5e7ac88 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-10 14:33:31
+ * @LastEditTime: 2024-12-24 16:31:17
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -73,7 +73,7 @@
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"
+import yqfw_01 from "@/assets/json/yqfw_01"
// import gsgw from "@/assets/json/gsgw"
// import rqgw from "@/assets/json/rqgw"
import wsgw from "@/assets/json/wsgw"
@@ -119,18 +119,6 @@
url: VITE_APP_BASE + 'mx/tile_02/tileset.json',
label: 'tile_02'
},
- {
- url: VITE_APP_BASE + 'mx/tile_03/tileset.json',
- label: 'tile_03'
- },
- {
- url: VITE_APP_BASE + 'mx/tile_04/tileset.json',
- label: 'tile_04'
- },
- {
- url: VITE_APP_BASE + 'mx/tile_05/tileset.json',
- label: 'tile_05'
- },
],
layerName: 'hgyq'
},
@@ -158,92 +146,42 @@
parentId: '3',
id: '3-1',
label: '应急池',
- children: [
- {
- parentId: '3-1',
- id: '3-1-1',
- label: '园区',
- type: 'layer',
- subType: 'labelPoint',
- method: getList,
- params: {
- type: 1,
- size: 1000,
- category: 1
- },
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
- className: 'yjc-box',
- showPanel: false,
- layerName: 'yjc-yq',
- incident: (e) => {
- const { attrParams } = e.overlay
- // 删除
- destroyPop()
- if (!attrParams.firmName) {
- return
- }
- addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
- window.$viewer.addLayer(addPopLayers[attrParams.id])
- let iconEl = `<div class="marsBlueGradientPnl">
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getList,
+ params: {
+ type: 1,
+ size: 1000,
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
+ className: 'yjc-box',
+ showPanel: false,
+ layerName: 'yjc-yq',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ // 删除
+ destroyPop()
+ if (!attrParams.firmName) {
+ return
+ }
+ addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+ window.$viewer.addLayer(addPopLayers[attrParams.id])
+ let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
</div>`
- let divIcon = new DC.DivIcon(
- new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
- `<div class="public-map-popup-two">
+ let divIcon = new DC.DivIcon(
+ new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+ `<div class="public-map-popup-two">
${iconEl}
</div>`
- )
- let incident = () => {
- destroyPop()
- }
- divIcon.on(DC.MouseEventType.CLICK, incident)
- addPopLayers[attrParams.id].addOverlay(divIcon)
- }
- },
- {
- parentId: '3-1',
- id: '3-1-2',
- label: '企业',
- type: 'layer',
- subType: 'labelPoint',
- method: getList,
- params: {
- type: 1,
- size: 1000,
- category: 2
- },
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
- className: 'yjc-box',
- showPanel: false,
- layerName: 'yjc-qy',
- incident: (e) => {
- const { attrParams } = e.overlay
- // 删除
- destroyPop()
- if (!attrParams.firmName) {
- return
- }
- addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
- window.$viewer.addLayer(addPopLayers[attrParams.id])
- let iconEl = `<div class="marsBlueGradientPnl">
- <div>企业名称：${attrParams.firmName}</div>
- <div>作用：${attrParams.mainFuncName}</div>
- </div>`
- let divIcon = new DC.DivIcon(
- new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
- `<div class="public-map-popup-two">
- ${iconEl}
- </div>`
- )
- let incident = () => {
- destroyPop()
- }
- divIcon.on(DC.MouseEventType.CLICK, incident)
- addPopLayers[attrParams.id].addOverlay(divIcon)
- }
- },
- ]
+ )
+ let incident = () => {
+ destroyPop()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPopLayers[attrParams.id].addOverlay(divIcon)
+ }
},
{
@@ -741,7 +679,7 @@
type: 'layer',
subType: 'geojsonWall',
layerName: 'yqfw',
- source: yqfw
+ source: yqfw_01
},
{
@@ -965,7 +903,7 @@
item.source.features.forEach(i => {
let wall = new DC.Wall(
- i.geometry.coordinates[0].map(d => [...d, 125].join(',')).join(';')
+ i.geometry.coordinates[0].map(d => [d[0], d[1], 125].join(',')).join(';')
)
wall.setStyle({
@@ -1139,9 +1077,9 @@
// 飞到园区范围
const flyToyqfw = () => {
window.$viewer.zoomToPosition(new DC.Position(
- 115.1021,
- 27.2360,
- 5000,
+ 116.2819,
+ 27.9400,
+ 8000,
0,
-45,
0
diff --git a/src/pages/single/index.vue b/src/pages/single/index.vue
index 1129943..dc6daec 100644
--- a/src/pages/single/index.vue
+++ b/src/pages/single/index.vue
@@ -2,7 +2,7 @@
<div class="wrapper">
<div class="w100 h100 relative main-content single-page" id="MainContent">
<div class="main-header">
- <div class="title">吉水化工园区“一园一策一图”VR平台</div>
+ <div class="title">临川化工园区“一园一策一图”VR平台</div>
<div class="login-out" @click="signOut">
<img :src="loginOutBg" class="img" />
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index ba492b5..a36c5f4 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -99,7 +99,7 @@
const data = res.data.data
data.records.forEach(item => {
if(!item.firmName){
- item.firmName = '吉水化工园区'
+ item.firmName = '临川化工园区'
}
})
tableData.value = data.records
diff --git a/src/views/supplies/components/dataContent.vue b/src/views/supplies/components/dataContent.vue
index e526db4..e954317 100644
--- a/src/views/supplies/components/dataContent.vue
+++ b/src/views/supplies/components/dataContent.vue
@@ -58,7 +58,7 @@
// 园区 企业
const tilteList = ref([
- { label: "吉水化工园区", value: "0", id: "1" }
+ { label: "临川化工园区", value: "0", id: "1" }
])
onMounted(() => {
diff --git a/vite.config.js b/vite.config.js
index f69b8d7..c9be228 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-03 13:42:55
+ * @LastEditTime: 2024-12-24 14:52:51
* @FilePath: \bigScreen\vite.config.js
* @Description:
*
@@ -123,11 +123,11 @@
// rewrite: path => path.replace(/^\/zhyq\/mx/, ''),
// },
- '/zhyqapi': {
+ '/zhyqhbapi': {
// target: 'http://localhost:8082',
- target: 'https://wrj.shuixiongit.com/zhyqapi',
+ target: 'https://wrj.shuixiongit.com/zhyqhbapi',
changeOrigin: true,
- rewrite: path => path.replace(/^\/zhyqapi/, ''),
+ rewrite: path => path.replace(/^\/zhyqhbapi/, ''),
},
},
},
--
Gitblit v1.9.3