From 118a8d07d4f1b7776acfd2a217e476776827e9c3 Mon Sep 17 00:00:00 2001 From: yuan Date: Mon, 28 Jun 2021 10:21:16 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Train/EMouse.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/shape/graph/Train/EMouse.js b/src/jmapNew/shape/graph/Train/EMouse.js index 107efdd85..9fb4ea8a0 100644 --- a/src/jmapNew/shape/graph/Train/EMouse.js +++ b/src/jmapNew/shape/graph/Train/EMouse.js @@ -65,7 +65,7 @@ class EMouse extends Group { text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`; } else { if (this.device.style.Train.moreTrainDetail) { - text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}${this.parseDt(this.device.model.dt)}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`; + text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}${this.parseDt(this.device.model.dt)}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折返策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`; } else { text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`; } @@ -139,6 +139,7 @@ class EMouse extends Group { } } mouseover() { + console.log(this.device.model) if (this.device.model.style.Train.common.trainTip) { this.device.deviceModel.__down = true; this.arrowText.show(); From 7514ff3270e06409050cc15b32f23f3b2a95a566 Mon Sep 17 00:00:00 2001 From: yuan Date: Mon, 28 Jun 2021 10:40:35 +0800 Subject: [PATCH 02/19] =?UTF-8?q?bugfix-xa3-048=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=97=E8=BD=A6=E8=AF=86=E5=88=AB=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/menus/dialog/trainControl.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue index a6bea6f08..100b441a2 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue @@ -29,7 +29,9 @@ {{ $t('menu.artificialTrain') }} - + + + {{ $t('menu.serviceNumber') + '：' }} - + + + + + + + Date: Mon, 28 Jun 2021 14:55:18 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=88=97=E8=BD=A6=E9=99=90=E9=80=9F?= =?UTF-8?q?=E5=8C=BA=E9=97=B4=E9=80=89=E6=8B=A95-65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/menus/dialog/trainSpeedLimit.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue b/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue index d3b149370..6f6b7615d 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue @@ -17,7 +17,7 @@
km/h - +
@@ -94,10 +94,10 @@ export default { validateLimit(rule, value, callback) { const num = Number(value); if (num) { - if ((num >= 25 && num <= 65) || num === -1) { + if ((num >= 5 && num <= 65) || num === -1) { callback(); } else { - callback(new Error('限速值应该在25-65之间')); + callback(new Error('限速值应该在5-65之间')); } } else { callback(new Error('请输入数值类型')); From e0f672cb7da929fe34568ac7f6ba09fca2102adf Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 28 Jun 2021 15:28:33 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=89=E5=88=97?= =?UTF-8?q?=E8=BD=A6=E6=95=85=E9=9A=9C=E5=A4=84=E7=90=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=9E=E6=8C=82=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/setTrainOperation.vue | 8 ++++---- src/jmapNew/theme/xian_01/menus/menuTrain.vue | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue index fa7958a9f..e46314d37 100644 --- a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue +++ b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue @@ -93,7 +93,7 @@ export default { }, groupNumber: '', field: '', - selected: null, + selected: null, rules: { groupNumber2: [ { required: true, message: '请选择被动车', trigger: 'change'} @@ -146,8 +146,8 @@ export default { this.field = field == this.field ? '' : field; }, doShow(operate, selected) { - this.$root.$emit('dialogOpen', selected); - this.selected = selected; + this.$root.$emit('dialogOpen', selected); + this.selected = selected; if (!this.dialogShow) { this.operation = operate.operation; this.cmdType = operate.cmdType; @@ -164,7 +164,7 @@ export default { this.loading = false; this.dialogShow = false; this.$refs.form.resetFields(); - this.$root.$emit('dialogClose', this.selected); + this.$root.$emit('dialogClose', this.selected); this.$store.dispatch('training/emitTipFresh'); }, commit() { diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index 0abd101e0..787cd9e0a 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -10,6 +10,7 @@ + @@ -29,6 +30,7 @@ import TrainMove from './dialog/trainMove'; import TrainSwitch from './dialog/trainSwitch'; import TrainEditNumber from './dialog/trainEditNumber'; import TrainDetail from './dialog/trainDetail'; +import SetTrainOperation from '@/jmapNew/theme/components/menus/dialog/setTrainOperation'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'; import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate'; @@ -45,7 +47,8 @@ export default { TrainEditNumber, TrainDetail, SetFault, - SpeedLimit + SpeedLimit, + SetTrainOperation // SelectStation }, props: { @@ -175,6 +178,10 @@ export default { { label: '驾驶至', handler: this.handleDriveTo + }, + { + label: '连挂', + handler: this.setLink } ] } @@ -440,6 +447,14 @@ export default { } }); }, + // 设置连挂 + setLink() { + commitOperate(menuOperate.Common.setLink, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setTrainOperation.doShow(menuOperate.Common.setLink, this.selected, true); + } + }); + }, // 换端 handleTurnDirection() { const group = this.$route.query.group; From 95882eeeef71e7813f44b70078eae63d4a8124a5 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 29 Jun 2021 09:43:20 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB?= =?UTF-8?q?=E9=99=86=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 2 +- .../displayNew/dispatherContest/contectUs.vue | 34 +++++++++++++++---- src/views/thirdLogin/index.vue | 2 +- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 1ff59aad5..2b5a90323 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -115,7 +115,7 @@ export default { } }, mounted() { - this.thirdLogin = getSessionStorage('thirdLogin'); + this.thirdLogin = getSessionStorage('project') == 'richor'; this.routes = this.$router.options.routes; if (this.$route.fullPath.indexOf('design/usermap') >= 0) { this.activePath = '/design/usermap/home'; diff --git a/src/views/newMap/displayNew/dispatherContest/contectUs.vue b/src/views/newMap/displayNew/dispatherContest/contectUs.vue index 087ed7e69..b5755610c 100644 --- a/src/views/newMap/displayNew/dispatherContest/contectUs.vue +++ b/src/views/newMap/displayNew/dispatherContest/contectUs.vue @@ -5,14 +5,28 @@ width="400px" :before-close="handleClose" > -
联系人：小九
-
手    机：13289398171
-
邮    箱：ServiceEmail@joylink.club
-
- - 微    信： - +
+
联系人：欧阳炜椿
+
电    话：4000500081
+
邮    箱：zhrc@richortech.com
+
网    址：www.richortech.com
+
+
+
联系人：小九
+
手    机：13289398171
+
邮    箱：ServiceEmail@joylink.club
+
+ + 微    信： + +
+
+ 确 定 @@ -20,6 +34,7 @@