From 7451d4b759a30830514f8f398268d5694dcb1dde Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 03 十二月 2025 13:59:09 +0800
Subject: [PATCH] #
---
src/main/webapp/components/MapCanvas.js | 17 +----------------
src/main/webapp/views/watch/console3.html | 6 +++---
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/components/MapCanvas.js b/src/main/webapp/components/MapCanvas.js
index d52d603..bcdab17 100644
--- a/src/main/webapp/components/MapCanvas.js
+++ b/src/main/webapp/components/MapCanvas.js
@@ -7,7 +7,7 @@
</div>
</div>
`,
- props: ['lev', 'zoom', 'crnParam', 'rgvParam', 'devpParam', 'highlightOnParamChange'],
+ props: ['lev', 'crnParam', 'rgvParam', 'devpParam', 'highlightOnParamChange'],
data() {
return {
map: [],
@@ -50,9 +50,6 @@
watch: {
lev(newLev) {
if (newLev != null) { this.changeFloor(newLev); }
- },
- zoom(newZoom) {
- this.applyZoom(newZoom);
},
crnParam: {
deep: true,
@@ -861,17 +858,5 @@
getTrackSiteNo(obj) {
if (this.isJson(obj)) { let data = JSON.parse(obj); if (data.trackSiteNo == null || data.trackSiteNo == undefined) { return -1; } return data.trackSiteNo; } else { return -1; }
},
- applyZoom(z) {
- let scale = 1;
- if (typeof z === 'number') { scale = Math.max(0.1, Math.min(5, z / 100)); }
- const sx = this.pixiApp.view.width / 2;
- const sy = this.pixiApp.view.height / 2;
- const oldZoom = this.pixiApp.stage.scale.x;
- const worldX = (sx - this.pixiApp.stage.position.x) / oldZoom;
- const worldY = (sy - this.pixiApp.stage.position.y) / oldZoom;
- const newPosX = sx - worldX * scale;
- const newPosY = sy - worldY * scale;
- this.pixiApp.stage.setTransform(newPosX, newPosY, scale, scale, 0, 0, 0, 0, 0);
- }
}
});
diff --git a/src/main/webapp/views/watch/console3.html b/src/main/webapp/views/watch/console3.html
index 968201e..54ba4b6 100644
--- a/src/main/webapp/views/watch/console3.html
+++ b/src/main/webapp/views/watch/console3.html
@@ -29,13 +29,13 @@
<el-tab-pane label="RGV" name="rgv">
<watch-rgv-card :param="rgvParam"></watch-rgv-card>
</el-tab-pane>
- <el-tab-pane label="鍦板浘閰嶇疆" name="mapSetting">
+ <!-- <el-tab-pane label="鍦板浘閰嶇疆" name="mapSetting">
<map-setting-card :param="mapSettingParam"></map-setting-card>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</div>
- <map-canvas :lev="currentLev" :zoom="mapSettingParam.zoom" :crn-param="crnParam" :rgv-param="rgvParam" :devp-param="devpParam" @crn-click="openCrn" @station-click="openSite" style="width: 80%; height: 100vh;"></map-canvas>
+ <map-canvas :lev="currentLev" :crn-param="crnParam" :rgv-param="rgvParam" :devp-param="devpParam" @crn-click="openCrn" @station-click="openSite" style="width: 80%; height: 100vh;"></map-canvas>
<div style="position: absolute;top: 15px;left: 50%;display: flex;">
<div v-if="levList.length > 1" v-for="(lev,index) in levList" :key="index" style="margin-right: 10px;">
--
Gitblit v1.9.1