diff --git a/.env.production b/.env.production index d99c0e9..27ffce5 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_MAP_IMG='/lingshan-front/images/map/' -VUE_APP_PLAYER_URL='/lingshan-front/js/h5player/' -VUE_APP_VIDEO_URL='/lingshan-front/video/' \ No newline at end of file +VUE_APP_MAP_IMG='/yifengdian-front/images/map/' +VUE_APP_PLAYER_URL='/yifengdian-front/js/h5player/' +VUE_APP_VIDEO_URL='/yifengdian-front/video/' \ No newline at end of file diff --git a/.gitignore b/.gitignore index a584373..e6f4be4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ .DS_Store node_modules /dist -/yifefng_integration -/yifefng_integration.zip +/yifengdian-front +/yifengdian-front.zip # local env files .env.local diff --git a/public/video/1.mp4 b/public/video/1.mp4 deleted file mode 100644 index bdbfecf..0000000 Binary files a/public/video/1.mp4 and /dev/null differ diff --git a/src/assets/images/material/微信图片_20240115132807.jpg b/src/assets/images/material/微信图片_20240115132807.jpg deleted file mode 100644 index d9983fe..0000000 Binary files a/src/assets/images/material/微信图片_20240115132807.jpg and /dev/null differ diff --git a/src/assets/images/material/微信图片_20240115132824.jpg b/src/assets/images/material/微信图片_20240115132824.jpg deleted file mode 100644 index 82bef62..0000000 Binary files a/src/assets/images/material/微信图片_20240115132824.jpg and /dev/null differ diff --git a/src/assets/images/material/微信图片_20240115132832.jpg b/src/assets/images/material/微信图片_20240115132832.jpg deleted file mode 100644 index 6d67b70..0000000 Binary files a/src/assets/images/material/微信图片_20240115132832.jpg and /dev/null differ diff --git a/src/assets/images/material/微信图片_20240115132841.jpg b/src/assets/images/material/微信图片_20240115132841.jpg deleted file mode 100644 index a8bc7bf..0000000 Binary files a/src/assets/images/material/微信图片_20240115132841.jpg and /dev/null differ diff --git a/src/assets/images/material/微信图片_20240115132911.jpg b/src/assets/images/material/微信图片_20240115132911.jpg deleted file mode 100644 index 4392f57..0000000 Binary files a/src/assets/images/material/微信图片_20240115132911.jpg and /dev/null differ diff --git a/src/assets/images/material/微信图片_20240115132914.jpg b/src/assets/images/material/微信图片_20240115132914.jpg deleted file mode 100644 index 1b7a3fc..0000000 Binary files a/src/assets/images/material/微信图片_20240115132914.jpg and /dev/null differ diff --git a/src/views/next/screen-content-map/cpt/zdyf-map.vue b/src/views/next/screen-content-map/cpt/zdyf-map.vue index 6a57098..7729c93 100644 --- a/src/views/next/screen-content-map/cpt/zdyf-map.vue +++ b/src/views/next/screen-content-map/cpt/zdyf-map.vue @@ -182,7 +182,6 @@ export default { if (!type) { this.initCircle() } else if (type == 'unit') { - this.initDot(point) this.initPolygonLayer() } else if (type == 'resource') { this.initPolygonLayer(type) @@ -197,7 +196,7 @@ export default { initCircle() { circleLayerSmall = new ImageLayer({}); circleLayerSmall.source( - `${process.env.VUE_APP_MAP_IMG}/circle1.png`, + `${process.env.VUE_APP_MAP_IMG}circle1.png`, { parser: { type: 'image', @@ -219,7 +218,7 @@ export default { scene.setZoom(10) roadLayer = new ImageLayer({}); roadLayer.source( - `${process.env.VUE_APP_MAP_IMG}/road1.png`, + `${process.env.VUE_APP_MAP_IMG}road1.png`, { parser: { type: 'image', @@ -259,6 +258,16 @@ export default { }, initPolygonLayer(type) { + if(polygonLayer){ + scene.removeLayer(polygonLayer); + } + if(lineLayer){ + scene.removeLayer(lineLayer); + } + if(textLayer){ + scene.removeLayer(textLayer); + + } if(type == 'szyf') { this.initFlow() return diff --git a/src/views/next/screen-content-right/szyf-right/index.vue b/src/views/next/screen-content-right/szyf-right/index.vue index feab4c1..e124ef7 100644 --- a/src/views/next/screen-content-right/szyf-right/index.vue +++ b/src/views/next/screen-content-right/szyf-right/index.vue @@ -85,22 +85,22 @@ export default { { src: require('@/assets/images/resource/whyf/7.jpg'), time: '2022-07-12 12:00:00', - name: '预警监测', + name: '大沽河监控点位-01', }, { src: require('@/assets/images/resource/whyf/9.jpg'), time: '2022-07-12 12:00:00', - name: '预警监测', + name: '大沽河监控点位-02', }, { src: require('@/assets/images/resource/whyf/10.jpg'), time: '2022-07-12 12:00:00', - name: '预警监测', + name: '大沽河监控点位-03', }, { src: require('@/assets/images/resource/whyf/11.jpg'), time: '2022-07-12 12:00:00', - name: '预警监测', + name: '大沽河监控点位-04', } ] }; diff --git a/vue.config.js b/vue.config.js index 0f26eb9..e5657c6 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,7 +9,7 @@ function diffOutputDir () { if (process.env.NODE_ENV === 'development') { return './dist' } else if (process.env.NODE_ENV === 'production') { - return './jinshui-screen' + return './yifengdian-front' } } // 生产环境-资源引用路径 diff --git a/yifefng_integration.zip b/yifefng_integration.zip deleted file mode 100644 index 443268f..0000000 Binary files a/yifefng_integration.zip and /dev/null differ