From bfb3c9357c5495fd97479ddff2259bdcf4356f8d Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 19 May 2020 17:06:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 6 +-- src/views/error-page/401.vue | 54 +++++++++---------- src/views/jsxt/competition/examDetail.vue | 3 +- .../newMap/jointTrainingNew/menuDemon.vue | 27 +++++++--- 4 files changed, 50 insertions(+), 40 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 82af2a080..e9046878d 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,12 +2,12 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 - BASE_API = 'http://192.168.3.41:9000'; // 张赛 + // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 - // BASE_API = 'http://192.168.3.41:9000'; // 张S赛 + // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/error-page/401.vue b/src/views/error-page/401.vue index 3b44ee832..2f5be5120 100644 --- a/src/views/error-page/401.vue +++ b/src/views/error-page/401.vue @@ -1,27 +1,27 @@ From a51ae0aa3085cbe15b51a7906c7cc5b59c26a1a4 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 19 May 2020 18:54:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E5=88=97=E8=BD=A6=E6=AD=A3=E5=8D=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E5=8C=BA=E6=AE=B5=EF=BC=8C=E8=AE=A1=E8=BD=B4=E6=A0=87?= =?UTF-8?q?=E7=A4=BA=E4=B9=9F=E4=BC=9A=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=BA=A2?= =?UTF-8?q?=E8=89=B2=20=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 --- src/jmapNew/shape/Section/EAxle.js | 16 ++++++++++ src/jmapNew/shape/Section/index.js | 37 +++++++++++++++++++++- src/views/newMap/displayNew/menuScript.vue | 8 ++--- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/shape/Section/EAxle.js b/src/jmapNew/shape/Section/EAxle.js index dac4759d9..c7d07decd 100644 --- a/src/jmapNew/shape/Section/EAxle.js +++ b/src/jmapNew/shape/Section/EAxle.js @@ -254,4 +254,20 @@ export default class EAxle111 extends Group { this.add(this.circle); } } + + setStyle(styles) { + if (this.model.shape.isSpecial) { + this.isogonInside.setStyle(styles); + this.isogonOutside.setStyle(styles); + this.line1.setStyle(styles); + this.line2.setStyle(styles); + this.line3.setStyle(styles); + this.line4.setStyle(styles); + this.line5.setStyle(styles); + this.line6.setStyle(styles); + } else { + this.circle.setStyle(styles); + } + this.line.setStyle(styles); + } } diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 737f8fa92..4a0a0caf6 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -524,7 +524,18 @@ export default class Section extends Group { this.remove(this.speedLimitLeft); this.remove(this.speedLimitRight); } - + } + if (this.leftAxle) { + this.leftAxle.setStyle({ + stroke: this.style.Section.line.spareColor, + fill: this.style.Section.line.spareColor + }); + } + if (this.rightAxle) { + this.rightAxle.setStyle({ + stroke: this.style.Section.line.spareColor, + fill: this.style.Section.line.spareColor + }); } } @@ -556,6 +567,18 @@ export default class Section extends Group { lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth }); } + if (this.leftAxle) { + this.leftAxle.setStyle({ + stroke: this.style.Section.line.communicationOccupiedColor, + fill:this.style.Section.line.communicationOccupiedColor + }); + } + if (this.rightAxle) { + this.rightAxle.setStyle({ + stroke: this.style.Section.line.communicationOccupiedColor, + fill:this.style.Section.line.communicationOccupiedColor + }); + } } /** 非通信车占用状态 03*/ @@ -566,6 +589,18 @@ export default class Section extends Group { lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth }); } + if (this.leftAxle) { + this.leftAxle.setStyle({ + stroke: this.style.Section.line.unCommunicationOccupiedColor, + fill:this.style.Section.line.unCommunicationOccupiedColor + }); + } + if (this.rightAxle) { + this.rightAxle.setStyle({ + stroke: this.style.Section.line.unCommunicationOccupiedColor, + fill:this.style.Section.line.unCommunicationOccupiedColor + }); + } } /** 进路锁闭 04*/ diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue index 9d65c27e6..77fed7464 100644 --- a/src/views/newMap/displayNew/menuScript.vue +++ b/src/views/newMap/displayNew/menuScript.vue @@ -7,18 +7,18 @@ 重置剧本 --> - {{ $t('scriptRecord.drivingByPlan') }} + {{ $t('scriptRecord.scriptBack') }} - +