From d9b03b30f6f291eb05e354b2f02eb5c558767a63 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 10 Oct 2023 15:56:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8loading=E4=B8=8D=E5=85=B3=E9=97=AD=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/newMap/display/index.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 09f5d349f..c3d8d55e6 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -23,13 +23,13 @@ export function handlerUrl() { let OSS_URL; if (process.env.NODE_ENV === 'development') { // 开发分支 - // BASE_API = 'http://192.168.3.233/rtss-server'; + BASE_API = 'http://192.168.3.233/rtss-server'; // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.3.47:9000'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 - BASE_API = 'http://192.168.3.15:9000'; // 张赛 + // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/newMap/display/index.vue b/src/views/newMap/display/index.vue index 52f4dbaee..788181cab 100644 --- a/src/views/newMap/display/index.vue +++ b/src/views/newMap/display/index.vue @@ -148,6 +148,7 @@ export default { await loadMapDataById(this.mapId, 'simulation'); } else { this.endViewLoading(); + this.$store.dispatch('app/animationsClose'); this.$messageBox('此地图数据正在维护中,无法运行！'); } }).catch(e => { From ca183eed7e08007815e8dcd2d5102e8138135ad4 Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 23 Oct 2023 16:41:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E5=93=88=E5=B0=94=E6=BB=A8=E7=BA=BF=E6=97=A9=E6=99=9A?= =?UTF-8?q?=E7=82=B9=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Train/TrainBody.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/shape/graph/Train/TrainBody.js b/src/jmapNew/shape/graph/Train/TrainBody.js index 716381aa0..7fc7f5c8c 100644 --- a/src/jmapNew/shape/graph/Train/TrainBody.js +++ b/src/jmapNew/shape/graph/Train/TrainBody.js @@ -261,12 +261,13 @@ export default class TrainBody extends Group { this.add(this.travelNum); } if (style.Train.common.hasDelayTime) { + const time = Math.abs(model.dt) <= 15 ? Math.abs(model.dt) : (model.dt > 0 ? '-' + model.dt : '+' + Math.abs(model.dt)); this.delayTime = new ETextName({ zlevel: model.zlevel, z: model.z + 1, x: parseInt(model.point.x + style.Train.delayTime.trainDelayTimeOffset.x), y: parseInt(model.point.y + style.Train.delayTime.trainDelayTimeOffset.y), - text: model.dt > 0 ? '+' + model.dt : model.dt, + text: time, textFill: '#DADA00', textStroke: style.trainTextColor, textStrokeWidth: 0,