From bfd75b723b25e2aade04c5a1883efb83f3018dfd Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 9 Feb 2023 18:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jl3dmaintainer/maintainerconnect.js | 2 +-
src/jmapNew/shape/graph/Switch/ESwLocal.js | 14 ++--
src/scripts/ConstConfig.js | 1 +
src/utils/baseUrl.js | 2 +-
.../display/terminals/driverAtsWork.vue | 65 +++++++++++++++++++
5 files changed, 75 insertions(+), 9 deletions(-)
create mode 100644 src/views/newMap/display/terminals/driverAtsWork.vue
diff --git a/src/jlmap3d/jl3dmaintainer/maintainerconnect.js b/src/jlmap3d/jl3dmaintainer/maintainerconnect.js
index a84a8a59d..98cc9f403 100644
--- a/src/jlmap3d/jl3dmaintainer/maintainerconnect.js
+++ b/src/jlmap3d/jl3dmaintainer/maintainerconnect.js
@@ -282,7 +282,7 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
return;
}
};
-
+
this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) {
trainlisttest = newtrainlisttest;
sectionlist = newsectionlist;
diff --git a/src/jmapNew/shape/graph/Switch/ESwLocal.js b/src/jmapNew/shape/graph/Switch/ESwLocal.js
index 399fabe3e..1adc9622a 100644
--- a/src/jmapNew/shape/graph/Switch/ESwLocal.js
+++ b/src/jmapNew/shape/graph/Switch/ESwLocal.js
@@ -40,7 +40,7 @@ class ESwLocal extends Group {
}
show() {
- this.locShelter.show();
+ this.locShelter.show();
}
stopAnimation(flag) {
@@ -56,13 +56,13 @@ class ESwLocal extends Group {
this.locShelter.setStyle(data);
}
- addHover(style) {
- this.__zr && this.__zr.addHover(this.locShelter, style)
- }
+ addHover(style) {
+ this.__zr && this.__zr.addHover(this.locShelter, style);
+ }
- removeHover() {
- this.__zr && this.__zr.removeHover(this.locShelter);
- }
+ removeHover() {
+ this.__zr && this.__zr.removeHover(this.locShelter);
+ }
animateStyle(cb) {
this.eachChild((child) => {
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index ec2a2fc2e..8a02b9f38 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -62,6 +62,7 @@ export default {
{ label: '通号', value: 'MAINTAINER', enLabel: 'Repairman ' },
{ label: '车辆段/停车场调度', value: 'DEPOT_DISPATCHER', enLabel: 'Depot dispatcher ' },
{ label: '电力调度', value: 'ELECTRIC_DISPATCHER', enLabel: 'Electric dispatcher' },
+ { label: '电力工务', value: 'STATION_ELECTRIC_WORKER', enLabel: 'Station Electric dispatcher' },
{ label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher ' },
{ label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department' },
{ label: '车辆段/停车场信号楼', value: 'SIGNAL_BUILDING', enLabel: 'Signal Building' },
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index f84210e59..d0b5c5a8d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -37,7 +37,7 @@ export function handlerUrl() {
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
BASE_SITE = 'https://test.joylink.club/cbtc';
OSS_URL = 'https://192.168.3.233/oss-rtss';
- } else if (process.env.NODE_ENV === 'test' && process.env.VUE_APP_PRO === 'local-test') {
+ } else if (process.env.NODE_ENV === 'test' && process.env.VUE_APP_PRO === 'local-test') {
// 本地打包测试分支
BASE_API = 'https://192.168.3.233/rtss-server'; // api地址
BASE_SITE = 'https://192.168.3.233/cbtc'; // 前端项目地址
diff --git a/src/views/newMap/display/terminals/driverAtsWork.vue b/src/views/newMap/display/terminals/driverAtsWork.vue
new file mode 100644
index 000000000..253779290
--- /dev/null
+++ b/src/views/newMap/display/terminals/driverAtsWork.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+