From 55d4ff6e696cfaec20027f4646754a1fd39e453b Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 4 Aug 2022 17:26:38 +0800 Subject: [PATCH 01/81] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E6=96=B0=E5=BB=BA=20bu?= =?UTF-8?q?g=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/mapDraftPicture/createPicture.vue | 6 ++-- src/views/newMap/registerBook/index.vue | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue index c56ba31df..18855223a 100644 --- a/src/views/newMap/mapDraftPicture/createPicture.vue +++ b/src/views/newMap/mapDraftPicture/createPicture.vue @@ -47,7 +47,7 @@ export default { return { centerDialogVisible: false, skinCodeList: [], - ruleForm: { name: '', type: '', stationCode: '', lineCode: '', deviceMap: {} }, + ruleForm: { name: '', type: '', stationCode: '', lineCode: '' }, rules: { name: [{ required: true, message: '请输入画面名称', trigger: 'blur' }], type: [{ required: true, message: '请选择画面类型', trigger: 'change' }], @@ -78,9 +78,9 @@ export default { if (valid) { const map = this.$store.state.map.map; if (map && map.pictureList && map.pictureList.length) { - map.pictureList.push({...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}); + map.pictureList.push({...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}); } else { - map.pictureList = [{...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}]; + map.pictureList = [{...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}]; } if (map && parseInt(this.$route.params.mapId)) { saveMap(Object.assign(map, { mapId: this.$route.params.mapId })).then(() => { diff --git a/src/views/newMap/registerBook/index.vue b/src/views/newMap/registerBook/index.vue index a39587237..30d164b70 100644 --- a/src/views/newMap/registerBook/index.vue +++ b/src/views/newMap/registerBook/index.vue @@ -423,6 +423,35 @@ + +
计数器
+
+ +
名称
+
S总人工解锁
+
S引导
+
S总锁闭
+
X总人工解锁
+
X引导
+
X总锁闭
+
S故障
+
S接车引导
+
南场
+ + +
号码
+
+
+
+
+
+
+
+
+
+ +
+ --> From 97966d1beceb902dc0fb30f93e75fdb424c89dc4 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 09:58:29 +0800 Subject: [PATCH 02/81] =?UTF-8?q?=E7=B0=BF=E5=86=8C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/cmdPlugin/CommandHandler.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js index 768043571..8fc597397 100644 --- a/src/scripts/cmdPlugin/CommandHandler.js +++ b/src/scripts/cmdPlugin/CommandHandler.js @@ -77,6 +77,14 @@ class CommandHandle { Driver_Stop: { operate: 'Driver_Stop', paramList: [{name: 'groupNumber'}, {name: 'eb'}] + }, + RAIL_QUERY_REGISTER: { + operate: 'RAIL_QUERY_REGISTER', + paramList: [{name: 'stationCode'}] + }, + RAIL_FILL_IN_REGISTER: { + operate: 'RAIL_FILL_IN_REGISTER', + paramList: [{name: 'stationCode'}, {name: 'line'}] } } }; From 808ae31174b19057c0cb44203f7252d6a2818811 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 10:16:14 +0800 Subject: [PATCH 03/81] =?UTF-8?q?=E8=B5=B0=E7=94=BB=E9=9D=A2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E9=9B=86=E4=B8=AD?= =?UTF-8?q?=E7=AB=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/jointTrainingNew/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 38c2811ca..3874bd574 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -482,6 +482,7 @@ export default { this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$jlmap.updatePicture(deviceList); this.$jlmap.updateTransform(picture.scaling, picture.origin); + this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[deviceCode]); } else { this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); this.mapViewLoadedOver && this.switchStationMode(deviceCode); From 91175f2d57105ef541ef4b6042f385c6b099f609 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 10:25:16 +0800 Subject: [PATCH 04/81] =?UTF-8?q?=E9=89=B4=E6=9D=83=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B5=B0=E6=AD=A3=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/pushMessage.js | 1 + src/utils/baseUrl.js | 3 ++- src/utils/request.js | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/api/pushMessage.js b/src/api/pushMessage.js index 0a13502d1..3621017d7 100644 --- a/src/api/pushMessage.js +++ b/src/api/pushMessage.js @@ -28,6 +28,7 @@ export function postLicenseValidate(data) { return request({ url: `/api/license/validate`, method: 'post', + production: true, // baseURL: 'https://joylink.club/jlcloud', data }); diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index b27593aec..13618efbc 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -66,5 +66,6 @@ export function handlerUrl(data) { UPLOAD_API = 'http://joylink.club/jlfile'; BASE_SITE = 'https://joylink.club/cbtc'; } - return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE}; + const PROD_API = 'https://joylink.club/jlcloud'; + return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE, PROD_API}; } diff --git a/src/utils/request.js b/src/utils/request.js index 5049fbb20..f31c561f9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -32,7 +32,9 @@ service.interceptors.request.use(config => { if (config.upload) { config.baseURL = urlData.UPLOAD_API; } - + if (config.production) { + config.baseURL = urlData.PROD_API; + } if (config.time) { config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改 } From ffc8275e546fc0656740be3a442948a1f5bf383e Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 5 Aug 2022 10:56:57 +0800 Subject: [PATCH 05/81] =?UTF-8?q?=E7=AB=99=E9=97=B4=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E9=97=AE=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/jmapNew/shape/graph/Station/index.js | 2 +- src/jmapNew/theme/datie_02/menus/index.vue | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 06a4f250e..daca331af 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -167,7 +167,7 @@ export default class Station extends Group { const queryCtc = queryList.find(item => { return item.includes('ctc'); }); - if (queryCtc) { + if (queryCtc && model.createControlMode) { this.createCtcControlMode(); } else if (this.style.Station.StationControl.special) { if (model.visible && model.createControlMode) { // model.createControlMode 控制模式 diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index 550d390de..3b639ef04 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -354,9 +354,23 @@ export default { for (const key in mapDevice) { list.push(mapDevice[key]); } - this.$jlmap.updateShowStation(list, this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); - this.$jlmap.setCenter(this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); - this.$jlmap.updateTransform(map.scaling, map.origin); + if (this.$store.state.map.map && this.$store.state.map.map.pictureList) { + const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === this.showCentralizedStationCode && picture.type === 'chainStation'); + if (picture) { + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + const deviceList = []; + const mapDevice = this.$store.state.map.mapDevice; + for (const deviceCode in mapDevice) { + deviceList.push(deviceCode); + } + this.$jlmap.updatePicture(deviceList); + this.$jlmap.updateTransform(picture.scaling, picture.origin); + } + } else { + this.$jlmap.updateShowStation(list, this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); + this.$jlmap.setCenter(this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode); + this.$jlmap.updateTransform(map.scaling, map.origin); + } }, getRailwaySimulationRunplanSend() { const stationCode = this.$store.state.training.roleDeviceCode; From ac77a2fd36ff2f6376f68977860eaafb0928712a Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 8 Aug 2022 11:12:11 +0800 Subject: [PATCH 06/81] =?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 --- .../component/covertOperation.js | 103 +++++++++++++++++- 1 file changed, 97 insertions(+), 6 deletions(-) diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js index 3b86ad6b6..d03ab4baf 100644 --- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js +++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js @@ -562,12 +562,102 @@ export const operateEnum = { function:getStationNameById } ] + }, + CTC_MODIFY_SECTION:{ + isList:true, + name:'修改股道', + params:[ + { + code:'stationCode', + name:'车站为', + function:getStationNameById + } + ] + // planParamList:[], + // force:1 + }, + CTC_CANCEL_TWINKLE:{ + isList:true, + name:'车站取消红闪', + params:[ + { + code:'stationCode', + name:'车站为', + function:getStationNameById + }, + { + code:'runPlanCode', + name:'车次号', + function:getTripNumberByCode + // 运行计划编码 + } + ] + }, + CTC_LOG_SET_START_RUN_PLAN:{ + isList:true, + name:'设置始发', + params:[ + { + code:'stationCode', + name:'车站为', + function:getStationNameById + }, + { + code:'runPlanCode', + name:'车次号', + function:getTripNumberByCode + // 运行计划编码 + } + ] + // status startRunPlan + }, + CTC_LOG_SET_END_RUN_PLAN:{ + isList:true, + name:'设置终到', + params:[ + { + code:'stationCode', + name:'车站为', + function:getStationNameById + }, + { + code:'runPlanCode', + name:'车次号', + function:getTripNumberByCode + // 运行计划编码 + } + ] + // status startRunPlan + }, + CTC_LOG_SET_DELETE_LABEL:{ + isList:true, + name:'设置删除标识', + params:[ + { + code:'stationCode', + name:'车站为', + function:getStationNameById + }, + { + code:'runPlanCode', + name:'车次号', + function:getTripNumberByCode + // 运行计划编码 + } + ] + // status:1 } - // CTC_MODIFY_SECTION - // 修改股道 - // CTC_CANCEL_TWINKLE - // 车站取消红闪 - // CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'}, + + // CTC_MODIFY_TRIP_NUMBER + // 修改车次号(大铁CTC) + // CTC_LOG_CANCEL_ARRIVE:{value: 'CTC_LOG_CANCEL_ARRIVE', label: '取消到达'}, + // CTC_LOG_CANCEL_DEPARTURE:{value: 'CTC_LOG_CANCEL_DEPARTURE', label: '取消出发'}, + // CTC_LOG_CANCEL_BLOCK:{value: 'CTC_LOG_CANCEL_BLOCK', label: '取消闭塞'}, + // CTC_LOG_SET_KEY_TRAINS:{value: 'CTC_LOG_SET_KEY_TRAINS', label: '设置重点列车'}, + // CTC_LOG_SET_ENTRY_OUT_DISCORDANT:{value: 'CTC_LOG_SET_ENTRY_OUT_DISCORDANT', label: '设置允许出入口与基本路径不一致'}, + // CTC_LOG_SET_TRACK_DISCORDANT:{value: 'CTC_LOG_SET_TRACK_DISCORDANT', label: '设置允许股道与基本路径不一致'}, + // CTC_LOG_SET_TRANSFINITE:{value: 'CTC_LOG_SET_TRANSFINITE', label: '设置超限'}, + // CTC_LOG_SAVE_RUN_PLAN:{value: 'CTC_LOG_SAVE_RUN_PLAN', label: '保存运行计划'}, }, RAIL:{ function: getRAILDevicename, @@ -905,7 +995,8 @@ function getCTCDevicename(operationType) { 'CTC_STATION_SIGN_RUN_PLAN', 'CTC_STATION_SEND_OUT_RUN_PLAN', 'CTC_CANCEL_TWINKLE', 'CTC_MODIFY_TRIP_NUMBER', 'CTC_AGREE_NOTICE', - 'CTC_MODIFY_ADJACENT_STATION']; + 'CTC_MODIFY_ADJACENT_STATION', 'CTC_MODIFY_SECTION', 'CTC_CANCEL_TWINKLE', 'CTC_LOG_SET_START_RUN_PLAN', + 'CTC_LOG_SET_END_RUN_PLAN', 'CTC_LOG_SET_DELETE_LABEL']; if (operationType.includes('CTC_ZONE')) { deviceName = '请点击运行图'; } else if (stationRPLogList.includes(operationType)) { From 77dab6087e9da93b80711a5e9f6fb55476d22910 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 9 Aug 2022 09:59:42 +0800 Subject: [PATCH 07/81] =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=87=BA=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/index.vue | 6 ++ .../theme/datie_02/menus/runplanPane.vue | 50 ++++++++++++++++- src/jmapNew/theme/datie_jd1a/menus/index.vue | 2 +- .../theme/datie_jd1a/menus/runplanPane.vue | 55 +++++++++++++++++-- 4 files changed, 106 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index 3b639ef04..9ce47eadd 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -272,6 +272,12 @@ export default { this.$store.dispatch('map/setPictureDeviceMap', {}); }, methods: { + changeSignedStatus(info) { + this.$refs.cmdManage.changeSignedStatus(info); + }, + signedCmdClose() { + this.$refs.cmdManage.doShow(); + }, getRunplanInStationData() { getRunplanInStation(this.group).then(response => { // debugger; diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index d232c0855..9a10124fd 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -45,7 +45,7 @@
-
调度命令
+
调度命令
阶段计划(F8)
发送计划
@@ -563,6 +563,8 @@ + +
+ diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/addSpareTrain.vue new file mode 100644 index 000000000..f2964cbb2 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/addSpareTrain.vue @@ -0,0 +1,210 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControl.vue new file mode 100644 index 000000000..d298f8bc1 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControl.vue @@ -0,0 +1,141 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControlSpeed.vue new file mode 100644 index 000000000..d49556383 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControlSpeed.vue @@ -0,0 +1,156 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTip.vue new file mode 100644 index 000000000..6852074ca --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTip.vue @@ -0,0 +1,74 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTrain.vue new file mode 100644 index 000000000..494347b75 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTrain.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/passwordInputBox.vue new file mode 100644 index 000000000..eec77511b --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/passwordInputBox.vue @@ -0,0 +1,193 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/popupAlarm.vue new file mode 100644 index 000000000..b6b925622 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/popupAlarm.vue @@ -0,0 +1,94 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue new file mode 100644 index 000000000..2d2491d3f --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue @@ -0,0 +1,137 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/deleteRunplan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/deleteRunplan.vue new file mode 100644 index 000000000..0b9134b52 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/deleteRunplan.vue @@ -0,0 +1,99 @@ + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/drawSelect.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/drawSelect.vue new file mode 100644 index 000000000..10fb5b5cd --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/drawSelect.vue @@ -0,0 +1,163 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/mapVisual.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/mapVisual.vue new file mode 100644 index 000000000..6f0e8d119 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/mapVisual.vue @@ -0,0 +1,244 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyAdjacentStation.vue new file mode 100644 index 000000000..53bf85a71 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyAdjacentStation.vue @@ -0,0 +1,154 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/modifyTripNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyTripNumber.vue new file mode 100644 index 000000000..dd92fc91d --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyTripNumber.vue @@ -0,0 +1,224 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/recDep.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/recDep.vue new file mode 100644 index 000000000..65de25b3d --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/recDep.vue @@ -0,0 +1,132 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeDetail.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeDetail.vue new file mode 100644 index 000000000..b7211c025 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeDetail.vue @@ -0,0 +1,196 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeGuide.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeGuide.vue new file mode 100644 index 000000000..11cba9131 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeGuide.vue @@ -0,0 +1,278 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue new file mode 100644 index 000000000..69ce0d572 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue @@ -0,0 +1,267 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection.vue new file mode 100644 index 000000000..12014afb3 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection.vue @@ -0,0 +1,325 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection1.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection1.vue new file mode 100644 index 000000000..c34eb1e49 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection1.vue @@ -0,0 +1,308 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/sectionDetail.vue new file mode 100644 index 000000000..7e6a03371 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/sectionDetail.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/sendRunplan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/sendRunplan.vue new file mode 100644 index 000000000..26e4fb5dd --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/sendRunplan.vue @@ -0,0 +1,265 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/shuntRoute.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/shuntRoute.vue new file mode 100644 index 000000000..78727e7cc --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/shuntRoute.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/stageRunplan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/stageRunplan.vue new file mode 100644 index 000000000..6a55e1b49 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/stageRunplan.vue @@ -0,0 +1,191 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/standControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/standControl.vue new file mode 100644 index 000000000..e8c96940f --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/standControl.vue @@ -0,0 +1,603 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/standDetail.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/standDetail.vue new file mode 100644 index 000000000..efe048e52 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/standDetail.vue @@ -0,0 +1,217 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainControl.vue new file mode 100644 index 000000000..738d9509e --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainControl.vue @@ -0,0 +1,332 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreate.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreate.vue new file mode 100644 index 000000000..59f7935b6 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreate.vue @@ -0,0 +1,133 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreateNumber.vue new file mode 100644 index 000000000..e56f2f80d --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreateNumber.vue @@ -0,0 +1,181 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDelete.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDelete.vue new file mode 100644 index 000000000..99797f879 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDelete.vue @@ -0,0 +1,150 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDeleteNumber.vue new file mode 100644 index 000000000..210e2dc87 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDeleteNumber.vue @@ -0,0 +1,176 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDetailInfo.vue new file mode 100644 index 000000000..907727139 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDetailInfo.vue @@ -0,0 +1,378 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainEditNumber.vue new file mode 100644 index 000000000..570e22144 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainEditNumber.vue @@ -0,0 +1,174 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainMove.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMove.vue new file mode 100644 index 000000000..82c84dc13 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMove.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMoveNumber.vue new file mode 100644 index 000000000..7e7635d23 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMoveNumber.vue @@ -0,0 +1,193 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainRoute.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainRoute.vue new file mode 100644 index 000000000..98e3e4b46 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainRoute.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSetPlan.vue new file mode 100644 index 000000000..30383b617 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSetPlan.vue @@ -0,0 +1,181 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSwitch.vue new file mode 100644 index 000000000..b0d3731d4 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSwitch.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/updateTrip.vue new file mode 100644 index 000000000..49a60e088 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/updateTrip.vue @@ -0,0 +1,155 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/index.vue b/src/jmapNew/theme/datie_ksk/menus/index.vue new file mode 100644 index 000000000..645d03ed7 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/index.vue @@ -0,0 +1,878 @@ + + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuBar.vue b/src/jmapNew/theme/datie_ksk/menus/menuBar.vue new file mode 100644 index 000000000..d16b8bc18 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuBar.vue @@ -0,0 +1,335 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue new file mode 100644 index 000000000..79e8d1daa --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue @@ -0,0 +1,1119 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue new file mode 100644 index 000000000..da166116e --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue @@ -0,0 +1,827 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/twoConfirmation.vue new file mode 100644 index 000000000..c1f7b93a3 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/twoConfirmation.vue @@ -0,0 +1,133 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userAdd.vue new file mode 100644 index 000000000..b0ebdb408 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userAdd.vue @@ -0,0 +1,167 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userDelete.vue new file mode 100644 index 000000000..6bda8340d --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userDelete.vue @@ -0,0 +1,139 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userEdit.vue new file mode 100644 index 000000000..35b11bbfa --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userEdit.vue @@ -0,0 +1,184 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue new file mode 100644 index 000000000..5bee2a166 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue @@ -0,0 +1,136 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/limitSpeed.vue new file mode 100644 index 000000000..e45a673c3 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/limitSpeed.vue @@ -0,0 +1,138 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/manageUser.vue new file mode 100644 index 000000000..56c92607c --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/manageUser.vue @@ -0,0 +1,303 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/passwordBox.vue new file mode 100644 index 000000000..69fa03d70 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/passwordBox.vue @@ -0,0 +1,221 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/routeCancel.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/routeCancel.vue new file mode 100644 index 000000000..ef57c9cd2 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/routeCancel.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/setLimitSpeed.vue new file mode 100644 index 000000000..32dd83a21 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/setLimitSpeed.vue @@ -0,0 +1,286 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/stationControlConvert.vue new file mode 100644 index 000000000..046b66327 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/stationControlConvert.vue @@ -0,0 +1,433 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainAdd.vue new file mode 100644 index 000000000..fba049a10 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainAdd.vue @@ -0,0 +1,168 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainDelete.vue new file mode 100644 index 000000000..a27d71f29 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainDelete.vue @@ -0,0 +1,151 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainTranstalet.vue new file mode 100644 index 000000000..97918ae44 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainTranstalet.vue @@ -0,0 +1,158 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/viewName.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/viewName.vue new file mode 100644 index 000000000..4a32473d5 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/viewName.vue @@ -0,0 +1,256 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuPanel.vue b/src/jmapNew/theme/datie_ksk/menus/menuPanel.vue new file mode 100644 index 000000000..bf2c9df6b --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuPanel.vue @@ -0,0 +1,302 @@ + + + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue new file mode 100644 index 000000000..d5d3702f8 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue @@ -0,0 +1,260 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue new file mode 100644 index 000000000..e5d21978f --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue @@ -0,0 +1,390 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStation.vue b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue new file mode 100644 index 000000000..0dec74176 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue @@ -0,0 +1,213 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue new file mode 100644 index 000000000..8dafb5bef --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue @@ -0,0 +1,220 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue b/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue new file mode 100644 index 000000000..f09e16af6 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue @@ -0,0 +1,344 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTool.vue b/src/jmapNew/theme/datie_ksk/menus/menuTool.vue new file mode 100644 index 000000000..95bc382b2 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuTool.vue @@ -0,0 +1,211 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue new file mode 100644 index 000000000..52665c145 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue @@ -0,0 +1,569 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue new file mode 100644 index 000000000..afbff9ddc --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue @@ -0,0 +1,216 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/timeout.vue new file mode 100644 index 000000000..e4ef062a6 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/timeout.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/jmapNew/theme/datie_ksk/menus/runplanPane.vue b/src/jmapNew/theme/datie_ksk/menus/runplanPane.vue new file mode 100644 index 000000000..036da1041 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/menus/runplanPane.vue @@ -0,0 +1,1125 @@ + + + + diff --git a/src/jmapNew/theme/datie_ksk/model.js b/src/jmapNew/theme/datie_ksk/model.js new file mode 100644 index 000000000..9c09fd633 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/model.js @@ -0,0 +1,82 @@ +import deviceType from '../../constant/deviceType'; + +class Model { + constructor() { + this.screenLine = 3; + // 公共字段部分默认初始值 + this['public'] = {}; + this['public'][deviceType.Signal] = { + lampPositionType: '02', + lampPostType: '02' + }; + + // 私有字段部分默认初始值 + this['private'] = {}; + this['private'][deviceType.StationControl] = { + indicatorShow: true // 标识灯名称显示 + }; + this['private'][deviceType.Station] = { + kmPostShow: true // 公里标显示 + }; + this['private'][deviceType.Switch] = { + nameShow: true + }; + this['private'][deviceType.Section] = { + nameShow: true, + borderBorderShow: true, // 区段边界显示 + destinationNameShow: true, // 目的地码名称显示 + standTrackNameShow: true, // 站台轨名称显示 + reentryTrackNameShow: true, // 折返轨名称显示 + transferTrackNameShow: true // 转换轨名称显示 + }; + this['private'][deviceType.Signal] = { + nameShow: true, // 信号机名称显示 + linkageAutoRouteShow: true, // 联锁自动进路表示灯显示 + atsAutoTriggerShow: true // ATS自动触发表示灯显示 + }; + this['private'][deviceType.Train] = { + }; + this['private'][deviceType.TrainWindow] = { + trainWindowShow: true + }; + } + + initPublicProps(model) { + if (model) { + const modelInitial = this.public[model._type]; + if (modelInitial) { + for (const prop in modelInitial) { + model[prop] = modelInitial[prop]; + } + } + } + + return model; + } + + initPrivateProps(model) { + if (model) { + const modelInitial = this.private[model._type]; + if (modelInitial) { + for (const prop in modelInitial) { + model[prop] = modelInitial[prop]; + } + } + } + + return model; + } + + deletePrivateProps(model) { + if (model) { + const modelInitial = this.private[model._type]; + if (modelInitial) { + for (const prop in modelInitial) { + delete model[prop]; + } + } + } + } +} + +export default new Model(); diff --git a/src/jmapNew/theme/datie_ksk/operationConfig.js b/src/jmapNew/theme/datie_ksk/operationConfig.js new file mode 100644 index 000000000..dc4d3a910 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/operationConfig.js @@ -0,0 +1,5 @@ +// import CMD from '@/scripts/cmdPlugin/CommandEnum'; +export default { + list: [ + ] +}; diff --git a/src/jmapNew/theme/datie_ksk/planConfig.js b/src/jmapNew/theme/datie_ksk/planConfig.js new file mode 100644 index 000000000..e0e5a1967 --- /dev/null +++ b/src/jmapNew/theme/datie_ksk/planConfig.js @@ -0,0 +1,74 @@ +import { convertSheetToList } from '../parser/util'; + +export default { + /** 运行图解析方式*/ + type: 'Ratio', + + /** 边缘高度*/ + edge: 600, + + /** 间隔高度*/ + multiple: 1, + + /** 偏移时间*/ + translation: 60 * 60 * 2, + + /** excel解析配置*/ + excelConfig: { + beginRow: 1, + beginCol: 0, + fieldNum: 8, + sepField: '车次', + columns: { + '车站名称': { key: 'stationName', formatter: (val) => { return val; } }, + '到点': { key: 'arriveTime', formatter: (val) => { return val; } }, + '发点': { key: 'departureTime', formatter: (val) => { return val; } } + } + }, + + /** 解析excel数据转换为Json后台数据*/ + importData(Sheet, JsonData) { + var dataList = convertSheetToList(Sheet, false); + var needList = Object.keys(this.excelConfig.columns); + if (dataList && dataList.length) { + for (var rowIndex = this.excelConfig.beginRow; rowIndex < dataList.length; rowIndex += 1) { + for (var colIndex = this.excelConfig.beginCol; colIndex < dataList[this.excelConfig.beginCol].length; colIndex += this.excelConfig.fieldNum + 1) { + var tripNew, tripObj; + var stationObj = {}; + + tripNew = tripObj = { code: '', arrivalList: [] }; + for (var index = 0; index < this.excelConfig.fieldNum; index += 1) { + var title = dataList[0][colIndex + index]; + var value = dataList[rowIndex][colIndex + index]; + + if (title && value) { + var titleStr = `${title}`.trim(); + var valueStr = `${value}`.trim(); + + if (titleStr.includes(this.excelConfig.sepField)) { + tripObj.code = valueStr; + JsonData.forEach(elem => { + if (elem.code == valueStr) { + tripObj = elem; + return; + } + }); + } + + // 取需要的字段 + if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) { + stationObj[this.excelConfig.columns[titleStr].key] = this.excelConfig.columns[titleStr].formatter(valueStr); + } + } + } + + tripObj.arrivalList.push(stationObj); + if (tripObj.code && tripObj == tripNew) { + JsonData.push(tripObj); + } + } + } + } + return JsonData; + } +}; diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js index 0e95d2520..6d2d41951 100644 --- a/src/jmapNew/theme/factory.js +++ b/src/jmapNew/theme/factory.js @@ -53,7 +53,8 @@ class Theme { '15': 'datie_01', '16': 'datie_02', '17': 'datie_tky', - '18': 'datie_jd1a' + '18': 'datie_jd1a', + '19': 'datie_ksk' }; this._runplan = { @@ -75,7 +76,8 @@ class Theme { '15': 'datie_01', '16': 'datie_02', '17': 'datie_tky', - '18': 'datie_jd1a' + '18': 'datie_jd1a', + '19': 'datie_ksk' }; this._localShowMode = { // 现地显示模式 @@ -96,7 +98,8 @@ class Theme { '15':'all', '16':'ecStation', '17': 'all', - '18': 'all' + '18': 'all', + '19': 'all' }; } From ac33c683a5454f85c643984be6eb9225819eb8cc Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 10 Aug 2022 11:22:24 +0800 Subject: [PATCH 13/81] =?UTF-8?q?=E6=8C=87=E4=BB=A4=3D=E3=80=8B=20?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/menuTrain.vue | 38 +++++++------- .../theme/chengdu_01/menus/menuTrain.vue | 38 +++++++------- .../theme/chengdu_03/menus/menuTrain.vue | 38 +++++++------- .../theme/datie_01/menus/menuTrain.vue | 24 ++++----- .../theme/datie_02/menus/menuTrain.vue | 52 +++++++++---------- .../theme/datie_jd1a/menus/menuTrain.vue | 50 +++++++++--------- .../theme/datie_ksk/menus/menuTrain.vue | 50 +++++++++--------- .../theme/datie_tky/menus/menuTrain.vue | 50 +++++++++--------- .../theme/foshan_01/menus/menuTrain.vue | 38 +++++++------- .../theme/fuzhou_01/menus/menuTrain.vue | 40 +++++++------- .../theme/haerbin_01/menus/menuTrain.vue | 38 +++++++------- .../theme/nanjing_02/menus/menuTrain.vue | 38 +++++++------- .../theme/ningbo_01/menus/menuTrain.vue | 38 +++++++------- .../theme/ningbo_03/menus/menuTrain.vue | 38 +++++++------- src/jmapNew/theme/race_01/menus/menuTrain.vue | 36 ++++++------- src/jmapNew/theme/xian_01/menus/menuTrain.vue | 38 +++++++------- src/jmapNew/theme/xian_02/menus/menuTrain.vue | 36 ++++++------- src/scripts/cmdPlugin/CommandEnum.js | 12 ++--- src/scripts/cmdPlugin/CommandHandler.js | 28 ++++++++++ src/utils/baseUrl.js | 2 +- 20 files changed, 375 insertions(+), 347 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue index be166545f..38a2b8f02 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue @@ -234,14 +234,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -381,21 +381,21 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -403,7 +403,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -414,7 +414,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -430,42 +430,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index 39bb9e774..ef16ae564 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -147,14 +147,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -291,21 +291,21 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -313,7 +313,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -332,7 +332,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -340,42 +340,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitTrainSend(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitTrainSend(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue index 1bce032f7..31e41df1b 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue @@ -130,14 +130,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -262,21 +262,21 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -284,7 +284,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -303,7 +303,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -311,42 +311,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/datie_01/menus/menuTrain.vue b/src/jmapNew/theme/datie_01/menus/menuTrain.vue index f404958a0..9244e9f08 100644 --- a/src/jmapNew/theme/datie_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_01/menus/menuTrain.vue @@ -130,15 +130,15 @@ export default { { label: '进路闭塞法行车', handler: this.routeBlockRun - }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight } + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // } ], menuSpeed: [ { @@ -218,28 +218,28 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, routeBlockRun() { - commitOperate(menuOperate.Driver.routeBlockDrive, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.routeBlockDrive, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue index bddbb9ead..c31b4c55b 100644 --- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue @@ -193,14 +193,14 @@ export default { label: '进路闭塞法行车', handler: this.routeBlockRun }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, // { // label: '限速指令', // handler: this.handleSpeedLimit @@ -213,10 +213,10 @@ export default { label: '换端', handler: this.turnDirection }, - { - label: '发车', - handler: this.handleDepartTrain - }, + // { + // label: '发车', + // handler: this.handleDepartTrain + // }, { label: '停车', handler: this.handleParkingTrain @@ -316,9 +316,9 @@ export default { }, trainSend(type) { const param = { - params: { groupNumber: this.selected.code } + groupNumber: this.selected.code }; - commitOperate(type, param, 0).then(({valid, operate})=>{ + commitOperate(type, param, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -490,35 +490,35 @@ export default { }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -543,13 +543,13 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleDepartTrain() { - commitOperate( menuOperate.Driver.departTrain, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { - }).catch((error)=> { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, + // handleDepartTrain() { + // commitOperate( menuOperate.Driver.departTrain, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { + // }).catch((error)=> { + // console.error(error); + // this.$refs.noticeInfo.doShow(); + // }); + // }, handleParkingTrain() { commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{ if (valid) { diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue index 52665c145..119d1f328 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue @@ -190,14 +190,14 @@ export default { label: '进路闭塞法行车', handler: this.routeBlockRun }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, // { // label: '驾驶', // handler: this.handleDriveTo @@ -206,10 +206,10 @@ export default { label: '换端', handler: this.turnDirection }, - { - label: '发车', - handler: this.handleDepartTrain - }, + // { + // label: '发车', + // handler: this.handleDepartTrain + // }, { label: '停车', handler: this.handleParkingTrain @@ -305,7 +305,7 @@ export default { this.trainSend(menuOperate.Driver.driveThroughTheRedLight); }, trainSend(type) { - commitOperate(type, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(type, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -474,35 +474,35 @@ export default { }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -527,13 +527,13 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleDepartTrain() { - commitOperate(menuOperate.Driver.departTrain, { groupNumber: this.selected.groupNumber }, 0).then(({valid, operate}) => { - }).catch((error)=> { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, + // handleDepartTrain() { + // commitOperate(menuOperate.Driver.departTrain, { groupNumber: this.selected.groupNumber }, 3).then(({valid, operate}) => { + // }).catch((error)=> { + // console.error(error); + // this.$refs.noticeInfo.doShow(); + // }); + // }, handleParkingTrain() { commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{ if (valid) { diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue index 52665c145..119d1f328 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue @@ -190,14 +190,14 @@ export default { label: '进路闭塞法行车', handler: this.routeBlockRun }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, // { // label: '驾驶', // handler: this.handleDriveTo @@ -206,10 +206,10 @@ export default { label: '换端', handler: this.turnDirection }, - { - label: '发车', - handler: this.handleDepartTrain - }, + // { + // label: '发车', + // handler: this.handleDepartTrain + // }, { label: '停车', handler: this.handleParkingTrain @@ -305,7 +305,7 @@ export default { this.trainSend(menuOperate.Driver.driveThroughTheRedLight); }, trainSend(type) { - commitOperate(type, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(type, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -474,35 +474,35 @@ export default { }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -527,13 +527,13 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleDepartTrain() { - commitOperate(menuOperate.Driver.departTrain, { groupNumber: this.selected.groupNumber }, 0).then(({valid, operate}) => { - }).catch((error)=> { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, + // handleDepartTrain() { + // commitOperate(menuOperate.Driver.departTrain, { groupNumber: this.selected.groupNumber }, 3).then(({valid, operate}) => { + // }).catch((error)=> { + // console.error(error); + // this.$refs.noticeInfo.doShow(); + // }); + // }, handleParkingTrain() { commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{ if (valid) { diff --git a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue index 298049067..358630182 100644 --- a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue @@ -193,14 +193,14 @@ export default { label: '进路闭塞法行车', handler: this.routeBlockRun }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, // { // label: '限速指令', // handler: this.handleSpeedLimit @@ -213,10 +213,10 @@ export default { label: '换端', handler: this.turnDirection }, - { - label: '发车', - handler: this.handleDepartTrain - }, + // { + // label: '发车', + // handler: this.handleDepartTrain + // }, { label: '停车', handler: this.handleParkingTrain @@ -315,7 +315,7 @@ export default { this.trainSend(menuOperate.Driver.driveThroughTheRedLight); }, trainSend(type) { - commitOperate(type, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(type, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -487,35 +487,35 @@ export default { }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -540,13 +540,13 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - handleDepartTrain() { - commitOperate(menuOperate.Driver.departTrain, { groupNumber: this.selected.groupNumber }, 0).then(({valid, operate}) => { - }).catch((error)=> { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - }, + // handleDepartTrain() { + // commitOperate(menuOperate.Driver.departTrain, { groupNumber: this.selected.groupNumber }, 3).then(({valid, operate}) => { + // }).catch((error)=> { + // console.error(error); + // this.$refs.noticeInfo.doShow(); + // }); + // }, handleParkingTrain() { commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{ if (valid) { diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue index c1cefba1f..dc41811c4 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue @@ -138,14 +138,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -278,26 +278,26 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch(() => { this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch(() => { this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch(() => { this.$refs.noticeInfo.doShow(); }); }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -316,7 +316,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -324,42 +324,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue index 23fc753b4..93d9af963 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue @@ -112,14 +112,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -270,21 +270,21 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -292,7 +292,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitTrainSend(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitTrainSend(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -311,7 +311,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -319,49 +319,49 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyNrmMode() { - commitOperate(menuOperate.Driver.applyNrm, { groupNumber: this.selected.code }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.applyNrm, { groupNumber: this.selected.code }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue index a3aa31096..d9aa8a1da 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue @@ -79,14 +79,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -240,21 +240,21 @@ export default { }); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -262,7 +262,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -281,7 +281,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -289,42 +289,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitTrainSend(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitTrainSend(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue index 63258dcf9..dda65c3c5 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue @@ -79,14 +79,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -240,20 +240,20 @@ export default { }); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch(() => { this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -261,7 +261,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -280,7 +280,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -288,42 +288,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index 78d9a275f..8ac6b9d53 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -218,14 +218,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -351,21 +351,21 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -376,7 +376,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -392,7 +392,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -400,42 +400,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue index aaa01a726..e24da823f 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue @@ -219,14 +219,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -351,21 +351,21 @@ export default { this.$store.dispatch('training/setTriggerFaultCount', this.selected); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -373,7 +373,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -392,7 +392,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -400,42 +400,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue index 0375deb78..a544dbff3 100644 --- a/src/jmapNew/theme/race_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue @@ -237,14 +237,14 @@ export default { // label: '限速指令', // handler: this.handleSpeedLimit // }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开/关门', handler: this.handleOpenCloseDoor @@ -399,21 +399,21 @@ export default { }); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -423,35 +423,35 @@ export default { this.$refs.speedLimit.doShow(this.selected); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -459,7 +459,7 @@ export default { }, // 操作列车 开/关门 handleOpenCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -475,7 +475,7 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index b22eaacf8..8777fb089 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -163,14 +163,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -389,7 +389,7 @@ export default { // }); // }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -410,14 +410,14 @@ export default { // }); // }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -425,7 +425,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -452,7 +452,7 @@ export default { }, // 回库 setInbound() { - commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.inbound, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -460,42 +460,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index d3cb3d50f..5c7e0fc43 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -241,14 +241,14 @@ export default { label: '确认运行至前方站', handler: this.nextStation }, - { - label: '越引导信号行驶', - handler: this.handleOverFuideSignal - }, - { - label: '越红灯行驶', - handler: this.handleOverEedLight - }, + // { + // label: '越引导信号行驶', + // handler: this.handleOverFuideSignal + // }, + // { + // label: '越红灯行驶', + // handler: this.handleOverEedLight + // }, { label: '开关门', handler: this.handleOpenOrCloseDoor @@ -381,21 +381,21 @@ export default { }); }, nextStation() { - commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { - commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheGuideSignal, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { - commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Driver.driveThroughTheRedLight, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -403,7 +403,7 @@ export default { }, // 开关门 handleOpenOrCloseDoor() { - commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Driver.openOrCloseDoor, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); @@ -422,42 +422,42 @@ export default { }, // 换端 handleTurnDirection() { - commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => { }).catch((error)=> { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmcMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyAmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplySmiMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_I' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); }); }, handlerApplyRmMode() { - commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 10fdaa745..e30f6b585 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -95,17 +95,17 @@ export default { CMD_DRIVER_STOP:{value: 'Driver_Stop', label: '停车'}, CMD_DRIVE_AHEAD:{value: 'Drive_Ahead', label: '确认运行至前方站'}, CMD_ROUTE_BLOCK_DRIVE: {value: 'Route_Block_Drive', label: '进路闭塞法行车'}, - CMD_DRIVE_THROUGH_THE_RED_LIGHT : {value: 'Drive_Through_The_Red_Light', label: '越红灯行驶'}, - CMD_DRIVE_THROUGH_THE_GUIDE_SIGNAL : {value: 'Drive_Through_The_Guide_Signal', label: '越引导信号行驶'}, + // CMD_DRIVE_THROUGH_THE_RED_LIGHT : {value: 'Drive_Through_The_Red_Light', label: '越红灯行驶'}, + // CMD_DRIVE_THROUGH_THE_GUIDE_SIGNAL : {value: 'Drive_Through_The_Guide_Signal', label: '越引导信号行驶'}, CMD_OPEN_OR_CLOSE_DOOR : {value: 'Open_Or_Close_Door', label: '开关门'}, - CMD_SET_SPEED_LIMIT : {value: 'Set_Speed_Limit', label: '设置限速'}, + // CMD_SET_SPEED_LIMIT : {value: 'Set_Speed_Limit', label: '设置限速'}, // CMD_TURN_DIRECTION: {value: 'Turn_Direction', label: '换端'}, CMD_DRIVE_TO : {value: 'Drive_To', label: '驾驶至'}, CMD_INBOUND: {value: 'Inbound', label: '回库'}, CMD_CHANGE_PRESELECTION_MODE: {value: 'Change_Preselection_Mode', label: '修改预选模式'}, - CMD_APPLY_NRM: {value: 'Apply_NRM', label: '转NRM模式'}, - CMD_DEPART_TRAIN: {value: 'Depart_Train', label: '发车'}, - CMD_PARKING_TRAIN : {value: 'Parking_Train', label: '停车'} + CMD_APPLY_NRM: {value: 'Apply_NRM', label: '转NRM模式'} + // CMD_DEPART_TRAIN: {value: 'Depart_Train', label: '发车'}, + // CMD_PARKING_TRAIN : {value: 'Parking_Train', label: '停车'} }, // 信号机操作 diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js index 8fc597397..e8961c27d 100644 --- a/src/scripts/cmdPlugin/CommandHandler.js +++ b/src/scripts/cmdPlugin/CommandHandler.js @@ -78,6 +78,34 @@ class CommandHandle { operate: 'Driver_Stop', paramList: [{name: 'groupNumber'}, {name: 'eb'}] }, + Depart_Train: { + operate: 'Depart_Train', + paramList: [{name: 'groupNumber'}] + }, + Drive_Ahead: { + operate: 'Drive_Ahead', + paramList: [{name: 'groupNumber'}] + }, + Route_Block_Drive: { + operate: 'Route_Block_Drive', + paramList: [{name: 'groupNumber'}] + }, + Open_Or_Close_Door: { + operate: 'Open_Or_Close_Door', + paramList: [{name: 'groupNumber'}] + }, + Change_Preselection_Mode: { + operate: 'Change_Preselection_Mode', + paramList: [{name: 'groupNumber'}, {name: 'preselectionMode'}] + }, + Apply_NRM: { + operate: 'Apply_NRM', + paramList: [{name: 'groupNumber'}] + }, + Inbound: { + operate: 'Inbound', + paramList: [{name: 'groupNumber'}] + }, RAIL_QUERY_REGISTER: { operate: 'RAIL_QUERY_REGISTER', paramList: [{name: 'stationCode'}] diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 13618efbc..d79509cf1 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -31,7 +31,7 @@ export function handlerUrl(data) { // BASE_API = 'http://192.168.3.94:9000'; // 旭强 // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 - // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 + BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 From 6ea8aca49a63f2217a532ccbc8e392f48bfdc049 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 10 Aug 2022 15:16:06 +0800 Subject: [PATCH 14/81] =?UTF-8?q?=E5=8C=BA=E6=AE=B5=E5=8D=A0=E7=94=A8?= =?UTF-8?q?=E4=B8=8E=E4=BF=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataRelation/bigroutingoperate/route.vue | 112 ++++++++++++++++-- 1 file changed, 104 insertions(+), 8 deletions(-) diff --git a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/route.vue index b366b2839..296dd3f2a 100644 --- a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/route.vue @@ -58,7 +58,7 @@ - + {{ $t('map.deny') }} --> + + + + + + + + {{ $t('map.add') }} + + + + + + + + + + + +
@@ -253,6 +291,7 @@ export default { switchCode:'', normal: true }, + leaveSectionWithAspectMap: {}, btnCodeList:[], routeAspectList:[] }, @@ -286,8 +325,30 @@ export default { ], 'routeAspectList':[ { required: true, validator:this.RAListValidate, trigger: 'blur' } + ], + 'leaveSectionWithAspectMap':[ + { required: true, validator:this.lSWAValidate, trigger: 'blur' } ] - } + }, + lSWACode:'', + lSWASignalAspect: 'R', + lSWASignalAspectList:[ + {label:'无显示', value: 'No'}, + {label:'红', value: 'R'}, + {label:'绿', value: 'G'}, + {label:'黄', value: 'Y'}, + {label:'白', value: 'W'}, + {label:'蓝', value: 'B'}, + {label:'红黄', value: 'RY'}, + {label:'红白', value: 'RW'}, + {label:'绿绿', value: 'GG'}, + {label:'绿黄', value: 'GY'}, + {label:'黄黄', value: 'YY'}, + {label:'红闪', value: 'RF'}, + {label:'黄闪', value: 'YF'}, + {label:'绿闪', value: 'GF'}, + {label:'白闪', value: 'WF'} + ] }; }, computed: { @@ -312,6 +373,16 @@ export default { }); }); return list; + }, + lSWAList() { + const list = []; + Object.keys(this.addModel.leaveSectionWithAspectMap || {}).forEach(item => { + list.push({ + sectionCode: item, + signalAspect: this.addModel.leaveSectionWithAspectMap[item] + }); + }); + return list; } }, watch: { @@ -364,6 +435,13 @@ export default { callback(); } }, + lSWAValidate(rule, value, callback) { + if (Object.keys(value) <= 0) { + callback(new Error('请添加区段占用与信号')); + } else { + callback(); + } + }, changeRadio() { this.$refs.form.clearValidate(); }, @@ -414,6 +492,9 @@ export default { if (newModel.pathSwitchPosition && !newModel.pathSwitchPosition.switchCode) { delete newModel.pathSwitchPosition; } + if (newModel.type != 'DEPARTURE') { + delete newModel.leaveSectionWithAspectMap; + } let api = editBigRoute; if (!this.isModify) { api = postBigRoute; @@ -467,6 +548,7 @@ export default { switchCode:'', normal:true }, + leaveSectionWithAspectMap: {}, btnCodeList:[], routeAspectList:[] }; @@ -485,6 +567,20 @@ export default { }, deleteSignalAspect(list, index) { list.splice(index, 1); + }, + addLSWAList() { + if (this.lSWACode && this.lSWASignalAspect) { + this.$set(this.addModel.leaveSectionWithAspectMap, this.lSWACode, this.lSWASignalAspect); + } + }, + covertSectionCode(code) { + return (this.sectionList.find(route=>{ return route.code == code; }) || {name:''}).name; + }, + covertLSWAAspect(code) { + return (this.lSWASignalAspectList.find(signalAspect=>{ return signalAspect.value == code; }) || {label:''}).label; + }, + deleteLSWAItem(key) { + this.$delete(this.addModel.leaveSectionWithAspectMap, key); } } }; @@ -494,9 +590,6 @@ export default { height: 100%; overflow:auto; padding-bottom: 60px; -} -.bigDefinition{ - } .bigDraft{ position: absolute; @@ -505,6 +598,9 @@ export default { box-shadow: 4px 5px 10px #565656; width: 100%; padding: 8px 10px; + z-index: 100; +} +.bigDraftBtn{ + float: right; } -.bigDraftBtn{float: right;} From b085829a9143bd573e6ee8f49b2ac143a7b73710 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 10 Aug 2022 17:47:33 +0800 Subject: [PATCH 15/81] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BA=BF=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20=E4=BB=A3?= =?UTF-8?q?=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/config/skinCode/datie_02.js | 45 +++++++++++-------- src/jmapNew/shape/graph/Signal/ESigLamp.js | 6 ++- src/jmapNew/shape/graph/SignalButton/index.js | 17 ++++++- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 1885efd52..25bf5ef1d 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -140,6 +140,7 @@ class SkinCode extends defaultStyle { endWidth: 2, // 尽头分隔符宽度 endColor: 'rgb(128,128,128)', // 尽头分隔符颜色 color: 'rgb(128,128,128)', // 区段边界符颜色 + invadeSpecial:true, // 特殊侵限 halfHeight: 3 // 区段分隔符高度的一半 }, @@ -167,12 +168,12 @@ class SkinCode extends defaultStyle { }; this[deviceType.Signal] = { - distance: 10, // 设备距离区段的距离 + distance: 12, // 设备距离区段的距离 colorSpecial: true, // 特殊处理灯位颜色 post: { - standardLength: 6, // 高柱长度 - standardHeight: 6, // 灯柱高度 - standardColor: '#FFFFFF', // 灯柱颜色 + standardLength: 7, // 高柱长度 + standardHeight: 7, // 灯柱高度 + standardColor: 'rgb(85,120,182)', // 灯柱颜色 standardVerticalWidth: 2, // 灯柱竖杆宽度 standardRailWidth: 2 // 灯柱横杆宽度 }, @@ -182,8 +183,8 @@ class SkinCode extends defaultStyle { isAlignCenter: false, // 信号字体对其方式 fontSize: 11, // 信号机名称字体大小 fontWeight: 'bold', // 信号机名称字体粗细 - defaultColor: '#FFFFFF', // 信号灯字体默认色 - blockColor: '#FFFFFF', // 信号灯字体锁定颜色 + defaultColor: 'rgb(192,192,192)', // 信号灯字体默认色 + blockColor: 'rgb(192,192,192)', // 信号灯字体锁定颜色 checkColor: '#00FF00' // 信号保护区段检查颜色 }, remainTimeColor: '#F00', @@ -199,19 +200,21 @@ class SkinCode extends defaultStyle { notBlock:true, // 封锁不设置颜色 bgShow: false, // 是否被选中 guidName: 'singleRY', // 成都三号线引导类型 - borderVariable: false, // 信号灯边框可变 + borderVariable: true, // 信号灯边框可变 stopWidth: 2, // 禁止线宽度 borderWidth: 2, // 信号灯边框线宽度 - borderColor: '#677DBB', // 信号灯边框线颜色 - radiusR: 6, // 信号灯半径 + borderColor: 'rgb(85,120,182)', // 信号灯边框线颜色 + darkColor:'rgb(85,120,182)', // + radiusR: 7, // 信号灯半径 grayColor: '#7F7F7F', // 信号灯灰色 redColor: '#FF0000', // 信号灯红色 greenColor: '#00FF00', // 信号灯绿色 yellowColor: '#FFFF00', // 信号灯黄色 whiteColor: '#FFFFFF', // 信号灯白色 - blueColor: '#0070C0', // 信号灯蓝色 + blueColor: 'rgb(60,66,235)', // 信号灯蓝色 faultType: 'light', // 信号机故障类型 （light闪） - special:true // 大铁类型信号机 + special:true, // 大铁类型信号机 + normalBorderShow:true }, route: { direction: true, // 自动通过方向 @@ -256,6 +259,12 @@ class SkinCode extends defaultStyle { } }; + this[deviceType.SignalButton] = { + guideColor: 'rgb(80,80,255)', + trainColor:'rgb(0,128,0)', + strokeColor:'rgb(128,128,128)' + }; + // 供电线路 this[deviceType.Power] = { noElectricStrokeColor:'#808080', // 无电颜色 @@ -514,7 +523,7 @@ class SkinCode extends defaultStyle { fontSize: 11, // 字体大小 fontColor: '#fff', // 道岔名称颜色 fontWeight: 'normal', // 字体粗细 - borderColor: '#FE0000', // 道岔边框颜色 + borderColor: '#FF0000', // 道岔边框颜色 lossColor: '#C00808', // 道岔失去颜色 locateColor: '#00FF00', // 道岔定位颜色 inversionColor: '#FFFF00', // 道岔反位颜色 @@ -548,15 +557,15 @@ class SkinCode extends defaultStyle { rectWidth: 18, // 矩形框 宽高 rectBorderColor: '#fff', // 矩形边框颜色 block: true, // 封锁显示 - blockColor: 'red', // 封锁颜色 + blockColor: '#FF0000', // 封锁颜色 followName: true // 位置跟随名称确定 }, arcBlcok: { // 圆形封锁图形 show: true, // 显示 shapeR: 10, - arcBorderColor: 'red', // 默认边框颜色 - locationColor: 'red', // 定位封锁颜色 - inversionColor: 'red' // 反位封锁颜色 + arcBorderColor: '#FF0000', // 默认边框颜色 + locationColor: '#FF0000', // 定位封锁颜色 + inversionColor: '#FF0000' // 反位封锁颜色 } }; @@ -1019,7 +1028,7 @@ class SkinCode extends defaultStyle { } }; this[deviceType.DepartArrow] = { - triangleLength: 15, + triangleLength: 12, lineWidth: 8, length: 35, distance: 15, @@ -1034,7 +1043,7 @@ class SkinCode extends defaultStyle { noBlockStatusColor:'#ffff00' }; this[deviceType.PickArrow] = { - triangleLength: 15, + triangleLength: 12, lineWidth: 8, length: 35, distance: 15, diff --git a/src/jmapNew/shape/graph/Signal/ESigLamp.js b/src/jmapNew/shape/graph/Signal/ESigLamp.js index 42dbf3263..624fea9f1 100644 --- a/src/jmapNew/shape/graph/Signal/ESigLamp.js +++ b/src/jmapNew/shape/graph/Signal/ESigLamp.js @@ -174,7 +174,11 @@ class ESigLamp extends Group { } setColor(color) { if (this.model.style.Signal.lamp.borderVariable) { - this.lamp.setStyle({ fill: color, stroke: color }); + if (this.model.style.Signal.lamp.normalBorderShow && color == this.model.style.backgroundColor) { + this.lamp.setStyle({ fill: color }); + } else { + this.lamp.setStyle({ fill: color, stroke: color }); + } } else { this.lamp.setStyle({ fill: color }); } diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index ecbf971d4..790275c9b 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -109,6 +109,9 @@ export default class SignalButton extends Group { fill: fillColor } }) + if (this.style.SignalButton && this.style.SignalButton.strokeColor){ + this.rectButton.setStyle("stroke",this.style.SignalButton.strokeColor) + } this.add(this.rectButton) } this.leftLine = new Line({ @@ -249,11 +252,21 @@ export default class SignalButton extends Group { if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') { color = '#808080' } else if (this.model.type === 'GUIDE') { - color = '#5050E1' + if (this.style.SignalButton && this.style.SignalButton.guideColor){ + color = this.style.SignalButton.guideColor; + }else{ + color = '#5050E1'; + } + } else if (list.includes(this.model.type)) { color = '#ccc' } else { - color = '#008000' + if (this.style.SignalButton && this.style.SignalButton.trainColor){ + color = this.style.SignalButton.trainColor; + }else{ + color = '#008000'; + } + } return color } // From 86d12687445e6dd040e0419ad6c0ada093cf7f5b Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 11 Aug 2022 10:18:07 +0800 Subject: [PATCH 16/81] =?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 --- src/jmapNew/config/skinCode/datie_02.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 25bf5ef1d..798e5219b 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -543,7 +543,7 @@ class SkinCode extends defaultStyle { }, jointImg: { // 道岔 A B C D四元素属性配置 trapezoidLength: 8, // 直角梯形元素默认长度 - faultStatus: true, // 挤岔表示 + faultStatus: false, // 挤岔表示 fork: true, // 挤岔专用（如有挤岔操作 变为true） forKColor: 'red' // 挤岔颜色 配合挤岔专用 }, From 61e517e317a2b2f2e57a8f39fd4eb089082e9c26 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 11 Aug 2022 11:17:14 +0800 Subject: [PATCH 17/81] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A1=8C=E5=80=BC=E5=88=B7=E6=96=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/jointTrainingNew/index.vue | 88 ++++++++++----------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 3874bd574..0c9bf13b1 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -233,6 +233,12 @@ export default { this.cancelBigScreenMode(); } }, + '$store.state.map.mapDataLoadedCount':function(val) { + const roleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT']; + if (roleList.includes(this.$store.state.training.roles)) { + this.stationRoleShow(this.showStation); + } + }, '$store.state.map.mapViewLoadedCount': function () { // 地图视图加载完成标识 this.mapViewLoadedOver = true; this.showSelectStation && this.setShowStation(this.showStation); @@ -420,7 +426,6 @@ export default { // 仿真系统 async initLoadDemonData() { if (this.lineCode) { - // 01 现地 02 行调 '' 观众 let resp = {data: {}}; resp = await this.getUserRole(); if (resp && resp.code == 200) { @@ -434,11 +439,45 @@ export default { handleDialogShow(type) { this.$refs[type].doShow(); }, + stationRoleShow(deviceCode) { + const pictureLineCodeList = ['16']; + if (this.lineCode === '14') { + const list = []; + const mapDevice = this.$store.state.map.mapDevice; + this.$jlmap.setMap(this.$store.state.map.map, this.$store.state.map.mapDevice, {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData}); + for (const key in mapDevice) { + list.push(mapDevice[key]); + } + this.$jlmap.updateShowMode(list, '02'); + } + if (pictureLineCodeList.includes(this.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) { + const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation'); + if (picture) { + const mapDevice = this.$store.state.map.mapDevice; + const list = []; + const deviceList = []; + for (const key in mapDevice) { + list.push(mapDevice[key]); + deviceList.push(key); + } + this.$jlmap.updateShowStation(list, ''); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + this.$jlmap.updatePicture(deviceList); + this.$jlmap.updateTransform(picture.scaling, picture.origin); + this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[deviceCode]); + } else { + this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); + this.mapViewLoadedOver && this.switchStationMode(deviceCode); + } + } else { + this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); + this.mapViewLoadedOver && this.switchStationMode(deviceCode); + } + }, // 设置prdType和role setSimulationPrdType(deviceCode) { // Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 this.showStation = ''; - const pictureLineCodeList = ['16']; let tempData; let dataZoom; switch (this.userRole) { @@ -459,38 +498,7 @@ export default { this.$refs.menuSchema.chiShowStation = deviceCode; this.showStation = deviceCode; // this.changePrdType('01'); - if (this.lineCode === '14') { - const list = []; - const mapDevice = this.$store.state.map.mapDevice; - this.$jlmap.setMap(this.$store.state.map.map, this.$store.state.map.mapDevice, {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData}); - for (const key in mapDevice) { - list.push(mapDevice[key]); - } - this.$jlmap.updateShowMode(list, '02'); - } - if (pictureLineCodeList.includes(this.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) { - const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation'); - if (picture) { - const mapDevice = this.$store.state.map.mapDevice; - const list = []; - const deviceList = []; - for (const key in mapDevice) { - list.push(mapDevice[key]); - deviceList.push(key); - } - this.$jlmap.updateShowStation(list, ''); - this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); - this.$jlmap.updatePicture(deviceList); - this.$jlmap.updateTransform(picture.scaling, picture.origin); - this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[deviceCode]); - } else { - this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); - this.mapViewLoadedOver && this.switchStationMode(deviceCode); - } - } else { - this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); - this.mapViewLoadedOver && this.switchStationMode(deviceCode); - } + this.stationRoleShow(deviceCode); this.jl3dmaintainershow = false; this.drivingShow = false; break; @@ -500,17 +508,7 @@ export default { this.$store.dispatch('training/setRoles', 'STATION_ASSISTANT'); this.$refs.menuSchema.chiShowStation = deviceCode; this.showStation = deviceCode; - if (this.lineCode === '14') { - const list = []; - const mapDevice = this.$store.state.map.mapDevice; - this.$jlmap.setMap(this.$store.state.map.map, this.$store.state.map.mapDevice, {routeDate: this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData}); - for (const key in mapDevice) { - list.push(mapDevice[key]); - } - this.$jlmap.updateShowMode(list, '02'); - } - this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); - this.mapViewLoadedOver && this.switchStationMode(deviceCode); + this.stationRoleShow(deviceCode); this.jl3dmaintainershow = false; this.drivingShow = false; break; From 319cd60d6c999d83603bafc36773977ab2c81fef Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 11 Aug 2022 11:18:01 +0800 Subject: [PATCH 18/81] =?UTF-8?q?=E5=88=97=E8=BD=A6=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E8=87=B3=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/menuTrain.vue | 8 +-- .../theme/chengdu_01/menus/menuTrain.vue | 8 +-- .../theme/chengdu_03/menus/menuTrain.vue | 8 +-- .../components/menus/dialog/setFault.vue | 10 +-- .../theme/datie_01/menus/menuTrain.vue | 16 ++--- .../theme/datie_02/menus/menuTrain.vue | 16 ++--- .../theme/datie_jd1a/menus/menuTrain.vue | 16 ++--- .../theme/datie_ksk/menus/menuButton.vue | 64 +++++++++++++------ .../theme/datie_ksk/menus/menuTrain.vue | 16 ++--- .../theme/datie_tky/menus/menuTrain.vue | 16 ++--- .../theme/foshan_01/menus/menuTrain.vue | 8 +-- .../theme/fuzhou_01/menus/menuTrain.vue | 8 +-- .../theme/haerbin_01/menus/menuTrain.vue | 8 +-- .../theme/nanjing_02/menus/menuTrain.vue | 8 +-- .../theme/ningbo_01/menus/menuTrain.vue | 8 +-- .../theme/ningbo_03/menus/menuTrain.vue | 8 +-- src/jmapNew/theme/race_01/menus/menuTrain.vue | 8 +-- src/jmapNew/theme/xian_01/menus/menuTrain.vue | 10 +-- src/jmapNew/theme/xian_02/menus/menuTrain.vue | 8 +-- 19 files changed, 140 insertions(+), 112 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue index 38a2b8f02..bcd4c2205 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue @@ -230,10 +230,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index ef16ae564..3a83f1f7d 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -143,10 +143,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue index 31e41df1b..8754f070f 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue @@ -126,10 +126,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index ce093d2d8..93200a45d 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -23,11 +23,13 @@ - + - 越红灯行驶 - 越引导行驶 - 无 + 越红灯行驶
+ 越引导行驶
+ 运行至前方车站
+ 进路闭塞法行车
+ 无 diff --git a/src/jmapNew/theme/datie_01/menus/menuTrain.vue b/src/jmapNew/theme/datie_01/menus/menuTrain.vue index 9244e9f08..215595047 100644 --- a/src/jmapNew/theme/datie_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_01/menus/menuTrain.vue @@ -123,14 +123,14 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, - { - label: '进路闭塞法行车', - handler: this.routeBlockRun - } + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, + // { + // label: '进路闭塞法行车', + // handler: this.routeBlockRun + // } // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue index c31b4c55b..9539df66b 100644 --- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue @@ -185,14 +185,14 @@ export default { } ] }, - { - label: '确认运行至前方站', - handler: this.nextStation - }, - { - label: '进路闭塞法行车', - handler: this.routeBlockRun - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, + // { + // label: '进路闭塞法行车', + // handler: this.routeBlockRun + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue index 119d1f328..599015882 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue @@ -182,14 +182,14 @@ export default { } ] }, - { - label: '确认运行至前方站', - handler: this.nextStation - }, - { - label: '进路闭塞法行车', - handler: this.routeBlockRun - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, + // { + // label: '进路闭塞法行车', + // handler: this.routeBlockRun + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue index 79e8d1daa..eacb8824e 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue @@ -352,16 +352,24 @@ export default { if (this.timeNode && val - this.timeNode >= 15) { this.clearOperate(); } + const routeDeviceList = []; + this.routeList.forEach(item => { + if (item && item.btnCodeList && item.btnCodeList.length && this.deviceList && this.deviceList.length && item.btnCodeList[0] === this.deviceList[0].code) { + routeDeviceList.push(this.$store.getters['map/getDeviceByCode'](item.btnCodeList[1])); + } + }); + const updateList = []; + if (this.deviceList && this.deviceList.length) { + updateList.push({code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}); + } + routeDeviceList.forEach(item => { + updateList.push({ code: item.code, _type: item._type, toSelected: 0 }); + }); if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) { if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') { - this.$store.dispatch('training/updateMapState', [{ code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0 }]); - } else if ( - this.deviceList && - this.deviceList.length && - this.deviceList[0]._type === 'Signal' && - this.deviceList[0].type === 'SHUNTING' - ) { - this.$store.dispatch('training/updateMapState', [{ code: this.deviceList[0].code, _type: 'Signal', hasSelected: 0 }]); + this.$store.dispatch('training/updateMapState', updateList); + } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') { + this.$store.dispatch('training/updateMapState', updateList); } this.deviceList = []; } @@ -620,7 +628,17 @@ export default { if (valid) { // 仅信号按钮调车信号机有状态 if (deviceList[0]._type === 'SignalButton' || (deviceList[0]._type === 'Signal' && deviceList[0].type === 'SHUNTING')) { - this.$store.dispatch('training/updateMapState', [{ code: deviceList[0].code, _type: deviceList[0]._type, hasSelected: 1 }]); + const routeDeviceList = []; + this.routeList.forEach(item => { + if (item && item.btnCodeList && item.btnCodeList.length && this.deviceList && this.deviceList.length && item.btnCodeList[0] === deviceList[0].code) { + routeDeviceList.push(this.$store.getters['map/getDeviceByCode'](item.btnCodeList[1])); + } + }); + const updateList = [{ code: deviceList[0].code, _type: deviceList[0]._type, hasSelected: 1 }]; + routeDeviceList.forEach(item => { + updateList.push({ code: item.code, _type: item._type, toSelected: 1 }); + }); + this.$store.dispatch('training/updateMapState', updateList); } } }) @@ -715,7 +733,7 @@ export default { val: model.code, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE }; - const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code); + // const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code); if (model._type === 'SignalButton' && model.type === 'PICK') { operate.param = { signalCode: model.signalCode }; this.sendCommand(operate); @@ -942,18 +960,26 @@ export default { return false; } }, - clearOperate() { - // 清除操作 - this.deviceList && - this.deviceList.length && - this.$store.dispatch('training/updateMapState', [ - { code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0 } - ]); + clearOperate() { // 清除操作 this.deviceList = []; Handler.clear(); // 清空操作组 this.$store.dispatch('menuOperation/setButtonOperation', null); - // this.pressedSignalButton && this.pressedSignalButton.instance.pressDown(false) - // this.pressedSignalButton = null + }, + clearSignalButton() { // 清除信号按钮前端状态 + const routeDeviceList = []; + this.routeList.forEach(item => { + if (item && item.btnCodeList && item.btnCodeList.length && this.deviceList && this.deviceList.length && item.btnCodeList[0] === this.deviceList[0].code) { + routeDeviceList.push(this.$store.getters['map/getDeviceByCode'](item.btnCodeList[1])); + } + }); + const updateList = []; + if (this.deviceList && this.deviceList.length) { + updateList.push({code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}); + } + routeDeviceList.forEach(item => { + updateList.push({ code: item.code, _type: item._type, toSelected: 0 }); + }); + this.deviceList && this.deviceList.length && this.$store.dispatch('training/updateMapState', updateList); }, assistOperateOrChange(model) { // mode.type== diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue index 119d1f328..599015882 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue @@ -182,14 +182,14 @@ export default { } ] }, - { - label: '确认运行至前方站', - handler: this.nextStation - }, - { - label: '进路闭塞法行车', - handler: this.routeBlockRun - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, + // { + // label: '进路闭塞法行车', + // handler: this.routeBlockRun + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue index 358630182..ceab65302 100644 --- a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue @@ -185,14 +185,14 @@ export default { } ] }, - { - label: '确认运行至前方站', - handler: this.nextStation - }, - { - label: '进路闭塞法行车', - handler: this.routeBlockRun - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, + // { + // label: '进路闭塞法行车', + // handler: this.routeBlockRun + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue index dc41811c4..efe9dfc0e 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue @@ -134,10 +134,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue index 93d9af963..b9b2a13b1 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue @@ -108,10 +108,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue index d9aa8a1da..0838f2cfc 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue @@ -75,10 +75,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue index dda65c3c5..5744d6904 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue @@ -75,10 +75,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index 8ac6b9d53..1251a633d 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -214,10 +214,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue index e24da823f..2e21da03c 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue @@ -215,10 +215,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue index a544dbff3..75cb2ceed 100644 --- a/src/jmapNew/theme/race_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue @@ -229,10 +229,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '限速指令', // handler: this.handleSpeedLimit diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index 8777fb089..a9e454299 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -159,10 +159,10 @@ export default { label: '转NRM模式', handler: this.handlerApplyNrmMode }, - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal @@ -302,7 +302,7 @@ export default { }); }, handlerApplyNrmMode() { - commitOperate(menuOperate.Driver.applyNrm, { groupNumber: this.selected.code }, 0).then(({ valid, operate }) => { + commitOperate(menuOperate.Driver.applyNrm, { groupNumber: this.selected.code }, 3).then(({ valid, operate }) => { }).catch((error) => { console.error(error); this.$refs.noticeInfo.doShow(); diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 5c7e0fc43..a045c6ea1 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -237,10 +237,10 @@ export default { } ], menuDirective: [ - { - label: '确认运行至前方站', - handler: this.nextStation - }, + // { + // label: '确认运行至前方站', + // handler: this.nextStation + // }, // { // label: '越引导信号行驶', // handler: this.handleOverFuideSignal From 1a80ae755815231a84ebb82d3830bd0a5c22b620 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 11 Aug 2022 11:18:38 +0800 Subject: [PATCH 19/81] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E6=9F=AF=E6=98=BE?= =?UTF-8?q?=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/config/skinCode/datie_ksk.js | 4 +- src/jmapNew/shape/graph/Signal/index.js | 17 +- src/jmapNew/shape/graph/SignalButton/index.js | 658 +++++++++--------- 3 files changed, 353 insertions(+), 326 deletions(-) diff --git a/src/jmapNew/config/skinCode/datie_ksk.js b/src/jmapNew/config/skinCode/datie_ksk.js index 7a825f073..f4fadb96e 100644 --- a/src/jmapNew/config/skinCode/datie_ksk.js +++ b/src/jmapNew/config/skinCode/datie_ksk.js @@ -261,7 +261,9 @@ class SkinCode extends defaultStyle { this[deviceType.SignalButton] = { shape: 'roundWithDock', fillColor: '#808080', - showName: true + showName: true, + selectColor: '#0000ff', + flashingColor: '#ffff00' }; this[deviceType.SwitchFault] = { displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index e1f642769..4bf15d7e4 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -647,7 +647,6 @@ class Signal extends Group { } this.sigPost.setHorColor(this.style.Signal.post.openHorColor); } - } /* 侧向开放 */ openLateral(logicLight) { @@ -726,6 +725,14 @@ class Signal extends Group { this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.yellowColor); this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.greenColor); } + redFlash() { + this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor); + this.lamps[0].setAnimationStart(this.style.Signal.lamp.redColor); + } + blueFlash() { + this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.blueColor); + this.lamps[0].setAnimationStart(this.style.Signal.lamp.blueColor); + } lampWhite() { if (this.lamps.length === 1) { this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.whiteColor); @@ -1086,6 +1093,14 @@ class Signal extends Group { this.greenYellow(); break; } + case 'RF': { + this.redFlash(); + break; + } + case 'BF': { + this.blueFlash(); + break; + } default: { this.close(model.logicLight); // 信号关闭 break; diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index ecbf971d4..40786947e 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -1,333 +1,343 @@ -import Group from 'zrender/src/container/Group' -import Rect from 'zrender/src/graphic/shape/Rect' -import Line from 'zrender/src/graphic/shape/Line' -import Text from 'zrender/src/graphic/Text' -import Arc from 'zrender/src/graphic/shape/Arc' -import Circle from 'zrender/src/graphic/shape/Circle' -import store from '@/store/index' +import Group from 'zrender/src/container/Group'; +import Rect from 'zrender/src/graphic/shape/Rect'; +import Line from 'zrender/src/graphic/shape/Line'; +import Text from 'zrender/src/graphic/Text'; +import Arc from 'zrender/src/graphic/shape/Arc'; +import Circle from 'zrender/src/graphic/shape/Circle'; +import store from '@/store/index'; const typeList = [ - 'PICK_ASSIST', - 'DEPART_ASSIST', - 'ASSIST', - 'GUIDELOCK', - 'SECTION_FAULT_UNLOCK', - 'LOCATE', - 'REVERSE', - 'CANCEL', - 'HUMAN_RELEASE_ROUTE', - 'MONOLOCK', - 'UNLOCK', - 'BLOCK', - 'UNBLOCK', - 'CHANGE_DIRECTION' -] + 'PICK_ASSIST', + 'DEPART_ASSIST', + 'ASSIST', + 'GUIDELOCK', + 'SECTION_FAULT_UNLOCK', + 'LOCATE', + 'REVERSE', + 'CANCEL', + 'HUMAN_RELEASE_ROUTE', + 'MONOLOCK', + 'UNLOCK', + 'BLOCK', + 'UNBLOCK', + 'CHANGE_DIRECTION' +]; export default class SignalButton extends Group { - constructor(model, { style }) { - super() - this._code = model.code - this._type = model._type - this.zlevel = model.zlevel - const pictureDevice = store.getters['map/getPictureDeviceByCode'](model.code) - if (pictureDevice) { - this.computedPosition = pictureDevice.position - } else { - this.computedPosition = model.position - } - this.z = 0 - this.model = model - this.style = style - this.pressed = false - // Line - this.create() - this.setState(model) - } - - create() { - const model = this.model - const computedPosition = this.computedPosition - const fillColor = this.getTypeColor() - if (this.style.SignalButton && this.style.SignalButton.shape === 'roundWithDock' && typeList.includes(model.type)) { - const circle1 = new Circle({ - zlevel: this.zlevel, - z: this.z + 2, - shape: { - cx: computedPosition.x + 7, - cy: computedPosition.y + 7, - r: 7 - }, - style: { - stroke: '#69666E', - lineWidth: 1, - fill: fillColor - } - }) - const circle2 = new Circle({ - zlevel: this.zlevel, - z: this.z + 1, - shape: { - cx: computedPosition.x + 7, - cy: computedPosition.y + 9, - r: 8 - }, - style: { - fill: '#000' - } - }) - const circle3 = new Circle({ - zlevel: this.zlevel, - z: this.z, - shape: { - cx: computedPosition.x + 7, - cy: computedPosition.y + 9, - r: 9 - }, - style: { - fill: '#eee' - } - }) - this.arcShape = circle1 - this.arcShapeDock1 = circle2 - this.arcShapeDock2 = circle3 - this.add(circle1) - .add(circle2) - .add(circle3) - } else { - this.rectButton = new Rect({ - zlevel: this.zlevel, - z: this.z, - shape: { - x: computedPosition.x, - y: computedPosition.y, - width: 14, - height: 14 - }, - style: { - lineDash: null, - stroke: '#69666E', - lineWidth: 1, - fill: fillColor - } - }) - this.add(this.rectButton) - } - this.leftLine = new Line({ - zlevel: this.zlevel, - z: this.z + 1, - shape: { - x1: computedPosition.x + 1, - y1: computedPosition.y + 1, - x2: computedPosition.x + 13, - y2: computedPosition.y + 13 - }, - style: { - lineWidth: 2, - stroke: '#ff0000' - } - }) - this.add(this.leftLine) - this.leftLine.hide() - this.rightLine = new Line({ - zlevel: this.zlevel, - z: this.z + 1, - shape: { - x1: computedPosition.x + 13, - y1: computedPosition.y + 1, - x2: computedPosition.x + 1, - y2: computedPosition.y + 13 - }, - style: { - lineWidth: 2, - stroke: '#ff0000' - } - }) - this.add(this.rightLine) - this.rightLine.hide() - this.leftBoard = new Line({ - zlevel: this.zlevel, - z: this.z + 1, - shape: { - x1: computedPosition.x - 1, - y1: computedPosition.y - 1, - x2: computedPosition.x - 1, - y2: computedPosition.y + 15 - }, - style: { - lineWidth: 2, - stroke: '#FFFFFF' - } - }) - this.add(this.leftBoard) - this.leftBoard.hide() - this.topBoard = new Line({ - zlevel: this.zlevel, - z: this.z + 1, - shape: { - x1: computedPosition.x - 1, - y1: computedPosition.y - 1, - x2: computedPosition.x + 15, - y2: computedPosition.y - 1 - }, - style: { - lineWidth: 2, - stroke: '#FFFFFF' - } - }) - this.add(this.topBoard) - this.topBoard.hide() - this.rightBoard = new Line({ - zlevel: this.zlevel, - z: this.z + 1, - shape: { - x1: computedPosition.x + 15, - y1: computedPosition.y - 1, - x2: computedPosition.x + 15, - y2: computedPosition.y + 15 - }, - style: { - lineWidth: 2, - stroke: '#A0A0A0' - } - }) - this.add(this.rightBoard) - this.rightBoard.hide() - this.bottomBoard = new Line({ - zlevel: this.zlevel, - z: this.z + 1, - shape: { - x1: computedPosition.x - 1, - y1: computedPosition.y + 15, - x2: computedPosition.x + 15, - y2: computedPosition.y + 15 - }, - style: { - lineWidth: 2, - stroke: '#A0A0A0' - } - }) - this.add(this.bottomBoard) - this.bottomBoard.hide() - const hasTextList = ['PASS', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'] - if (hasTextList.includes(model.type) || (this.style.SignalButton && this.style.SignalButton.showName)) { - this.buttonText = new Text({ - zlevel: this.zlevel, - z: this.z, - style: { - x: computedPosition.x + model.nameOffset.x, - y: computedPosition.y + model.nameOffset.y, - fontWeight: '400', - fontSize: 10, - fontFamily: '', - text: model.name, - textFill: '#C0C0C0', - textAlign: 'middle', - textVerticalAlign: 'top' - } - }) - this.add(this.buttonText) - } - } - startAnimate() { - this.rectButton && - this.rectButton - .animateStyle(true) - .when(0, { fill: '#000' }) - .when(1000, { fill: this.getTypeColor() }) - .when(2000, { fill: '#000' }) - .start() - } - stopAnimation() { - this.rectButton && this.rectButton.stopAnimation(true) - // this.arcFlash && this.arcFlash.stopAnimation(false); - } - getTypeColor() { - if (this.style.SignalButton && this.style.SignalButton.fillColor && typeList.includes(this.model.type)) { - return this.style.SignalButton.fillColor - } - let color = '' - const list = ['ASSIST', 'ACCIDENT', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'] - if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') { - color = '#808080' - } else if (this.model.type === 'GUIDE') { - color = '#5050E1' - } else if (list.includes(this.model.type)) { - color = '#ccc' - } else { - color = '#008000' - } - return color - } // - recover() { - this.stopAnimation() - this.rectButton && this.rectButton.setStyle({ fill: this.getTypeColor() }) - this.arcShape && this.arcShape.setStyle({ fill: this.getTypeColor() }) - this.rightLine && this.rightLine.hide() - this.leftLine && this.leftLine.hide() - this.rectButton && this.rectButton.show() - this.arcShape && this.arcShape.show() - this.arcShapeDock1 && this.arcShapeDock1.show() - this.arcShapeDock2 && this.arcShapeDock2.show() - this.buttonText && this.buttonText.show() - this.leftBoard && this.leftBoard.hide() - this.rightBoard && this.rightBoard.hide() - this.topBoard && this.topBoard.hide() - this.bottomBoard && this.bottomBoard.hide() - } - blockShow() { - this.rightLine && this.rightLine.show() - this.leftLine && this.leftLine.show() - } - setState(model) { - this.recover() - // { value: 'ASSIST', label: '总辅助按钮' }, - // { value: 'PICK_ASSIST', label: '接辅助按钮' }, - // { value: 'DEPART_ASSIST', label: '发辅助按钮' }, - const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION'] - if (list.includes(model.type)) { - if (this.rectButton) { - if (model.pressDown) { - this.rectButton.setStyle({ fill: '#FFFF00' }) + constructor(model, { style }) { + super(); + this._code = model.code; + this._type = model._type; + this.zlevel = model.zlevel; + const pictureDevice = store.getters['map/getPictureDeviceByCode'](model.code); + if (pictureDevice) { + this.computedPosition = pictureDevice.position; } else { - this.rectButton.setStyle({ fill: this.getTypeColor() }) + this.computedPosition = model.position; } - } + this.z = 0; + this.model = model; + this.style = style; + this.pressed = false; + // Line + this.create(); + this.setState(model); } - // { value: 'PICK', label: '接车按钮' }, - // { value: 'SHUNT_TERMINAL', label: '调车终端按钮' }, - if (!store.getters['map/checkDeviceShow'](this._code)) { - this.buttonText && this.buttonText.hide() - this.rectButton && this.rectButton.hide() - this.leftLine && this.leftLine.hide() - this.rightLine && this.rightLine.hide() - this.arcShape && this.arcShape.hide() - this.arcShapeDock1 && this.arcShapeDock1.hide() - this.arcShapeDock2 && this.arcShapeDock2.hide() - } else { - if (model.hasSelected) { - this.startAnimate() - } - } - } - pressDown(flg, color) { - if (this.pressed === flg) return - if (this.arcShapeDock1) { - if (flg) { - this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy + 2 }, z: this.z + 2, zlevel: this.zlevel }) - if (color) { - this.arcShape - .animateStyle(true) - .when(0, { fill: '#69666E' }) - .when(1000, { fill: color }) - .when(2000, { fill: '#69666E' }) - .start() + + create() { + const model = this.model; + const computedPosition = this.computedPosition; + const fillColor = this.getTypeColor(); + if (this.style.SignalButton && this.style.SignalButton.shape === 'roundWithDock' && typeList.includes(model.type)) { + const circle1 = new Circle({ + zlevel: this.zlevel, + z: this.z + 2, + shape: { + cx: computedPosition.x + 7, + cy: computedPosition.y + 7, + r: 7 + }, + style: { + stroke: '#69666E', + lineWidth: 1, + fill: fillColor + } + }); + const circle2 = new Circle({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + cx: computedPosition.x + 7, + cy: computedPosition.y + 9, + r: 8 + }, + style: { + fill: '#000' + } + }); + const circle3 = new Circle({ + zlevel: this.zlevel, + z: this.z, + shape: { + cx: computedPosition.x + 7, + cy: computedPosition.y + 9, + r: 9 + }, + style: { + fill: '#eee' + } + }); + this.arcShape = circle1; + this.arcShapeDock1 = circle2; + this.arcShapeDock2 = circle3; + this.add(circle1) + .add(circle2) + .add(circle3); + } else { + this.rectButton = new Rect({ + zlevel: this.zlevel, + z: this.z, + shape: { + x: computedPosition.x, + y: computedPosition.y, + width: 14, + height: 14 + }, + style: { + lineDash: null, + stroke: '#69666E', + lineWidth: 1, + fill: fillColor + } + }); + this.add(this.rectButton); + } + this.leftLine = new Line({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + x1: computedPosition.x + 1, + y1: computedPosition.y + 1, + x2: computedPosition.x + 13, + y2: computedPosition.y + 13 + }, + style: { + lineWidth: 2, + stroke: '#ff0000' + } + }); + this.add(this.leftLine); + this.leftLine.hide(); + this.rightLine = new Line({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + x1: computedPosition.x + 13, + y1: computedPosition.y + 1, + x2: computedPosition.x + 1, + y2: computedPosition.y + 13 + }, + style: { + lineWidth: 2, + stroke: '#ff0000' + } + }); + this.add(this.rightLine); + this.rightLine.hide(); + this.leftBoard = new Line({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + x1: computedPosition.x - 1, + y1: computedPosition.y - 1, + x2: computedPosition.x - 1, + y2: computedPosition.y + 15 + }, + style: { + lineWidth: 2, + stroke: '#FFFFFF' + } + }); + this.add(this.leftBoard); + this.leftBoard.hide(); + this.topBoard = new Line({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + x1: computedPosition.x - 1, + y1: computedPosition.y - 1, + x2: computedPosition.x + 15, + y2: computedPosition.y - 1 + }, + style: { + lineWidth: 2, + stroke: '#FFFFFF' + } + }); + this.add(this.topBoard); + this.topBoard.hide(); + this.rightBoard = new Line({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + x1: computedPosition.x + 15, + y1: computedPosition.y - 1, + x2: computedPosition.x + 15, + y2: computedPosition.y + 15 + }, + style: { + lineWidth: 2, + stroke: '#A0A0A0' + } + }); + this.add(this.rightBoard); + this.rightBoard.hide(); + this.bottomBoard = new Line({ + zlevel: this.zlevel, + z: this.z + 1, + shape: { + x1: computedPosition.x - 1, + y1: computedPosition.y + 15, + x2: computedPosition.x + 15, + y2: computedPosition.y + 15 + }, + style: { + lineWidth: 2, + stroke: '#A0A0A0' + } + }); + this.add(this.bottomBoard); + this.bottomBoard.hide(); + const hasTextList = ['PASS', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION']; + if (hasTextList.includes(model.type) || (this.style.SignalButton && this.style.SignalButton.showName)) { + this.buttonText = new Text({ + zlevel: this.zlevel, + z: this.z, + style: { + x: computedPosition.x + model.nameOffset.x, + y: computedPosition.y + model.nameOffset.y, + fontWeight: '400', + fontSize: 10, + fontFamily: '', + text: model.name, + textFill: '#C0C0C0', + textAlign: 'middle', + textVerticalAlign: 'top' + } + }); + this.add(this.buttonText); } - } else { - this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy - 2 }, z: this.z + 2, zlevel: this.zlevel }) - this.arcShape.stopAnimation(true) - this.recover() - } - this.pressed = flg } - } - getAnchorPoint() {} + startAnimate(color) { + // let color = this.getTypeColor(); + // if (this.style.SignalButton && this.style.SignalButton.flashingColor) { + // color = this.style.SignalButton.flashingColor; + // } + this.rectButton && + this.rectButton + .animateStyle(true) + .when(0, { fill: '#000' }) + .when(1000, { fill: color }) + .when(2000, { fill: '#000' }) + .start(); + } + stopAnimation() { + this.rectButton && this.rectButton.stopAnimation(true); + // this.arcFlash && this.arcFlash.stopAnimation(false); + } + getTypeColor() { + if (this.style.SignalButton && this.style.SignalButton.fillColor && typeList.includes(this.model.type)) { + return this.style.SignalButton.fillColor; + } + let color = ''; + const list = ['ASSIST', 'ACCIDENT', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION']; + if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') { + color = '#808080'; + } else if (this.model.type === 'GUIDE') { + color = '#5050E1'; + } else if (list.includes(this.model.type)) { + color = '#ccc'; + } else { + color = '#008000'; + } + return color; + } // + recover() { + this.stopAnimation(); + this.rectButton && this.rectButton.setStyle({ fill: this.getTypeColor() }); + this.arcShape && this.arcShape.setStyle({ fill: this.getTypeColor() }); + this.rightLine && this.rightLine.hide(); + this.leftLine && this.leftLine.hide(); + this.rectButton && this.rectButton.show(); + this.arcShape && this.arcShape.show(); + this.arcShapeDock1 && this.arcShapeDock1.show(); + this.arcShapeDock2 && this.arcShapeDock2.show(); + this.buttonText && this.buttonText.show(); + this.leftBoard && this.leftBoard.hide(); + this.rightBoard && this.rightBoard.hide(); + this.topBoard && this.topBoard.hide(); + this.bottomBoard && this.bottomBoard.hide(); + } + blockShow() { + this.rightLine && this.rightLine.show(); + this.leftLine && this.leftLine.show(); + } + setState(model) { + this.recover(); + // { value: 'ASSIST', label: '总辅助按钮' }, + // { value: 'PICK_ASSIST', label: '接辅助按钮' }, + // { value: 'DEPART_ASSIST', label: '发辅助按钮' }, + const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION']; + if (list.includes(model.type)) { + if (this.rectButton) { + if (model.pressDown) { + this.rectButton.setStyle({ fill: '#FFFF00' }); + } else { + this.rectButton.setStyle({ fill: this.getTypeColor() }); + } + } + } + // { value: 'PICK', label: '接车按钮' }, + // { value: 'SHUNT_TERMINAL', label: '调车终端按钮' }, + if (!store.getters['map/checkDeviceShow'](this._code)) { + this.buttonText && this.buttonText.hide(); + this.rectButton && this.rectButton.hide(); + this.leftLine && this.leftLine.hide(); + this.rightLine && this.rightLine.hide(); + this.arcShape && this.arcShape.hide(); + this.arcShapeDock1 && this.arcShapeDock1.hide(); + this.arcShapeDock2 && this.arcShapeDock2.hide(); + } else { + if (model.hasSelected) { + if (this.style.SignalButton && this.style.SignalButton.selectColor) { + this.rectButton && this.rectButton.setStyle({fill:this.style.SignalButton.selectColor}); + } else { + this.startAnimate(this.getTypeColor()); + } + } else if (model.toSelected) { + this.startAnimate(this.style.SignalButton.flashingColor); + } + } + } + pressDown(flg, color) { + if (this.pressed === flg) return; + if (this.arcShapeDock1) { + if (flg) { + this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy + 2 }, z: this.z + 2, zlevel: this.zlevel }); + if (color) { + this.arcShape + .animateStyle(true) + .when(0, { fill: '#69666E' }) + .when(1000, { fill: color }) + .when(2000, { fill: '#69666E' }) + .start(); + } + } else { + this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy - 2 }, z: this.z + 2, zlevel: this.zlevel }); + this.arcShape.stopAnimation(true); + this.recover(); + } + this.pressed = flg; + } + } + getAnchorPoint() {} } From 75eca3b417b6f45b001d54d39b76cfe9bc2c8d24 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 11 Aug 2022 16:29:57 +0800 Subject: [PATCH 20/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=82=A1=E9=81=93=E5=81=9C=E7=A8=B3=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/datie_02.js | 4 ++ src/jmapNew/constant/stateTransition.js | 2 + src/jmapNew/shape/graph/Section/index.js | 66 +++++++++++++++++++ src/jmapNew/shape/graph/StationStand/index.js | 8 +++ 4 files changed, 80 insertions(+) diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 798e5219b..25d9e8c10 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -164,6 +164,10 @@ class SkinCode extends defaultStyle { }, trainPosition:{ display: false // 列车实时位置显示 + }, + remainTime:{ + circleBack:'', + textColor:'' } }; diff --git a/src/jmapNew/constant/stateTransition.js b/src/jmapNew/constant/stateTransition.js index 4df564a51..46df4f7a2 100644 --- a/src/jmapNew/constant/stateTransition.js +++ b/src/jmapNew/constant/stateTransition.js @@ -24,6 +24,7 @@ class Status { assignSkip: device.assignSkip, // 是否指定跳停 runLevelTime: device.runLevelTime, // 区间运行时间 自动为 0 parkingTime: device.parkingTime, // 站台停车时间 自动为0 + remainTime:device.remainTime, // 当前剩余停站时间 fault: device.fault, /** 非故障*/ num:device.num }; @@ -95,6 +96,7 @@ class Status { offsetp:device.offsetp, /** 列车精确位置 （成都一号线使用）*/ physicalCode:device.physicalCode, /** 列车所在物理区段 */ num:device.num /** 列车上的人数*/ + // parkingRemainTime }; } handleStation(device) { diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index 34cbb11a2..8b2137fff 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -1,4 +1,6 @@ import Group from 'zrender/src/container/Group'; +import Text from 'zrender/src/graphic/Text'; +import Arc from 'zrender/src/graphic/shape/Arc'; import ETextName from './ETextName'; // 名称文字 import ELimitLines from './ELimitLines'; // 区段限速 (私有) import ELines from './ELines'; // 创建多线条 曲线 (私有) @@ -132,6 +134,50 @@ export default class Section extends Group { }); this.add(this[element]); }); + + if (this.style.Section.remainTime && (this.model.standTrack || this.model.reentryTrack || this.model.transferTrack)) { + const computedPoints = this.computedPoints; + const drict = model.trainPosType != '01' ? 1 : -1; + const x = Math.min(computedPoints[0].x, computedPoints[computedPoints.length - 1].x) + Math.abs(computedPoints[computedPoints.length - 1].x - computedPoints[0].x) / 2; + const y = Math.min(computedPoints[0].y, computedPoints[computedPoints.length - 1].y) + Math.abs(computedPoints[computedPoints.length - 1].y - computedPoints[0].y) / 2; + this.remainTimeText = new Text({ + _subType: 'remainTimeText', + zlevel: this.zlevel, + z: this.z, + silent: model.silent || false, + style: { + x: x, + y: y - 23 * drict, + fontWeight: 'normal', + fontSize: 13, + fontFamily:style.fontFamily, + text: '0', + textFill:'#ff0000', + textAlign: 'center', // 水平对齐方式 + textPosition: 'inside', // 文字位置 + textVerticalAlign: 'middle' // 文字垂直对齐方式 + } + }); + this.remainTimeCircle = new Arc({ + _subType: 'remainTimeCircle', + zlevel: this.zlevel, + z: this.z, + shape: { + cx: x - 18, + cy: y - 23 * drict, + r: 6 + }, + style: { + lineWidth: 1, + fill: style.backgroundColor, + stroke: '#ffffff' + } + }); + this.add(this.remainTimeText); + this.add(this.remainTimeCircle); + this.remainTimeText.hide(); + this.remainTimeCircle.hide(); + } } } @@ -167,6 +213,8 @@ export default class Section extends Group { this.speedLimitName && this.speedLimitName.hide(); this.separator && this.separator.show(); this.badShunt && this.badShunt.hide(); + // this.remainTimeText && this.remainTimeText.hide(); + // this.remainTimeCircle && this.remainTimeCircle.hide(); this.axle && this.axle.setStyle({ stroke: this.style.Section.line.spareColor, @@ -655,4 +703,22 @@ export default class Section extends Group { y:rect.y }; } + + showRemainTime(remainTime) { + this.remainTimeText.show(); + this.remainTimeCircle.show(); + this.remainTimeCircle && this.remainTimeCircle.animateStyle(true) + .when(0, { fill:this.style.backgroundColor }) + .when(1000, { fill: '#ffffff' }) + .when(2000, { fill:this.style.backgroundColor }) + .start(); + this.remainTimeText.setStyle('text', remainTime); + } + + hideRemainTime() { + this.remainTimeText.hide(); + this.remainTimeCircle && this.remainTimeCircle.stopAnimation(true); + this.remainTimeCircle && this.remainTimeCircle.hide(); + } + } diff --git a/src/jmapNew/shape/graph/StationStand/index.js b/src/jmapNew/shape/graph/StationStand/index.js index 12c635464..edaf7e2f3 100644 --- a/src/jmapNew/shape/graph/StationStand/index.js +++ b/src/jmapNew/shape/graph/StationStand/index.js @@ -189,6 +189,14 @@ class StationStand extends Group { this.upDetainLamp && this.upDetainLamp.show(); this.downDetainLamp && this.downDetainLamp.show(); } + if (this.style.Section.remainTime) { + const section = this.mapDevice[model.standTrackCode]; + if (model.remainTime) { + section.instance && section.instance.showRemainTime(model.remainTime); + } else { + section.instance && section.instance.hideRemainTime(); + } + } } } From 2d4c5f8cf89722d7125acd08170452bb86725cec Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 12 Aug 2022 13:23:38 +0800 Subject: [PATCH 21/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF:1.?= =?UTF-8?q?=E8=B0=83=E8=BD=A6=E8=BF=9B=E8=B7=AF=E7=9A=84=E6=80=BB=E4=BA=BA?= =?UTF-8?q?=E8=A7=A3=20=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=202.=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E6=9C=BA=E5=92=8C=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4=203.=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E5=85=89=E6=A0=87=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/datie_02.js | 3 +- src/jmapNew/shape/graph/Signal/index.js | 12 +++---- src/jmapNew/shape/graph/SignalButton/index.js | 32 ++++++++++--------- .../theme/datie_02/menus/menuButton.vue | 14 ++++++-- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 25d9e8c10..6a39a103f 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -209,7 +209,7 @@ class SkinCode extends defaultStyle { borderWidth: 2, // 信号灯边框线宽度 borderColor: 'rgb(85,120,182)', // 信号灯边框线颜色 darkColor:'rgb(85,120,182)', // - radiusR: 7, // 信号灯半径 + radiusR: 5, // 信号灯半径 grayColor: '#7F7F7F', // 信号灯灰色 redColor: '#FF0000', // 信号灯红色 greenColor: '#00FF00', // 信号灯绿色 @@ -264,6 +264,7 @@ class SkinCode extends defaultStyle { }; this[deviceType.SignalButton] = { + width:12, guideColor: 'rgb(80,80,255)', trainColor:'rgb(0,128,0)', strokeColor:'rgb(128,128,128)' diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index 4bf15d7e4..0a3d22227 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -953,12 +953,12 @@ class Signal extends Group { showRemainTime(number) { this.remainTimeName.show(); this.remainTimeName && this.remainTimeName.setStyle({ text: number }); - this.model.signalButtonList && this.model.signalButtonList.length && this.model.signalButtonList.forEach(item => { - const button = store.getters['map/getDeviceByCode'](item); - if (button.type === 'PICK') { - button && button.instance && button.instance.startAnimate(); - } - }); + // this.model.signalButtonList && this.model.signalButtonList.length && this.model.signalButtonList.forEach(item => { + // const button = store.getters['map/getDeviceByCode'](item); + // if (button.type === 'PICK') { + // button && button.instance && button.instance.startAnimate(); + // } + // }); if (this.model.type === 'SHUNTING') { if (!this.style.Signal.dtTextNearSignalOffset) { this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor); diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index f12fa5c2b..07548aa5f 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -93,14 +93,15 @@ export default class SignalButton extends Group { .add(circle2) .add(circle3); } else { + const width = this.style.SignalButton && this.style.SignalButton.width ? this.style.SignalButton.width : 14; this.rectButton = new Rect({ zlevel: this.zlevel, z: this.z, shape: { x: computedPosition.x, y: computedPosition.y, - width: 14, - height: 14 + width:width, + height: width }, style: { lineDash: null, @@ -109,9 +110,9 @@ export default class SignalButton extends Group { fill: fillColor } }); - if (this.style.SignalButton && this.style.SignalButton.strokeColor){ - this.rectButton.setStyle("stroke",this.style.SignalButton.strokeColor) - } + if (this.style.SignalButton && this.style.SignalButton.strokeColor) { + this.rectButton.setStyle('stroke', this.style.SignalButton.strokeColor); + } this.add(this.rectButton); } this.leftLine = new Line({ @@ -252,19 +253,19 @@ export default class SignalButton extends Group { if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') { color = '#808080'; } else if (this.model.type === 'GUIDE') { - if (this.style.SignalButton && this.style.SignalButton.guideColor){ - color = this.style.SignalButton.guideColor; - }else{ - color = '#5050E1'; - } + if (this.style.SignalButton && this.style.SignalButton.guideColor) { + color = this.style.SignalButton.guideColor; + } else { + color = '#5050E1'; + } } else if (list.includes(this.model.type)) { color = '#ccc'; } else { - if (this.style.SignalButton && this.style.SignalButton.trainColor){ - color = this.style.SignalButton.trainColor; - }else{ - color = '#008000'; - } + if (this.style.SignalButton && this.style.SignalButton.trainColor) { + color = this.style.SignalButton.trainColor; + } else { + color = '#008000'; + } } return color; } // @@ -315,6 +316,7 @@ export default class SignalButton extends Group { this.arcShapeDock2 && this.arcShapeDock2.hide(); } else { if (model.hasSelected) { + debugger; if (this.style.SignalButton && this.style.SignalButton.selectColor) { this.rectButton && this.rectButton.setStyle({fill:this.style.SignalButton.selectColor}); } else { diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue index dbdbf1299..437b17368 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue @@ -1,5 +1,5 @@ From a55b94e4abc0a7d36ba15e24d9eb1e21aa84565f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 15 Aug 2022 17:27:31 +0800 Subject: [PATCH 31/81] =?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 --- src/jmapNew/theme/datie_02/menus/index.vue | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index ede1af4aa..120154be7 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -40,6 +40,8 @@
{{ tipContent.time+": "+tipContent.message }}
+
+
@@ -1041,4 +1043,26 @@ export default { border-radius: 0; background: #cb204d; } + .simulationTellInfo{ + position: absolute; + width: 320px; + height: 100px; + top: 50px; + right:10px; + padding: 5px; + overflow:auto; + background: #c3c3c3; + z-index: 2; + } + .simulationDeviceInfo{ + position: absolute; + width: 320px; + height: 100px; + top: 152px; + right:10px; + padding: 5px; + overflow:auto; + background: #c3c3c3; + z-index: 2; + } From e3e2493b557bad30cb9db77aa2eed9178212eb79 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 16 Aug 2022 11:26:54 +0800 Subject: [PATCH 32/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8C=89=E4=B8=8B=20=E5=BC=B9=E8=B5=B7?= =?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 --- src/jmapNew/shape/graph/SignalButton/index.js | 47 ++++++++++++++++--- .../dialog/childDialog/passwordInputBox.vue | 4 ++ .../theme/datie_02/menus/menuButton.vue | 4 ++ 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index 9d7d47b5a..71910d656 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -155,7 +155,7 @@ export default class SignalButton extends Group { const borderLine = this.style.SignalButton && this.style.SignalButton.borderLine ? this.style.SignalButton.borderLine : 2; const isShowBorder = this.style.SignalButton && this.style.SignalButton.isShowBorder; // 接车按钮 通过按钮 引导按钮 - const showBorderBtn = ['PICK', 'PASS', 'GUIDE']; + const showBorderBtn = ['PICK', 'PASS', 'GUIDE', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION', 'FLEXIBLE']; this.leftBoard = new Line({ zlevel: this.zlevel, z: this.z + 1, @@ -326,32 +326,65 @@ export default class SignalButton extends Group { // { value: 'ASSIST', label: '总辅助按钮' }, // { value: 'PICK_ASSIST', label: '接辅助按钮' }, // { value: 'DEPART_ASSIST', label: '发辅助按钮' }, + const isShowBorder = this.style.SignalButton && this.style.SignalButton.isShowBorder; const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION']; if (list.includes(model.type)) { if (this.rectButton) { if (model.pressDown) { this.rectButton.setStyle({ fill: '#FFFF00' }); + if (isShowBorder) { + this.leftBoard && this.leftBoard.setStyle('stroke', '#A0A0A0'); + this.topBoard && this.topBoard.setStyle('stroke', '#A0A0A0'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#FFFFFF'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#FFFFFF'); + } } else { this.rectButton.setStyle({ fill: this.getTypeColor() }); + if (isShowBorder) { + this.leftBoard && this.leftBoard.setStyle('stroke', '#FFFFFF'); + this.topBoard && this.topBoard.setStyle('stroke', '#FFFFFF'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#A0A0A0'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#A0A0A0'); + this.leftBoard && this.leftBoard.show(); + this.rightBoard && this.rightBoard.show(); + this.topBoard && this.topBoard.show(); + this.bottomBoard && this.bottomBoard.show(); + } } } } - const isShowBorder = this.style.SignalButton && this.style.SignalButton.isShowBorder; + if (isShowBorder) { + if (model.type == 'FLEXIBLE') { + this.leftBoard && this.leftBoard.show(); + this.rightBoard && this.rightBoard.show(); + this.topBoard && this.topBoard.show(); + this.bottomBoard && this.bottomBoard.show(); + } + } // 接车按钮 通过按钮 引导按钮 const showBorderBtn = ['PICK', 'PASS', 'GUIDE']; if (isShowBorder && showBorderBtn.includes(model.type)) { if (this.rectButton) { - if (model.hasSelected) { - this.leftBoard && this.leftBoard.hide(); - this.rightBoard && this.rightBoard.hide(); - this.topBoard && this.topBoard.hide(); - this.bottomBoard && this.bottomBoard.hide(); + if (model.hasSelected || model.pressDown) { + this.leftBoard && this.leftBoard.setStyle('stroke', '#A0A0A0'); + this.topBoard && this.topBoard.setStyle('stroke', '#A0A0A0'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#FFFFFF'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#FFFFFF'); } else { + this.leftBoard && this.leftBoard.setStyle('stroke', '#FFFFFF'); + this.topBoard && this.topBoard.setStyle('stroke', '#FFFFFF'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#A0A0A0'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#A0A0A0'); this.leftBoard && this.leftBoard.show(); this.rightBoard && this.rightBoard.show(); this.topBoard && this.topBoard.show(); this.bottomBoard && this.bottomBoard.show(); } + // else if (model.hasSelected && (model.type == 'PICK' || model.type == 'PASS')) { + // this.leftBoard && this.leftBoard.setStyle('stroke', '#A0A0A0'); + // this.topBoard && this.topBoard.setStyle('stroke', '#A0A0A0'); + // this.rightBoard && this.rightBoard.setStyle('stroke', '#FFFFFF'); + // this.bottomBoard && this.bottomBoard.setStyle('stroke', '#FFFFFF'); } } diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue index d9a626059..03c8e7432 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue @@ -93,6 +93,7 @@ + + diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue index 42bb23329..665be16a3 100644 --- a/src/views/newMap/displayNew/demonChat.vue +++ b/src/views/newMap/displayNew/demonChat.vue @@ -1,6 +1,13 @@ From 03115a3d2bd67090c76ef750351ab4675727ecf6 Mon Sep 17 00:00:00 2001 From: Yuan Date: Thu, 18 Aug 2022 18:08:46 +0800 Subject: [PATCH 51/81] =?UTF-8?q?staging=20=E5=A4=A7=E9=93=81=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/datie_02/menus/components/menu.vue | 77 +++++++++ .../menus/dialog/boardViewSetting.vue | 156 ++++++++++++++++++ 2 files changed, 233 insertions(+) create mode 100644 src/jmapNew/theme/datie_02/menus/components/menu.vue create mode 100644 src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue diff --git a/src/jmapNew/theme/datie_02/menus/components/menu.vue b/src/jmapNew/theme/datie_02/menus/components/menu.vue new file mode 100644 index 000000000..2bee15e49 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/components/menu.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue new file mode 100644 index 000000000..626b668e4 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue @@ -0,0 +1,156 @@ + + + + + From b07d8303a4cefba9e28f39ee79b1d6e0082da8c4 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 19 Aug 2022 13:46:49 +0800 Subject: [PATCH 52/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=AE=A1=E7=90=86=E7=BB=88=E7=AB=AF=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9B=BA=E5=AE=9A=E5=88=97=E8=BD=A6=E5=BE=84?= =?UTF-8?q?=E8=B7=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/utils/menuOperate.js | 8 +- src/scripts/cmdPlugin/CommandEnum.js | 3 +- src/scripts/cmdPlugin/OperationHandler.js | 7 + .../trackInformation.vue | 1 - .../bigTrainRunplanManage/trainFixedPath.vue | 159 ++++++++++++------ 5 files changed, 119 insertions(+), 59 deletions(-) diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 454bcf7e5..2c6b14db9 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -774,9 +774,13 @@ export const menuOperate = { // 获取股道列表 getStationTrack:{ operation: OperationEvent.CTCCommand.getStationTrack.menu.operation, - cmdType: CMD.CTC.CTC_STATION_DETAIL_LIST // TODO + cmdType: CMD.CTC.CTC_STATION_DETAIL_LIST + }, + // 获取固定列车径路列表 + getTrainFixedPath:{ + operation: OperationEvent.CTCCommand.getTrainFixedPath.menu.operation, + cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_LIST }, - setRoute: { operation: OperationEvent.CTCCommand.setRoute.menu.operation, cmdType: CMD.CTC.CTC_SET_ROUTE diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index b12a2314f..fbec07675 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -446,7 +446,8 @@ export default { CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA', label: '导入列车固定径路'}, CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA:{value: 'CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA', label: '删除列车固定径路'}, CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'CTC_RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'}, - CTC_STATION_DETAIL_LIST:{value: 'station_detail_list', label: ' 获取股道列表'}, // TODO + CTC_STATION_DETAIL_LIST:{value: 'STATION_DETAIL_LIST', label: ' 获取股道列表'}, + CTC_REGULAR_TRAIN_LINE_LIST:{value: 'REGULAR_TRAIN_LINE_LIST', label: ' 获取固定列车径路'}, CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 333b63f8b..0268d2d2f 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3965,6 +3965,13 @@ export const OperationEvent = { operation: '1150', domId: 'getStationTrackTerminalStationTree' } + }, + // 获取固定列车径路列表 + getTrainFixedPath:{ + menu: { + operation: '1151', + domId: 'getTrainFixedPathTerminalStationTree' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION diff --git a/src/views/bigTrainRunplanManage/trackInformation.vue b/src/views/bigTrainRunplanManage/trackInformation.vue index 0d211c641..f19fc5ff6 100644 --- a/src/views/bigTrainRunplanManage/trackInformation.vue +++ b/src/views/bigTrainRunplanManage/trackInformation.vue @@ -212,7 +212,6 @@ export default { methods:{ doShow({row, filterSectionMap}) { this.filterSectionList = Object.values(filterSectionMap); - debugger; this.dialogShow = true; this.$nextTick(function () { this.$store.dispatch('training/emitTipFresh'); diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue index 40a553c7e..57386849f 100644 --- a/src/views/bigTrainRunplanManage/trainFixedPath.vue +++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue @@ -2,7 +2,7 @@
- +
@@ -58,8 +58,9 @@ {{ stationMap[scope.row.stationCode].name }} + @@ -72,18 +73,21 @@ {{ scope.row.arriveTime }} + + + @@ -93,8 +97,9 @@
+ @@ -104,8 +109,9 @@
+ @@ -115,8 +121,9 @@
+ @@ -126,8 +133,9 @@
+ @@ -137,135 +145,172 @@
+ + > + + + + + + + + + + + + + + + + + + + + + + @@ -312,11 +357,11 @@ export default { return stationMap; } }, - watch:{ - '$store.state.socket.railCtcStationManageRpChange': function (val) { - this.handleData(); - } - }, + // watch:{ + // '$store.state.socket.railCtcStationManageRpChange': function (val) { + // this.handleData(); + // } + // }, methods:{ selectedSection(row, column, event) { this.currentRow = row; @@ -332,7 +377,7 @@ export default { this.filterSectionMap[section.code] = {code:section.code, name:section.name}; } }); - this.handleData(); + this.handleData(stationCode); }, addRunplan() { this.$refs.addRunplan.doShow({ @@ -436,16 +481,20 @@ export default { coverTime(time) { return time ? time.split(':').splice(0, 2).join(':') : ''; }, - handleData() { - this.tableData = []; - this.currentRow = null; - const railCtcStationManageRpMsg = copyAssign({}, this.$store.state.socket.railCtcStationManageRpMsg); - this.tableData = Object.values(railCtcStationManageRpMsg).filter(data=>{ - data.arriveTime = this.coverTime(data.arriveTime); - data.departTime = this.coverTime(data.departTime); - return data.stationCode == this.currentStationCode; - + handleData(stationCode) { + commitOperate(menuOperate.CTC.getTrainFixedPath, { stationCode: stationCode }, 3).then(({valid, response}) => { + if (valid) { + this.tableData = response.data; + } }); + this.currentRow = null; + // const railCtcStationManageRpMsg = copyAssign({}, this.$store.state.socket.railCtcStationManageRpMsg); + // this.tableData = Object.values(railCtcStationManageRpMsg).filter(data=>{ + // data.arriveTime = this.coverTime(data.arriveTime); + // data.departTime = this.coverTime(data.departTime); + // return data.stationCode == this.currentStationCode; + + // }); // stationCode 车站编码 // trackSectionCode 运行计划的默认股道 // arriveTripNumber 到达车次 From b7b5f0150cc942b7c39b42e0730e57c9eb3275ac Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 19 Aug 2022 15:52:00 +0800 Subject: [PATCH 53/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=AE=A1=E7=90=86=E7=BB=88=E7=AB=AF=20(?= =?UTF-8?q?=E5=88=A0=E9=99=A4/=E6=B8=85=E7=A9=BA)=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=88=97=E8=BD=A6=E5=BE=84=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/utils/menuOperate.js | 7 +++++- src/scripts/cmdPlugin/CommandEnum.js | 5 ++-- src/scripts/cmdPlugin/OperationHandler.js | 7 ++++++ .../bigTrainRunplanManage/trainFixedPath.vue | 23 +++++++++++++++++-- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 2c6b14db9..0a0a44a56 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -764,7 +764,12 @@ export const menuOperate = { // 删除列车固定径路 deleteTrainFixedPath:{ operation: OperationEvent.CTCCommand.deleteTrainFixedPath.menu.operation, - cmdType: CMD.CTC.CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA + cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_DELETE + }, + // 清空列车固定径路 + clearTrainFixedPath:{ + operation: OperationEvent.CTCCommand.clearTrainFixedPath.menu.operation, + cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_CLEAR }, // 运行计划发布至CTC releaseTrainFixedPath:{ diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index fbec07675..3fe89bca0 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -444,8 +444,9 @@ export default { CTC_ADD_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_ADD_RUN_PLAN_LIST_TO_EDIT_AREA', label: '增加列车固定径路'}, CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA', label: '导入列车固定径路'}, - CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA:{value: 'CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA', label: '删除列车固定径路'}, - CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'CTC_RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'}, + CTC_REGULAR_TRAIN_LINE_CLEAR:{value: 'REGULAR_TRAIN_LINE_CLEAR', label: '清空列车固定径路'}, + CTC_REGULAR_TRAIN_LINE_DELETE:{value: 'REGULAR_TRAIN_LINE_DELETE', label: '删除列车固定径路'}, + CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'}, CTC_STATION_DETAIL_LIST:{value: 'STATION_DETAIL_LIST', label: ' 获取股道列表'}, CTC_REGULAR_TRAIN_LINE_LIST:{value: 'REGULAR_TRAIN_LINE_LIST', label: ' 获取固定列车径路'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 0268d2d2f..2c32af276 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3972,6 +3972,13 @@ export const OperationEvent = { operation: '1151', domId: 'getTrainFixedPathTerminalStationTree' } + }, + // 清空列车固定径路 + clearTrainFixedPath:{ + menu: { + operation: '1152', + domId: '_Tips-CTC-clearTrainFixedPath-Menu{TOP}' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue index 57386849f..a80c7ceb8 100644 --- a/src/views/bigTrainRunplanManage/trainFixedPath.vue +++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue @@ -13,7 +13,7 @@ 基本图申请 其他站导入 删除 - 全部清空 + 全部清空 修改 查找 导出excel @@ -395,7 +395,8 @@ export default { type: 'warning' }).then(() => { // stationCode 车站编码 - const param = {stationCode:this.currentRow.stationCode, runPlanCode:this.currentRow.runPlanCode}; + // runPlanCode:this.currentRow.runPlanCode + const param = {stationCode:this.currentRow.stationCode, code:this.currentRow.code }; commitOperate(menuOperate.CTC.deleteTrainFixedPath, param, 3).then(({valid})=>{ if (valid) { that.$message.success('删除成功！'); @@ -406,6 +407,24 @@ export default { }).catch(e => {}); } }, + clearRunplan() { + const that = this; + this.$confirm('确定清空该站的所有列车路径数据?', '警告', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // stationCode 车站编码 + const param = {stationCode:this.currentStationCode}; + commitOperate(menuOperate.CTC.clearTrainFixedPath, param, 3).then(({valid})=>{ + if (valid) { + that.$message.success('清空成功！'); + } + }).catch(() => { + that.$message.error('清空失败'); + }); + }).catch(e => {}); + }, noticeInfo() { this.$emit('noticeInfo'); }, From e8af1d813f0a8be3ad259ce30d3b0f01ddd3e468 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 19 Aug 2022 16:58:27 +0800 Subject: [PATCH 54/81] =?UTF-8?q?=E5=8D=A0=E7=BA=BF=E6=9D=BF=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/boardViewSetting.vue | 197 +++++++++++++++++- 1 file changed, 190 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue index 626b668e4..7d8201a82 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/boardViewSetting.vue @@ -65,9 +65,165 @@
-
-
-
+
+
+
+
沈阳&沈阳北
+
沈阳
+
+
+
+
类型
+ + 列车进路序列 + +
+
+ 增加显示格 + 删除显示格 +
+
+
+
+
+
沈阳
+
沈阳北
+
+
+
+ + + +
+
+ 增加序列 + 删除序列 +
+
+
+
+
+
+
+
+ 占线板操作按钮宽度 + + 像素 +
+
+ 占线板流程按钮宽度 + + 像素 +
+
+ 占线板进路按钮宽度 + + 像素 +
+
+ 占线板控制按钮宽度 + + 像素 +
+
+ 占线板车次号宽度 + + 像素 +
+
+ 占线板车站名显示 + + 字符 +
+
+
+
+ 占线板列车状态显示 + + 字符 +
+
+ 占线板时间显示 + + 字符 +
+
+ 占线板线路显示 + + 字符 +
+
+ 占线板工作信息显示 + + 字符 +
+
+ 占线板流程按钮字体 + + 像素 +
+
+
+
+ 占线板文字信息字体 + + 像素 +
+
+ 占线板进路操作框高 + + 像素 +
+
+ 占线板进路操作框宽 + + 像素 +
+
+ 机车换挂按钮个数 + +
+
+ 显示图定时刻 +
+
+
+
+
+
+
+
沈阳&沈阳北
+
沈阳
+
+
+
+
+ 列车进路预览 + 调车进路预览 +
+
+ 车站 + + 沈阳 + +
+
+ 预览 + + 沈阳 + +
+
+ 增加 + 删除 +
+
+
生成默认股道视图设置 @@ -120,10 +276,9 @@ export default { diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index 641d416fc..31bd4f5b6 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -8,6 +8,7 @@
+ @@ -17,13 +18,14 @@ import { getTrainingList} from '@/api/trainingManage'; import Cookies from 'js-cookie'; import ConstConfig from '@/scripts/ConstConfig'; import Create from './create.vue'; -import { deleteTraining, publishTraining } from '@/api/trainingManage'; -import { admin, superAdmin} from '@/router/index'; +import EditBlob from './editBlob.vue'; +import { deleteTraining, publishTraining, updateTrainingBlob } from '@/api/trainingManage'; export default { name: 'TrainingList', components:{ - Create + Create, + EditBlob }, props: {}, data() { @@ -135,6 +137,7 @@ export default { }, drawUp(index, row) { console.log('编辑', index, row); + this.$refs.EditBlob.doShow(row); }, handleModify(index, row) { console.log('修改', index, row); From 0d5efd0941a550efd5b63fcc7a06d00facc8a4ac Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 22 Aug 2022 09:24:56 +0800 Subject: [PATCH 57/81] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 6 + src/views/designPlatform/demonList.vue | 25 +- src/views/designPlatform/leftSlider.vue | 158 +++++++++ .../designPlatform/tipTrainingDetail.vue | 305 ++++++++++++++++++ src/views/designPlatform/trainingPreview.vue | 186 +++++++++++ 5 files changed, 679 insertions(+), 1 deletion(-) create mode 100644 src/views/designPlatform/leftSlider.vue create mode 100644 src/views/designPlatform/tipTrainingDetail.vue create mode 100644 src/views/designPlatform/trainingPreview.vue diff --git a/src/router/index.js b/src/router/index.js index 03a46f75a..e7a4c0a99 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -118,6 +118,7 @@ const MapPreviewNew = () => import('@/views/designPlatform/mapPreviewNew'); const BigScreen = () => import('@/views/designPlatform/bigScreen'); const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen'); const TrainingDesign = () => import('@/views/designPlatform/trainingDesign'); +const TrainingPreview = () => import('@/views/designPlatform/trainingPreview'); const TestRunplan = () => import('@/views/designPlatform/testRunplan'); const Package = () => import('@/views/package/index'); @@ -485,6 +486,11 @@ export const publicAsyncRoute = [ component: TrainingDesign, hidden: true }, + { + path: '/trainingPreview', + component: TrainingPreview, + hidden: true + }, { path: '/jointTrainingNew', component: JointTrainingNew, diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index db764c81c..9cd295265 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -93,6 +93,7 @@ export default { } }, clickEvent(obj, data, ele) { + console.log(obj.type, '----------'); switch (obj.type) { case 'scriptDesign': { const query = {lineCode:obj.lineCode}; @@ -147,6 +148,19 @@ export default { }); break; } + case 'trainingPreview': { + const data = { mapId: obj.mapId, prdType: '01' }; + createSimulationNew(data).then(resp => { + if (this.loadingProjectList.includes(this.project)) { + this.$store.dispatch('app/transitionAnimations'); + } + const query = { ...data, group: resp.data, scriptId: obj.id, lineCode:obj.lineCode}; + this.$router.push({ path: `/trainingPreview`, query }); + }).catch(error => { + this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`); + }); + break; + } } }, async refresh(filterSelect) { @@ -230,7 +244,16 @@ export default { cityCode: elem.cityCode } ); - + elem.children.push( + { + id: '10', + name: '实训预览', + type: 'trainingPreview', + mapId: elem.id, + lineCode: elem.lineCode, + cityCode: elem.cityCode + } + ); }); this.treeData = res.data; diff --git a/src/views/designPlatform/leftSlider.vue b/src/views/designPlatform/leftSlider.vue new file mode 100644 index 000000000..e8fb5dd57 --- /dev/null +++ b/src/views/designPlatform/leftSlider.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/designPlatform/tipTrainingDetail.vue b/src/views/designPlatform/tipTrainingDetail.vue new file mode 100644 index 000000000..02da179fb --- /dev/null +++ b/src/views/designPlatform/tipTrainingDetail.vue @@ -0,0 +1,305 @@ + + + + diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue new file mode 100644 index 000000000..ebc401f9a --- /dev/null +++ b/src/views/designPlatform/trainingPreview.vue @@ -0,0 +1,186 @@ + + + From 718953a8f7dad35331c775e692640f069dd844fd Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 22 Aug 2022 10:32:49 +0800 Subject: [PATCH 58/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=AE=A1=E7=90=86=E7=BB=88=E7=AB=AF=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=82=A1=E9=81=93=E5=88=97=E8=A1=A8=20?= =?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 --- .../theme/components/utils/menuOperate.js | 5 +++ src/scripts/cmdPlugin/CommandEnum.js | 2 +- src/scripts/cmdPlugin/OperationHandler.js | 7 ++++ .../bigTrainRunplanManage/stationTrack.vue | 35 ++++++++++++++----- .../trackInformation.vue | 32 ++++++++--------- .../newMap/jointTrainingNew/menuSchema.vue | 2 +- 6 files changed, 56 insertions(+), 27 deletions(-) diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 6d445a1e5..9d79f9638 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -781,6 +781,11 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.getStationTrack.menu.operation, cmdType: CMD.CTC.CTC_STATION_DETAIL_LIST }, + // 股道发布生效区 + releaseStationTrack:{ + operation: OperationEvent.CTCCommand.releaseStationTrack.menu.operation, + cmdType: CMD.CTC.CTC_STATION_DETAIL_PUBLISH + }, // 获取固定列车径路列表 getTrainFixedPath:{ operation: OperationEvent.CTCCommand.getTrainFixedPath.menu.operation, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 019560044..a2afc54aa 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -448,7 +448,7 @@ export default { CTC_REGULAR_TRAIN_LINE_DELETE:{value: 'REGULAR_TRAIN_LINE_DELETE', label: '删除列车固定径路'}, // CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'}, CTC_REGULAR_TRAIN_LINE_PUBLISH:{value: 'REGULAR_TRAIN_LINE_PUBLISH', label: '列车固定径路发布生效区'}, - + CTC_STATION_DETAIL_PUBLISH:{value: 'STATION_DETAIL_PUBLISH', label: '股道发布生效区'}, CTC_STATION_DETAIL_LIST:{value: 'STATION_DETAIL_LIST', label: ' 获取股道列表'}, CTC_REGULAR_TRAIN_LINE_LIST:{value: 'REGULAR_TRAIN_LINE_LIST', label: ' 获取固定列车径路'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 2c32af276..985e6eee6 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3979,6 +3979,13 @@ export const OperationEvent = { operation: '1152', domId: '_Tips-CTC-clearTrainFixedPath-Menu{TOP}' } + }, + // 股道发布生效区 + releaseStationTrack:{ + menu: { + operation: '1153', + domId: '_Tips-CTC-releaseStationTrack-Menu{TOP}' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION diff --git a/src/views/bigTrainRunplanManage/stationTrack.vue b/src/views/bigTrainRunplanManage/stationTrack.vue index 5f89ea6be..28c637c18 100644 --- a/src/views/bigTrainRunplanManage/stationTrack.vue +++ b/src/views/bigTrainRunplanManage/stationTrack.vue @@ -13,7 +13,7 @@
版本号 备份 - 更新至生效区 + 更新至生效区 导入 比较
@@ -37,6 +37,13 @@ label="序号" width="100" /> + { + if (valid) { + that.$message.success('发布成功！'); + } + }).catch(() => { + that.$message.error('发布失败'); + }); } } }; diff --git a/src/views/bigTrainRunplanManage/trackInformation.vue b/src/views/bigTrainRunplanManage/trackInformation.vue index f19fc5ff6..3961b761a 100644 --- a/src/views/bigTrainRunplanManage/trackInformation.vue +++ b/src/views/bigTrainRunplanManage/trackInformation.vue @@ -14,8 +14,8 @@ - - + + - - + + - - + + - - + + Date: Mon, 22 Aug 2022 10:44:26 +0800 Subject: [PATCH 59/81] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E6=9F=AF=E6=98=BE?= =?UTF-8?q?=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/views/newMap/displayNew/index.vue | 2 +- src/views/newMap/displayNew/menuDemon.vue | 11 +++++++---- src/views/newMap/displayNew/menuSchema.vue | 6 +++--- src/views/newMap/jointTrainingNew/index.vue | 2 +- src/views/newMap/jointTrainingNew/menuDemon.vue | 12 ++++++------ src/views/newMap/jointTrainingNew/menuSchema.vue | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index dd3314885..4c531db3f 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -15,7 +15,7 @@ - + + + diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index cab5f5b57..4810414c2 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -1,6 +1,5 @@ @@ -48,13 +48,15 @@ import ShutdownPic from '@/assets/ctc_icon/shutdown.png' import { EventBus } from '@/scripts/event-bus' import SettingsMenu from './components/menu.vue' import BoardViewSetting from './dialog/boardViewSetting.vue' +import RailViewSetting from './dialog/railViewSetting.vue' export default { - name: 'RouteCreate', + name: 'MenuPanel', components: { NoticeInfo, SettingsMenu, BoardViewSetting, + RailViewSetting, }, data() { return { @@ -71,7 +73,7 @@ export default { activeMenu: '', settingsMenuItems: [ { label: '占线板视图设置', id: 'boardView' }, - { label: '股道视图显示设置', id: 'trackView' }, + { label: '股道视图显示设置', id: 'railView' }, { label: '方向显示设置', id: 'directionView', @@ -102,14 +104,14 @@ export default { { label: '版本信息', id: 'version' }, ], T3MenuItems: [ - { label: '设置供电臂状态', id: 'powerSupplyArm' }, - { label: '封锁设备操作', id: 'blockedDeviceOperation' }, - { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}] }, - { label: '站存车管理', id: 'stationTrainManage', children: [{}] }, - { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}] }, - { label: '操作日志查询', id: 'operationLog' }, - { label: '防溜设置查询', id: 'deviceAffectAnalyze' }, - { label: '设备影响分析', id: 'deviceAffectAnalyze' }, + { label: '设置供电臂状态', id: 'powerSupplyArm', ctc: true }, + { label: '封锁设备操作', id: 'blockedDeviceOperation', ctc: true }, + { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}], ctc: true }, + { label: '站存车管理', id: 'stationTrainManage', children: [{}], ctc: true }, + { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}], ctc: true }, + { label: '操作日志查询', id: 'operationLog', ctc: true }, + { label: '防溜设置查询', id: 'deviceAffectAnalyze', ctc: true }, + { label: '设备影响分析', id: 'deviceAffectAnalyze', ctc: true }, ], } }, @@ -150,7 +152,6 @@ export default { mounted() { this.dragEvent() // 24 window.addEventListener('click', this.closeMenus) - window.addEventListener('click', this.closeMenus) }, unmounted() { window.removeEventListener('click', this.closeMenus) @@ -180,6 +181,9 @@ export default { case 'boardView': this.$refs.boardViewSetting.doShow() break + case 'railView': + this.$refs.railViewSetting.doShow() + break } }, handleT3MenuSelect(id) { @@ -250,14 +254,6 @@ export default { From 0664688a5c5fa5e87b6616e66c42428a1a0e9c8e Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 23 Aug 2022 09:24:36 +0800 Subject: [PATCH 66/81] =?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 --- src/jmapNew/shape/graph/element/EControl.js | 6 +++--- src/views/designPlatform/trainingPreview.vue | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/shape/graph/element/EControl.js b/src/jmapNew/shape/graph/element/EControl.js index c9cb12aa4..9ce8c7864 100644 --- a/src/jmapNew/shape/graph/element/EControl.js +++ b/src/jmapNew/shape/graph/element/EControl.js @@ -13,12 +13,12 @@ export default class EControl extends Group { this.z = model.z; this.style = model.style; this.textStyle = model.text; - this.controlStyle = model.control; + this.controlStyle = model.control || model.arc; this.create(); } create() { - this.control = this.controlStyle.isSquare ? new Rect({ + this.control = this.controlStyle && this.controlStyle.isSquare ? new Rect({ _subType: this.controlStyle.subType, zlevel: this.zlevel, z: this.z, @@ -26,7 +26,7 @@ export default class EControl extends Group { width: this.controlStyle.shape.r, height: this.controlStyle.shape.r, x: this.controlStyle.shape.cx - this.controlStyle.shape.r / 2, - y: this.controlStyle.shape.cy - this.controlStyle.shape.r / 2, + y: this.controlStyle.shape.cy - this.controlStyle.shape.r / 2 }, style: { lineWidth: this.controlStyle.lineWidth, diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue index ebc401f9a..53fba2f20 100644 --- a/src/views/designPlatform/trainingPreview.vue +++ b/src/views/designPlatform/trainingPreview.vue @@ -9,6 +9,8 @@
+ 开始 + 结束 返回
@@ -38,14 +40,16 @@ export default { props: { widthLeft: { type: Number, - default: 0, - trainingObj: null + default: 0 } }, data() { return { maskOpen: false, - offsetBottom: 0 + offsetBottom: 0, + trainingObj: null, + starting: false + }; }, computed: { From 6d8f209cbbc82df4fa3137ad10b7d27a65d1df4e Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 23 Aug 2022 10:25:04 +0800 Subject: [PATCH 67/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=AE=A1=E7=90=86=E7=BB=88=E7=AB=AF=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=87=BA=E5=85=A5=E5=8F=A3=E5=88=97=E8=A1=A8?= =?UTF-8?q?=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 --- .../theme/components/utils/menuOperate.js | 5 + src/scripts/cmdPlugin/CommandEnum.js | 1 + src/scripts/cmdPlugin/OperationHandler.js | 7 ++ .../stationDirection.vue | 114 +++++++++++++++++- .../trackInformation.vue | 1 + 5 files changed, 124 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 2a91b5e1e..6aff4f4f7 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -796,6 +796,11 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.getTrainFixedPath.menu.operation, cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_LIST }, + // 获取出入口列表 + getStationDirection:{ + operation: OperationEvent.CTCCommand.getStationDirection.menu.operation, + cmdType: CMD.CTC.CTC_STATION_IO_GATE_LIST + }, // 出入口发布生效区 releaseStationDirection:{ operation: OperationEvent.CTCCommand.releaseStationDirection.menu.operation, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 2e7506999..eecebce02 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -453,6 +453,7 @@ export default { CTC_REGULAR_TRAIN_LINE_LIST:{value: 'REGULAR_TRAIN_LINE_LIST', label: ' 获取固定列车径路'}, CTC_STATION_DETAIL_EDIT:{value: 'STATION_DETAIL_EDIT', label: '修改股道信息'}, CTC_STATION_IO_GATE_PUBLISH:{value: 'STATION_IO_GATE_PUBLISH', label: '出入口发布生效区'}, + CTC_STATION_IO_GATE_LIST:{value: 'STATION_IO_GATE_LIST', label: '获取出入口列表'}, CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 9ad1c1bf6..8cb1fe084 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -4000,6 +4000,13 @@ export const OperationEvent = { operation: '1155', domId: '_Tips-CTC-releaseStationDirection-Menu{TOP}' } + }, + // 获取出入口列表 + getStationDirection:{ + menu: { + operation: '1156', + domId: '_Tips-CTC-getStationDirection-Menu{TOP}' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION diff --git a/src/views/bigTrainRunplanManage/stationDirection.vue b/src/views/bigTrainRunplanManage/stationDirection.vue index b0a280052..4fc82c8dc 100644 --- a/src/views/bigTrainRunplanManage/stationDirection.vue +++ b/src/views/bigTrainRunplanManage/stationDirection.vue @@ -19,7 +19,59 @@
- {{ '' }} + + + + + + + + + + + + + + +
@@ -27,6 +79,7 @@ + + + diff --git a/src/views/bigTrainRunplanManage/stationDirection.vue b/src/views/bigTrainRunplanManage/stationDirection.vue index 4fc82c8dc..b3711fb22 100644 --- a/src/views/bigTrainRunplanManage/stationDirection.vue +++ b/src/views/bigTrainRunplanManage/stationDirection.vue @@ -74,16 +74,18 @@ + diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index de128faf7..5eb166b7e 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -133,9 +133,14 @@ export default { }, methods: { addStep() { + const lastIndex = this.queryList.data.length - 1; + let mId = ''; + if (this.queryList.data[lastIndex]) { + mId = this.queryList.data[lastIndex].memberId || ''; + } const obj = { - id: this.queryList.data.length + 1 + '', - memberId: '', + id: lastIndex + 2 + '', + memberId: mId, description: '' // triggerCondition: [], // completionCondition:[], @@ -146,7 +151,13 @@ export default { }, handleDelete(index, row) { console.log('删除', index, row); - this.queryList.data.splice(index, 1); + this.$confirm('确定删除该条步骤数据?', '警告', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.queryList.data.splice(index, 1); + }).catch(e => {}); }, minisize() { this.dialogVisible = true; @@ -167,10 +178,12 @@ export default { list.push(obj); }); updateTrainingStep(this.editData.id, list).then(res => { - console.log('更新大数据成功', res); + console.log('保存步骤成功！', res); + this.$message.success('保存步骤成功！'); this.doClose(); }).catch(err => { - console.log('更新大数据错误', err); + console.log('保存步骤失败', err); + this.$message.error('保存步骤失败'); }); }, doClose() { @@ -204,21 +217,24 @@ export default { }); }, updateMapLocation() { - console.log('更新地图定位'); const data = Vue.prototype.$jlmap.$options; const params = {scale: data.scaleRate, x: data.offsetX, y: data.offsetY}; updateTrainingMaplocation({id: this.editData.id, mapLocationJson: JSON.stringify(params)}).then(res => { - console.log('保存背景', res); + console.log('保存地图定位成功！', res); + this.$message.success('保存地图定位成功！'); this.formModel.mapLocationJson = JSON.stringify(params); }).catch(err => { - console.log('保存背景失败', err); + console.log('保存地图定位失败', err); + this.$message.error('保存地图定位失败'); }); }, saveScenesStage() { updateTrainingBackgroud({id: this.editData.id, groupId: this.group}).then(res => { console.log('保存背景', res); + this.$message.success('保存背景成功！'); }).catch(err => { console.log('保存背景失败', err); + this.$message.error('保存背景失败'); }); } } diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index 5b272ef8f..d601bddfa 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -53,6 +53,7 @@ export default { }, { title: this.$t('trainingManage.type'), + width: '70', prop: 'type', type: 'tag', columnValue: (row) => { return this.covertData(row); }, @@ -60,12 +61,16 @@ export default { }, { title: this.$t('trainingManage.labelJson'), - prop: 'labelJson' + width: '200', + prop: 'labelJson', + type: 'tagMore', + columnValue: (row) => { return this.labelJsonData(row); }, + tagType: (row) => { return ''; } }, { type: 'button', title: this.$t('trainingManage.operate'), - width: '450', + width: '360', buttons: [ { name: this.$t('trainingManage.record'), @@ -139,6 +144,11 @@ export default { } return lastData.type; }, + labelJsonData(row) { + const sList = row.labelJson ? JSON.parse(row.labelJson) : []; + const list = Object.prototype.toString.call(sList) === '[object Array]' ? sList : [sList]; + return list; + }, drawUp(index, row) { console.log('编辑', index, row); this.$emit('updateDetails', row); @@ -151,22 +161,30 @@ export default { }, deleteScript(index, row) { console.log('删除', index, row); - if (!row.id) { return; } - deleteTraining([row.id]).then(res => { - console.log('删除实训成功', res); - this.getListData(); - }).catch(err => { - console.log('删除实训失败', err); - this.getListData(); - }); + this.$confirm('确定删除该条实训数据?', '警告', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + if (!row.id) { return; } + deleteTraining([row.id]).then(res => { + console.log('删除实训成功', res); + this.getListData(); + }).catch(err => { + console.log('删除实训失败', err); + this.getListData(); + }); + }).catch(e => {}); }, publishScript(index, row) { console.log('发布', index, row); if (!row.id) { return; } publishTraining({draftId: row.id}).then(res => { console.log('发布实训成功', res); + this.$message.success('发布实训成功！'); }).catch(err => { console.log('发布实训失败', err); + this.$message.error('发布实训失败'); }); }, previewScript(index, row) { From d0c3ca304d3e75e64e434439ffa08ad88acdb32f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 23 Aug 2022 17:59:04 +0800 Subject: [PATCH 74/81] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=AE=A1=E7=90=86=E7=BB=88=E7=AB=AF=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=A2=9E=E5=8A=A0=E5=88=97=E8=BD=A6=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=BE=84=E8=B7=AF=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/utils/menuOperate.js | 6 + src/scripts/cmdPlugin/CommandEnum.js | 1 + src/scripts/cmdPlugin/OperationHandler.js | 7 + .../batchTrainFxPath.vue | 306 ++++++++++++++++++ .../bigTrainRunplanManage/trainFixedPath.vue | 15 +- 5 files changed, 333 insertions(+), 2 deletions(-) create mode 100644 src/views/bigTrainRunplanManage/batchTrainFxPath.vue diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index a66a391f0..d35626233 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -756,6 +756,12 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.addTrainFixedPath.menu.operation, cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_EDIT }, + // 批量增加列车固定径路 + batchTrainFixedPath:{ + operation: OperationEvent.CTCCommand.batchTrainFixedPath.menu.operation, + cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_BATCH + }, + // 导入列车固定径路 importTrainFixedPath:{ operation: OperationEvent.CTCCommand.importTrainFixedPath.menu.operation, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index c033c316b..41216365f 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -456,6 +456,7 @@ export default { CTC_STATION_IO_GATE_LIST:{value: 'STATION_IO_GATE_LIST', label: '获取出入口列表'}, CTC_STATION_IO_GATE_EDIT:{value: 'STATION_IO_GATE_EDIT', label: '修改出入口'}, CTC_REGULAR_TRAIN_LINE_EDIT:{value: 'REGULAR_TRAIN_LINE_EDIT', label: '增加列车固定径路'}, + CTC_REGULAR_TRAIN_LINE_BATCH:{value: 'REGULAR_TRAIN_LINE_BATCH', label: '批量增加列车固定径路'}, CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index eec3fbbfe..4d750df27 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -4014,6 +4014,13 @@ export const OperationEvent = { operation: '1157', domId: '_Tips-CTC-modifyStationDirection-Menu{TOP}' } + }, + // 批量增加列车固定径路 + batchTrainFixedPath:{ + menu: { + operation: '1158', + domId: '_Tips-CTC-batchTrainFixedPath-Menu{TOP}' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION diff --git a/src/views/bigTrainRunplanManage/batchTrainFxPath.vue b/src/views/bigTrainRunplanManage/batchTrainFxPath.vue new file mode 100644 index 000000000..8a2f04acb --- /dev/null +++ b/src/views/bigTrainRunplanManage/batchTrainFxPath.vue @@ -0,0 +1,306 @@ + + + diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue index 08a40f1dc..0668362ee 100644 --- a/src/views/bigTrainRunplanManage/trainFixedPath.vue +++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue @@ -8,7 +8,7 @@
增加 - 批量增加 + 批量增加 基本图导入 基本图申请 其他站导入 @@ -211,7 +211,7 @@ width="40" > @@ -317,6 +317,7 @@
+ + diff --git a/src/views/designPlatform/leftSlider.vue b/src/views/designPlatform/leftSlider.vue index e8fb5dd57..8c0db41d0 100644 --- a/src/views/designPlatform/leftSlider.vue +++ b/src/views/designPlatform/leftSlider.vue @@ -37,7 +37,7 @@ + diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue index 53fba2f20..e2b3c80b3 100644 --- a/src/views/designPlatform/trainingPreview.vue +++ b/src/views/designPlatform/trainingPreview.vue @@ -5,11 +5,9 @@ - -
- 开始 + 开始 结束 返回 @@ -24,18 +22,16 @@ import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; import { getToken } from '@/utils/auth'; import chatBox from '@/views/newMap/chatView/chatBox.vue'; import VoiceChatBox from '@/views/newMap/chatView/voiceChatBox.vue'; -import MenuDemon from '@/views/trainingManage/demonMenu.vue'; -import LeftSlider from './leftSlider'; -import TipTrainingDetail from './tipTrainingDetail'; +import MenuDemon from './demonMenu.vue'; +// import LeftSlider from './leftSlider'; +// import TipTrainingDetail from './tipTrainingDetail'; export default { name: 'TrainingDesign', components: { JlmapVisual, MenuDemon, chatBox, - VoiceChatBox, - LeftSlider, - TipTrainingDetail + VoiceChatBox }, props: { widthLeft: { diff --git a/src/views/publish/publishTraining/index.vue b/src/views/publish/publishTraining/index.vue index 63070a6ce..14098aa62 100644 --- a/src/views/publish/publishTraining/index.vue +++ b/src/views/publish/publishTraining/index.vue @@ -5,7 +5,7 @@ - - diff --git a/src/views/designPlatform/tipTrainingDetail.vue b/src/views/designPlatform/tipTrainingDetail.vue deleted file mode 100644 index 02da179fb..000000000 --- a/src/views/designPlatform/tipTrainingDetail.vue +++ /dev/null @@ -1,305 +0,0 @@ - - - - diff --git a/src/views/designPlatform/trainingList.vue b/src/views/designPlatform/trainingList.vue index d1daa459f..bbca1a900 100644 --- a/src/views/designPlatform/trainingList.vue +++ b/src/views/designPlatform/trainingList.vue @@ -2,8 +2,8 @@
-
{{ `当前实训名称：${training.name || ''}` }}
-
{{ `当前实训描述：${training.description || ''}` }}
+
{{ `当前实训名称：${training.name || ''}` }}
+
{{ `当前实训描述：${training.description || ''}` }}
实训列表
@@ -15,7 +15,7 @@ + + + diff --git a/src/views/publish/publishTraining/index.vue b/src/views/publish/publishTraining/index.vue index 14098aa62..119b8bcbe 100644 --- a/src/views/publish/publishTraining/index.vue +++ b/src/views/publish/publishTraining/index.vue @@ -65,9 +65,9 @@ export default { type: 'tag', width: '120', columnValue: (row) => { - if (row.type === 'single') { + if (row.type === 'SINGLE') { return '单操'; - } else if (row.type === 'scene') { + } else if (row.type === 'SCENE') { return '场景'; } else { return ''; @@ -134,9 +134,9 @@ export default { this.mapList = []; getPublishMapListOnline().then(resp => { this.mapList = resp.data; - this.mapList.forEach(elem => { - this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name}); - }); + // this.mapList.forEach(elem => { + // this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name}); + // }); }); }, handlePutaway(index, row) {