From 201f80d7940f91008af075ff8f2f85df7261d31b Mon Sep 17 00:00:00 2001 From: Yuan Date: Mon, 22 Aug 2022 16:01:05 +0800 Subject: [PATCH 001/212] =?UTF-8?q?=E7=94=B5=E5=8A=9B=E8=87=82=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/powerSupplyArmSetting.vue | 114 ++++++++++++++++++ .../datie_02/menus/dialog/railViewSetting.vue | 8 +- .../theme/datie_02/menus/menuPanel.vue | 10 ++ 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue diff --git a/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue new file mode 100644 index 000000000..80d49c381 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue index 6a3a8986f..31f54c8c8 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue @@ -31,7 +31,10 @@
车站 - + + + +
@@ -92,6 +95,9 @@ export default { data() { return { show: false, + form: { + station: 'shenyang', + }, } }, methods: { diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index 4810414c2..a58fe21bb 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -31,6 +31,7 @@ +
@@ -49,6 +50,7 @@ import { EventBus } from '@/scripts/event-bus' import SettingsMenu from './components/menu.vue' import BoardViewSetting from './dialog/boardViewSetting.vue' import RailViewSetting from './dialog/railViewSetting.vue' +import PowerSupplyArmSetting from './dialog/powerSupplyArmSetting.vue' export default { name: 'MenuPanel', @@ -57,6 +59,7 @@ export default { SettingsMenu, BoardViewSetting, RailViewSetting, + PowerSupplyArmSetting, }, data() { return { @@ -188,6 +191,13 @@ export default { }, handleT3MenuSelect(id) { console.log(id) + this.closeMenus() + const params = id.split('-') + switch (params[0]) { + case 'powerSupplyArm': + this.$refs.powerSupplyArmSetting.doShow() + break + } }, dragEvent() { const offset = this.offset From 0aeb991e86a8e0b22e29c2b9b469993b98ea6b60 Mon Sep 17 00:00:00 2001 From: Yuan Date: Mon, 22 Aug 2022 16:29:33 +0800 Subject: [PATCH 002/212] =?UTF-8?q?=E5=B0=81=E9=94=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datie_02/menus/dialog/blockDevice.vue | 128 ++++++++++++++++++ .../theme/datie_02/menus/menuPanel.vue | 6 + 2 files changed, 134 insertions(+) create mode 100644 src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue diff --git a/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue b/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue new file mode 100644 index 000000000..d960ada1e --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index a58fe21bb..b6c7c473c 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -32,6 +32,7 @@ +
@@ -51,6 +52,7 @@ import SettingsMenu from './components/menu.vue' import BoardViewSetting from './dialog/boardViewSetting.vue' import RailViewSetting from './dialog/railViewSetting.vue' import PowerSupplyArmSetting from './dialog/powerSupplyArmSetting.vue' +import BlockDevice from './dialog/blockDevice' export default { name: 'MenuPanel', @@ -60,6 +62,7 @@ export default { BoardViewSetting, RailViewSetting, PowerSupplyArmSetting, + BlockDevice, }, data() { return { @@ -197,6 +200,9 @@ export default { case 'powerSupplyArm': this.$refs.powerSupplyArmSetting.doShow() break + case 'blockedDeviceOperation': + this.$refs.blockDevice.doShow() + break } }, dragEvent() { From 2f87a198641561b38291454b732c26b1c0ff95a0 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 25 Aug 2022 11:29:02 +0800 Subject: [PATCH 003/212] =?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=BB=88=E7=AB=AF=20=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=BB=8F=E8=B7=AF=E4=BB=8E=E7=94=9F=E6=95=88?= =?UTF-8?q?=E5=8C=BA=E6=9B=B4=E6=96=B0=E3=80=81=E6=9B=B4=E6=96=B0=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=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 | 15 ++ src/jmapNew/theme/datie_02/menus/menuBar.vue | 26 ++- .../menus/menuDialog/trainFixedPathPane.vue | 184 ++++++++++++++++++ src/scripts/cmdPlugin/CommandEnum.js | 4 + src/scripts/cmdPlugin/OperationHandler.js | 21 ++ 5 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index d35626233..b09702c7b 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -761,6 +761,21 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.batchTrainFixedPath.menu.operation, cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_BATCH }, + // 固定列车径路从生效区更新 + updateTrainFixedPath2Station:{ + operation: OperationEvent.CTCCommand.updateTrainFixedPath2Station.menu.operation, + cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_STATION_UPDATE + }, + // 固定列车经路更新列表 + getStationTrainFixedPath:{ + operation: OperationEvent.CTCCommand.getStationTrainFixedPath.menu.operation, + cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LIST + }, + // 固定列车经路更新加载到计划 + loadUpdateStationTrainFixedPath:{ + operation: OperationEvent.CTCCommand.loadUpdateStationTrainFixedPath.menu.operation, + cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD + }, // 导入列车固定径路 importTrainFixedPath:{ diff --git a/src/jmapNew/theme/datie_02/menus/menuBar.vue b/src/jmapNew/theme/datie_02/menus/menuBar.vue index d16b8bc18..9e3fff7ec 100644 --- a/src/jmapNew/theme/datie_02/menus/menuBar.vue +++ b/src/jmapNew/theme/datie_02/menus/menuBar.vue @@ -10,12 +10,14 @@ + diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 41216365f..abeebd05b 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -458,6 +458,10 @@ export default { CTC_REGULAR_TRAIN_LINE_EDIT:{value: 'REGULAR_TRAIN_LINE_EDIT', label: '增加列车固定径路'}, CTC_REGULAR_TRAIN_LINE_BATCH:{value: 'REGULAR_TRAIN_LINE_BATCH', label: '批量增加列车固定径路'}, + CTC_REGULAR_TRAIN_LINE_STATION_UPDATE:{value: 'REGULAR_TRAIN_LINE_STATION_UPDATE', label: '固定列车径路从生效区更新'}, + CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD:{value: 'REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD', label: '固定列车经路更新加载到计划'}, + CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LIST:{value: 'REGULAR_TRAIN_LINE_STATION_UPDATE_LIST', label: '固定列车经路更新列表'}, + CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'}, CTC_STATION_SIGN_RUN_PLAN:{value:'CTC_STATION_SIGN_RUN_PLAN', label: '车站签收阶段计划'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 4d750df27..a4f160dc6 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -4021,6 +4021,27 @@ export const OperationEvent = { operation: '1158', domId: '_Tips-CTC-batchTrainFixedPath-Menu{TOP}' } + }, + // 固定列车径路从生效区更新 + updateTrainFixedPath2Station:{ + menu: { + operation: '1159', + domId: '_Tips-CTC-updateTrainFixedPath2Station-Menu{TOP}' + } + }, + // 固定列车经路更新列表 + getStationTrainFixedPath:{ + menu: { + operation: '1160', + domId: '_Tips-CTC-getStationTrainFixedPath-Menu{TOP}' + } + }, + // 固定列车经路更新加载到计划 + loadUpdateStationTrainFixedPath:{ + menu: { + operation: '1161', + domId: '_Tips-CTC-loadUpdateStationTrainFixedPath-Menu{TOP}' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION From 8223c252fca0281bda0ddb23c27e4b674a901f85 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 25 Aug 2022 14:04:25 +0800 Subject: [PATCH 004/212] =?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=BB=88=E7=AB=AF=20=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=BB=8F=E8=B7=AF=E6=9B=B4=E6=96=B0=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E5=88=B0=E8=AE=A1=E5=88=92=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/menuBar.vue | 8 +-- .../menus/menuDialog/trainFixedPathPane.vue | 62 +++++++++++++++++++ 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuBar.vue b/src/jmapNew/theme/datie_02/menus/menuBar.vue index 9e3fff7ec..6781eaf23 100644 --- a/src/jmapNew/theme/datie_02/menus/menuBar.vue +++ b/src/jmapNew/theme/datie_02/menus/menuBar.vue @@ -314,7 +314,9 @@ export default { const stationCode = this.$store.state.training.roleDeviceCode; commitOperate(menuOperate.CTC.updateTrainFixedPath2Station, { stationCode: stationCode }, 3).then(({valid, response}) => { if (valid) { - // + this.$nextTick(function () { + this.$store.dispatch('training/emitTipFresh'); + }); } }); }, @@ -322,10 +324,6 @@ export default { const stationCode = this.$store.state.training.roleDeviceCode; this.$refs.trainFixedPathPane.doShow(stationCode); }, - // 固定列车经路更新列表 - // getStationTrainFixedPath - // 固定列车经路更新加载到计划 - // loadUpdateStationTrainFixedPath bottomTableShowOrHidden() { EventBus.$emit('bottomTableShowOrHidden'); }, diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue index f5200b328..7ca446d5e 100644 --- a/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue +++ b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue @@ -109,6 +109,17 @@ + + + 加载 + + + 更新 + + + 取消 + + diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index b6c7c473c..b8c29b616 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -33,6 +33,7 @@ + @@ -53,6 +54,7 @@ import BoardViewSetting from './dialog/boardViewSetting.vue' import RailViewSetting from './dialog/railViewSetting.vue' import PowerSupplyArmSetting from './dialog/powerSupplyArmSetting.vue' import BlockDevice from './dialog/blockDevice' +import RegionBatchOperation from './dialog/regionBatchOperation' export default { name: 'MenuPanel', @@ -63,6 +65,7 @@ export default { RailViewSetting, PowerSupplyArmSetting, BlockDevice, + RegionBatchOperation, }, data() { return { @@ -88,22 +91,38 @@ export default { { label: '调车参数配置', id: 'shuntingParam', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '调车优先级配置', id: 'shuntingPriority', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '调车规则配置', id: 'shuntingRule', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '功能按钮设置', id: 'functionButton', - children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }], + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], }, { label: '站场界面显示设置', id: 'UIDisplay' }, { label: '报警提示设置', id: 'alarm' }, @@ -112,12 +131,42 @@ export default { T3MenuItems: [ { 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 }, + { + label: '区域批量设备操作', + id: 'regionBatchOperation', + children: [{}], + ctc: true, + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], + }, + { + label: '站存车管理', + id: 'stationTrainManage', + children: [{}], + ctc: true, + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], + }, + { + label: '设备影响分析', + id: 'deviceAffectAnalyze', + children: [{}], + ctc: true, + children: [ + { label: '标准站', id: 'Station58852' }, + { label: '标准甲站', id: 'Station32295' }, + { label: '标准丙站', id: 'Station47980' }, + ], + }, + { label: '操作日志查询', id: 'operationLog' }, + { label: '防溜设置查询', id: 'deviceAffectAnalyze' }, + { label: '设备影响分析', id: 'deviceAffectAnalyze' }, ], } }, @@ -203,6 +252,9 @@ export default { case 'blockedDeviceOperation': this.$refs.blockDevice.doShow() break + case 'regionBatchOperation': + if (!params[1]) return + this.$refs.regionBatchOperation.doShow(params[1]) } }, dragEvent() { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue index fac7a7a4d..490cfb79c 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue @@ -71,6 +71,7 @@ export default { }, methods: { init() { + console.log(123) document.getElementById(this.canvasId).oncontextmenu = function (e) { return false; }; diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue index 18855223a..d53f22c67 100644 --- a/src/views/newMap/mapDraftPicture/createPicture.vue +++ b/src/views/newMap/mapDraftPicture/createPicture.vue @@ -13,6 +13,7 @@ + From fd87d9b27f4d014ed2cb83c388860a4bd6d80b9e Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 26 Aug 2022 17:32:59 +0800 Subject: [PATCH 009/212] =?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 --- .../menus/menuDialog/trainFixedPathPane.vue | 5 ++- .../bigTrainRunplanManage/trainFixedPath.vue | 2 +- .../indicatorAssociatedInfo/detail.vue | 20 +++++----- .../indicatorAssociatedInfo/index.vue | 18 +++++---- .../indicatorAssociatedInfo/route.vue | 37 +++++++++++++++---- 5 files changed, 56 insertions(+), 26 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue index 7ca446d5e..03bb36e82 100644 --- a/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue +++ b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue @@ -207,10 +207,13 @@ export default { loadUpdateTrainFixedPath() { commitOperate(menuOperate.CTC.loadUpdateStationTrainFixedPath, { stationCode: this.stationCode }, 3).then(({valid, response}) => { if (valid) { + this.$message.success('加载成功!'); this.$nextTick(function () { this.$store.dispatch('training/emitTipFresh'); }); } + }).catch(()=>{ + this.$message.error('加载失败'); }); }, // 固定列车经路从生效区更新 @@ -222,7 +225,7 @@ export default { if (valid) { const title = '固定径路信息'; this.trainFixedPathList = response.data.data; - this.title = title + ' 版本:' + response.data.version; + this.title = title + ' 版本 :' + response.data.version; this.$nextTick(function () { this.$store.dispatch('training/emitTipFresh'); }); diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue index 5c83d8eaa..33aee7426 100644 --- a/src/views/bigTrainRunplanManage/trainFixedPath.vue +++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue @@ -157,7 +157,7 @@ diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue index 8df1abbfa..47ff8ac12 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue @@ -121,10 +121,10 @@ handleClick: this.deleteRoute, type: 'danger' }, - // { - // name: '更新', - // handleClick: this.handleUpdate, - // } + { + name: '修改', + handleClick: this.handleUpdate, + } ] } ] @@ -175,11 +175,13 @@ }); }, handleUpdate(index, row) { - saveAssist(row, this.$route.params.mapId).then(res => { - this.$message.success('更新成功'); - }).catch(() => { - this.$messageBox('操作异常'); - }); + this.$emit('updateData',row); + this.doClose(); + // saveAssist(row, this.$route.params.mapId).then(res => { + // this.$message.success('更新成功'); + // }).catch(() => { + // this.$messageBox('操作异常'); + // }); }, } }; diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue index 0c54e7e92..cb159205f 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue @@ -6,7 +6,8 @@ :map-info="mapInfo" @setCenter="setCenter" /> - + + + + diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index a477513b9..56c425c1b 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -13,7 +13,8 @@ + diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue index 6e15ffed2..c71263a9e 100644 --- a/src/views/designPlatform/trainingPreview.vue +++ b/src/views/designPlatform/trainingPreview.vue @@ -1,15 +1,10 @@ + diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index 9c19473ca..5d76b0927 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -8,7 +8,54 @@
新增步骤 - + + + + + + + + + + + + + + + + + + + + +
{{ $t('trainingManage.mapLocation') }} @@ -16,18 +63,22 @@ {{ $t('trainingManage.saveStepData') }}
+ + From 6091119a5d70269e5d20247beb868054c2bb338e Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 Aug 2022 09:30:27 +0800 Subject: [PATCH 023/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trainingManage.js | 2 +- src/views/trainingManage/editDetails.vue | 2 +- src/views/trainingManage/editOperate.vue | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/api/trainingManage.js b/src/api/trainingManage.js index 15d780fa0..a1c36c6f2 100644 --- a/src/api/trainingManage.js +++ b/src/api/trainingManage.js @@ -82,7 +82,7 @@ export function getTrainingAll(trainingId) { /** 单独更新当前用户的某个实训草稿的初始背景 */ export function updateTrainingBackgroud(data) { return request({ - url: `/api/v2/draft/training/update/content/backgroud`, + url: `/api/v2/draft/training/update/content/background`, method: 'post', data }); diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index 9c19473ca..4e84a738d 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -105,7 +105,7 @@ export default { width: '200', buttons: [ { - name: '编辑步骤', + name: '编辑操作', type: 'primary', handleClick: this.handleEditOperate }, diff --git a/src/views/trainingManage/editOperate.vue b/src/views/trainingManage/editOperate.vue index 7f90dd53d..70972637a 100644 --- a/src/views/trainingManage/editOperate.vue +++ b/src/views/trainingManage/editOperate.vue @@ -37,7 +37,7 @@ export default { name: 'EditOperate', data() { return { - title: '编辑步骤', + title: '编辑操作', dialogVisible: false, dialogWidth: 500, stepDetail: { @@ -58,7 +58,6 @@ export default { params: val.params || {}, t: 'C' }; - console.log(data, '********'); this.stepDetail.operations.push(data); } } @@ -79,13 +78,13 @@ export default { this.stepDetail.operations.splice(index, 1); }, backStepList() { + this.$emit('backStepList', this.stepDetail); + this.dialogVisible = false; this.stepDetail = { id: '', description: '', operations: [] }; - this.$emit('backStepList', this.stepDetail); - this.dialogVisible = false; }, covertString(data) { // const datate = { From caef0d9c79e90698f4640c671a381a7388888a1e Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 Aug 2022 09:42:25 +0800 Subject: [PATCH 024/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trainingManage/editDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index 5d76b0927..f4ce921f2 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -177,7 +177,7 @@ export default { this.tableData.push(obj); }, setOperations(data) { - this.queryList.data.forEach(item => { + this.tableData.forEach(item => { if (item.id === data.id) { item.operations = data.operations; } From 3ea1c92f71a7dd8080a49a5d71f8c227ba8919ac Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 Aug 2022 09:52:31 +0800 Subject: [PATCH 025/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trainingManage/editDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index f4ce921f2..cce5d3147 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -51,7 +51,7 @@
From 9113a5d2881dc2d93fd2c13a9b4e7657f1b43aa0 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 30 Aug 2022 10:03:06 +0800 Subject: [PATCH 026/212] =?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/views/trainingManage/editDetails.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index f4ce921f2..7f5078d50 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -28,7 +28,7 @@ @@ -156,7 +156,19 @@ export default { return name; }, getConditionName(row, key) { - const n = row[key] || ''; + const obj = row[key] || {}; + let n = ''; + switch (obj.t) { + case 'V': + n = `值为${obj.v}`; + break; + case 'S': + n = `${obj.elementCode}设备的${obj.filedName}属性`; + break; + case 'E': + n = ''; + break; + } return n; }, addStep() { From c59285a1392a65757fbb3b46a8c2cec72d21ebfe Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 Aug 2022 10:06:43 +0800 Subject: [PATCH 027/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/designPlatform/trainingTip.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/designPlatform/trainingTip.vue b/src/views/designPlatform/trainingTip.vue index 6ae2d4ff3..cc1a8bc32 100644 --- a/src/views/designPlatform/trainingTip.vue +++ b/src/views/designPlatform/trainingTip.vue @@ -3,6 +3,7 @@ diff --git a/src/views/trainingManage/gradeRules.vue b/src/views/trainingManage/gradeRules.vue new file mode 100644 index 000000000..d9831fad4 --- /dev/null +++ b/src/views/trainingManage/gradeRules.vue @@ -0,0 +1,170 @@ + + diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index 903f993bb..eb928f0e2 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -215,8 +215,10 @@ export default { console.log('预览', index, row); }, // 打分 - gradeRules() { - + gradeRules(index, row) { + this.doClose(); + this.$emit('gradeRules', row); + // this.$refs.gradeRules.doShow(); }, getListData() { this.$refs.queryListPage && this.$refs.queryListPage.commitQuery(); From 5ad7c1f8a1f23dee5e9d7bea23c2b126044cd09e Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 Aug 2022 16:09:17 +0800 Subject: [PATCH 035/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/training.js | 1 + src/views/designPlatform/trainingDesign.vue | 3 +-- src/views/designPlatform/trainingPreview.vue | 2 +- src/views/trainingManage/trainingList.vue | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/store/modules/training.js b/src/store/modules/training.js index 774cb4f05..dd1de86d9 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -467,6 +467,7 @@ const training = { rtn && rtn.valid && commit('next'); } } + store.dispatch('trainingNew/setTrainingOperate'); resolve(rtn); } }).catch(error => { diff --git a/src/views/designPlatform/trainingDesign.vue b/src/views/designPlatform/trainingDesign.vue index c206093da..98416a282 100644 --- a/src/views/designPlatform/trainingDesign.vue +++ b/src/views/designPlatform/trainingDesign.vue @@ -59,7 +59,7 @@ export default { }, beforeDestroy() { this.$store.dispatch('socket/clearTrainingOverCount'); - this.$store.dispatch('training/clearStepOverCount'); + this.$store.dispatch('trainingNew/clearStepOverCount'); }, mounted() { }, @@ -91,7 +91,6 @@ export default { this.$store.dispatch('socket/clearTrainingStepTip'); this.$store.dispatch('trainingNew/clearStepOrder'); this.$store.dispatch('trainingNew/changeTeachMode', ''); - this.$store.dispatch('trainingNew/setTrainingDetail', null); }).catch(() => { this.$message.error('结束实训失败!'); }); diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue index ec573ee03..9fe52ba61 100644 --- a/src/views/designPlatform/trainingPreview.vue +++ b/src/views/designPlatform/trainingPreview.vue @@ -70,7 +70,7 @@ export default { }, async beforeDestroy() { this.$store.dispatch('socket/clearTrainingOverCount'); - this.$store.dispatch('training/clearStepOverCount'); + this.$store.dispatch('trainingNew/clearStepOverCount'); }, mounted() { }, diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index 63e8bc00a..10078d314 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -178,6 +178,7 @@ export default { drawUp(index, row) { console.log('编辑', index, row); getTrainingAll(row.id).then(resp => { + this.$store.dispatch('trainingNew/setTrainingDetail', null); if (resp.data && resp.data.mapLocationJson) { const mapLocation = JSON.parse(resp.data.mapLocationJson); this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y}); From 656e7a13aa53420d9db2e08e1d660ad9c4f60e0b Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 30 Aug 2022 16:25:34 +0800 Subject: [PATCH 036/212] =?UTF-8?q?=E5=8D=A0=E7=BA=BF=E6=9D=BF=E6=8E=92?= =?UTF-8?q?=E5=88=97=E8=BF=9B=E8=B7=AF=E6=8C=87=E4=BB=A4=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/dialog/routeSelection1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue index 9b135292b..8b84cf582 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue @@ -266,8 +266,8 @@ export default { commit() { if (this.route) { this.loading = true; - const type = this.route.lock ? menuOperate.Signal.cancelTrainRoute : menuOperate.Signal.arrangementRoute; - const param = this.route.lock ? { signalCode: this.route.startSignalCode } : { routeCode:this.route.code }; + const type = this.route.lock ? menuOperate.Signal.cancelTrainRoute : menuOperate.CTC.setRoute; + const param = this.route.lock ? { signalCode: this.route.startSignalCode } : { routeCode:this.route.code, tripNumber: this.selected.tripNumber, force: false, duration: null }; commitOperate(type, param, 3).then(({valid, operate})=>{ this.loading = false; if (valid) { From 68314b3b08a8190e2a0bb2f4732d13dcc8fb1fab Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 30 Aug 2022 16:53:37 +0800 Subject: [PATCH 037/212] =?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/views/trainingManage/gradeRules.vue | 42 +++++++++++++++++++------ 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/src/views/trainingManage/gradeRules.vue b/src/views/trainingManage/gradeRules.vue index d9831fad4..9ecb215ea 100644 --- a/src/views/trainingManage/gradeRules.vue +++ b/src/views/trainingManage/gradeRules.vue @@ -7,9 +7,9 @@
@@ -58,6 +58,7 @@ diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index 74d3dd37f..9a83d8548 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -196,13 +196,15 @@ export default { const mapLocation = JSON.parse(resp.data.mapLocationJson); this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y}); } + this.$emit('updateDetails', resp.data); + this.doClose(); }).catch((e) => { console.error(e); + this.$emit('updateDetails', {}); this.$message.error('获取实训详情信息失败!'); }); loadTrainingBg(this.$route.query.group, row.id).then(resp => { - this.$emit('updateDetails', row); - this.doClose(); + console.log('加载草稿实训背景', resp); }).catch(() => { this.$message.error('加载草稿实训背景失败!'); }); From dcded847e9798a9f4a88acd21ecf72474d047d9e Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 1 Sep 2022 13:23:02 +0800 Subject: [PATCH 053/212] =?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/views/trainingManage/trainingList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index 9a83d8548..2a93bf6e1 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -188,7 +188,7 @@ export default { } const qObj = {...this.$route.query}; qObj.record = true; - this.$router.push({ query:{...qObj}}); + this.$router.replace({ query:{...qObj}}); console.log('编辑', qObj, index, row); getTrainingAll(row.id).then(resp => { this.$store.dispatch('trainingNew/setTrainingDetail', null); @@ -250,7 +250,7 @@ export default { } const qObj = {...this.$route.query}; delete qObj.record; - this.$router.push({ query:{...qObj}}); + this.$router.replace({ query:{...qObj}}); try { const detailResp = await getTrainingAll(data.id); this.training = detailResp.data; From 4694f0455ce4ffb4c04c4e33f4861cda82d6e5c1 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 1 Sep 2022 13:38:11 +0800 Subject: [PATCH 054/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/designPlatform/poptip.vue | 176 ++++++++++++++++ .../designPlatform/trainingPositionTip.vue | 194 ++++++++++++++++++ src/views/designPlatform/trainingPreview.vue | 5 +- src/views/designPlatform/trainingTip.vue | 13 +- src/views/trainingManage/editDetails.vue | 2 +- 5 files changed, 384 insertions(+), 6 deletions(-) create mode 100644 src/views/designPlatform/poptip.vue create mode 100644 src/views/designPlatform/trainingPositionTip.vue diff --git a/src/views/designPlatform/poptip.vue b/src/views/designPlatform/poptip.vue new file mode 100644 index 000000000..3031ebfbd --- /dev/null +++ b/src/views/designPlatform/poptip.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/views/designPlatform/trainingPositionTip.vue b/src/views/designPlatform/trainingPositionTip.vue new file mode 100644 index 000000000..cb5dea6d0 --- /dev/null +++ b/src/views/designPlatform/trainingPositionTip.vue @@ -0,0 +1,194 @@ + + + diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue index a56a1bbd2..ab080aeb4 100644 --- a/src/views/designPlatform/trainingPreview.vue +++ b/src/views/designPlatform/trainingPreview.vue @@ -3,6 +3,7 @@ +
开始 @@ -17,13 +18,15 @@ import { clearSimulation } from '@/api/simulation'; import { startTraining, endTraining, endTrainingStep } from '@/api/jmap/training'; import MenuDemon from './demonMenu.vue'; import TrainingTip from './trainingTip'; +import TrainingPositionTip from './trainingPositionTip'; import TrainingJlmap from './trainingJlmap'; export default { name: 'TrainingDesign', components: { MenuDemon, TrainingTip, - TrainingJlmap + TrainingJlmap, + TrainingPositionTip }, props: { widthLeft: { diff --git a/src/views/designPlatform/trainingTip.vue b/src/views/designPlatform/trainingTip.vue index 90b2e90ab..16ea0d37b 100644 --- a/src/views/designPlatform/trainingTip.vue +++ b/src/views/designPlatform/trainingTip.vue @@ -18,10 +18,15 @@ export default { } }, watch: { - '$store.state.socket.trainingStepTip': function(val) { - if (val && this.teachMode === ScriptMode.TEACH) { - this.trainingTipMessage = val; - } else { + // '$store.state.socket.trainingStepTip': function(val) { + // if (val && this.teachMode === ScriptMode.TEACH) { + // this.trainingTipMessage = val; + // } else { + // this.trainingTipMessage = ''; + // } + // }, + '$store.state.trainingNew.trainingSwitch': function(val) { + if (!val) { this.trainingTipMessage = ''; } }, diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index e27e8c8a0..f91fb109b 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -189,7 +189,7 @@ export default { setOperations(data) { if (data) { this.tableData[data.index].operations = data.stepDetail.operations; - + this.tableData[data.index].tipPosition = data.tipPosition; } }, handleDelete(index, row) { From b3083b8dc8b77763887e2f3b1a278ec91cfa079e Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 1 Sep 2022 13:54:10 +0800 Subject: [PATCH 055/212] =?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/views/trainingManage/editDetails.vue | 39 ++++++++++++++++++++---- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index 618ea5c10..57e28bfce 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -1,5 +1,5 @@ + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue b/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue new file mode 100644 index 000000000..d5b7b01fc --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index 7b3b78492..0bd0b85a3 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -35,6 +35,8 @@ + +
@@ -57,6 +59,8 @@ import PowerSupplyArmSetting from './dialog/powerSupplyArmSetting.vue' import BlockDevice from './dialog/blockDevice' import RegionBatchOperation from './dialog/regionBatchOperation' import StationTrainManage from './dialog/stationTrainManage' +import OperationLogQuery from './dialog/operationLogQuery' +import InfoDialog from './dialog/infoDialog' export default { name: 'MenuPanel', @@ -68,7 +72,9 @@ export default { PowerSupplyArmSetting, BlockDevice, RegionBatchOperation, - StationTrainManage + StationTrainManage, + OperationLogQuery, + InfoDialog, }, data() { return { @@ -165,8 +171,8 @@ export default { ], }, { label: '操作日志查询', id: 'operationLog' }, - { label: '防溜设置查询', id: 'deviceAffectAnalyze' }, - { label: '设备影响分析', id: 'deviceAffectAnalyze' }, + { label: '防溜设置查询', id: 'antiSlipSettingQuery' }, + { label: '信息提示', id: 'info' }, ], } }, @@ -260,6 +266,13 @@ export default { if (!params[1]) return this.$refs.stationTrainManage.doShow(params[1]) break + case 'operationLog': + case 'antiSlipSettingQuery': + this.$refs.operationLogQuery.doShow() + break + case 'info': + this.$refs.infoDialog.doShow() + break } }, dragEvent() { From aea62ada61c71a808ac2ddc79f9d44c4f9bdec64 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 7 Sep 2022 09:37:37 +0800 Subject: [PATCH 088/212] =?UTF-8?q?=E5=A2=9E=E5=8A=A0prdType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ConstConfig.js | 3 ++- src/scripts/cmdPlugin/Config.js | 1 - src/views/demonstration/detail/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 9872877ba..2d3e573b4 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -166,7 +166,8 @@ export default { { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04'}, { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05'}, { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06'}, - { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' } + { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' }, + { enlabel: 'Large screen vehicle real workstation', label: '大屏车辆真实工作站', value: '10' } ], trainingDeviceType: { Switch: {enlabel: 'Switch training', label:'道岔实训'}, diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js index ffdfcbc8e..e07bfed6a 100644 --- a/src/scripts/cmdPlugin/Config.js +++ b/src/scripts/cmdPlugin/Config.js @@ -3,7 +3,6 @@ export const State2SimulationMap = { '01': 'Local', // 现地工作站 '02': 'Center', // 中心调度工作站 '09':'Depot_IL', // 车辆段工作站 - '10': 'Local', '04': 'Local' }; diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index d7b8de9d4..0a7c85f96 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -219,7 +219,7 @@ export default { }); }, async start() { - const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen', '', 'jump', 'jump']; + const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen', '', 'jump', 'enterScreen']; this[jumpFunc[parseInt(this.courseModel.prdType) - 1]](); }, jumpSimulation() { From b1419ef839027a108ffa47f900d8cc8d92029030 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 7 Sep 2022 09:50:59 +0800 Subject: [PATCH 089/212] =?UTF-8?q?pictureList=20=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/map.js | 5 +++-- src/jmapNew/painter.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 4c98fb75d..48d773580 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -409,6 +409,7 @@ class Jlmap { const code = elem.code; const type = elem._type; const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig); + oDevice._pictureHide = false; this.$painter.update(oDevice); }); this.$painter.$transformHandle.revisibleAll(); @@ -435,11 +436,11 @@ class Jlmap { const device = this.mapDevice[item]; if (device && device._type !== deviceType.Switch && device._type !== deviceType.Train) { const pictureDevice = store.getters['map/getPictureDeviceByCode'](item); - device._dispose = pictureDevice ? pictureDevice.pictureHide : false; + device._pictureHide = pictureDevice ? pictureDevice.pictureHide : false; this.$painter.updatePicture(device); try { if (device._type === deviceType.Section && device.type === '03') { - this.mapDevice[device.switch.code]._dispose = pictureDevice ? pictureDevice.pictureHide : false; + this.mapDevice[device.switch.code]._pictureHide = pictureDevice ? pictureDevice.pictureHide : false; this.computedSwitch(device.switch); this.$painter.updatePicture(this.mapDevice[device.switch.code]); } diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js index 6841f27d5..271c5f914 100644 --- a/src/jmapNew/painter.js +++ b/src/jmapNew/painter.js @@ -166,7 +166,7 @@ class Painter { updatePicture(device) { if (device) { try { - if (device._dispose) { + if (device._pictureHide) { this.delete(device); } else { device.instance && this.mapInstanceLevel[device._type].remove(device.instance); From a202e872fa49ee09f2fcdd53383b8ad7219f2586 Mon Sep 17 00:00:00 2001 From: Yuan Date: Wed, 7 Sep 2022 10:52:18 +0800 Subject: [PATCH 090/212] format --- .../theme/datie_02/menus/dialog/operationLogQuery.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue b/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue index d5b7b01fc..f679a8b83 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue @@ -27,9 +27,9 @@
- - - + + +
@@ -55,13 +55,13 @@ export default { desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施', }, { - order: 0, + order: 1, time: '2017-05-09 08:53:11', origin: '<12>12', desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施', }, { - order: 0, + order: 2, time: '2017-05-09 08:53:11', origin: '<12>12', desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施', From 29af1e57f520b1658adfde9431e2711998906c5e Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 7 Sep 2022 11:18:04 +0800 Subject: [PATCH 091/212] =?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/menuButtonCtc.vue | 2 +- src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue | 2 +- src/jmapNew/theme/foshan_01/menus/menuSection.vue | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index 8c5f21e5a..90c613599 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -673,7 +673,7 @@ export default { // this.handleGuideLock(model); // this.handleGuideSignal(model); // } else - debugger; + // debugger; if (buttonOperation && this.commandTypeList.includes(model._type)) { if (buttonOperation === this.MixinCommand.totalCancel.button.operation) { this.handelTotalCancel(model); diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue index f09e16af6..7586a11b9 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue @@ -275,7 +275,7 @@ export default { }, // 道岔封锁 block() { - debugger; + // debugger; commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { this.$refs.switchControl.doShow(operate, this.selected); diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index f732adc88..a83ad906b 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -193,11 +193,11 @@ export default { } }, operationHandler(buttonOperation, selectType) { - debugger; + // debugger; switch (buttonOperation) { case OperationEvent.Section.fault.button.operation: { // 事故解锁 - debugger; + // debugger; commitOperate(menuOperate.Section.fault, {sectionCode:selectType.code}, 3).then(({valid, operate})=>{ if (valid) { // this.$refs.sectionUnLock.doShow(operate, this.selected); @@ -210,7 +210,7 @@ export default { } case OperationEvent.Section.axlePreReset.button.operation: { // 计轴复零 - debugger; + // debugger; commitOperate(menuOperate.Section.axlePreReset, {sectionCode:selectType.code}, 3).then(({valid, operate})=>{ if (valid) { // this.$refs.sectionUnLock.doShow(operate, this.selected); From 627faced59bfa06eee8fd71d2d814b586c3cbea6 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 7 Sep 2022 17:38:42 +0800 Subject: [PATCH 092/212] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ConstConfig.js | 2 +- src/views/trainingManage/demonMenu.vue | 5 +- src/views/trainingManage/editCondition.vue | 274 +++++++------ src/views/trainingManage/editDetails.vue | 4 + src/views/trainingManage/expression.vue | 408 ++++++++++++------- src/views/trainingManage/expressionValue.vue | 133 ++++++ 6 files changed, 557 insertions(+), 269 deletions(-) create mode 100644 src/views/trainingManage/expressionValue.vue diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 2d3e573b4..e7127cac3 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -287,7 +287,7 @@ export default { { label: '区段', value: 'Section' }, { label: '道岔', value: 'Switch' }, { label: '信号机', value: 'Signal' }, - { label: '站台', value: 'Stand' }, + { label: '站台', value: 'StationStand' }, // Stand { label: '车站', value: 'Station' }, {label:'进路', value:'Route'}, { label: '列车', value: 'Train' } diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue index c1cb513d0..69ecaf11c 100644 --- a/src/views/trainingManage/demonMenu.vue +++ b/src/views/trainingManage/demonMenu.vue @@ -9,7 +9,7 @@ - + @@ -76,6 +76,9 @@ export default { editConditionFn(data, index, key) { this.$refs.editDetails.editConditionFn(data, index, key); }, + backStep() { + this.$refs.editDetails.backStep(); + }, handleCondition(index, row, key) { this.$refs.editCondition.doShow(row[key], index, key); }, diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue index 1ba2dd3a9..2140adde4 100644 --- a/src/views/trainingManage/editCondition.vue +++ b/src/views/trainingManage/editCondition.vue @@ -6,61 +6,47 @@ - - - - - - - - - - - - - - - - - +
+
+ +
+ + + + + +
+ 新增条件关系 + 删除条件关系 + 清空条件关系 +
+
保存 取消 + 返回步骤列表
- diff --git a/src/views/trainingManage/expressionValue.vue b/src/views/trainingManage/expressionValue.vue new file mode 100644 index 000000000..1dfc55c80 --- /dev/null +++ b/src/views/trainingManage/expressionValue.vue @@ -0,0 +1,133 @@ + + + + From 09f78e906432630524435110ad07afe7c99705c7 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 7 Sep 2022 18:11:50 +0800 Subject: [PATCH 093/212] =?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/views/trainingManage/demonMenu.vue | 11 +++++- src/views/trainingManage/editCondition.vue | 43 +++++++++++----------- src/views/trainingManage/trainingList.vue | 1 + 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue index 69ecaf11c..3f8aa49db 100644 --- a/src/views/trainingManage/demonMenu.vue +++ b/src/views/trainingManage/demonMenu.vue @@ -7,7 +7,7 @@ 实训列表 - + @@ -45,6 +45,7 @@ export default { hoverBtn: false, btnWidth: -600, materialsList: [], + refsList: ['editDetails', 'editCondition'], editData: {}, isAdmin: true }; @@ -107,8 +108,16 @@ export default { }, updateDetails(data) { this.editData = data; + this.closeAllDialog('editDetails'); this.$refs.editDetails.doShow(data); }, + closeAllDialog(noCloseName) { + this.refsList.forEach(key => { + if (key != noCloseName && this.$refs[key]) { + this.$refs[key].doClose(); + } + }); + }, openEditOperate(data) { console.log(data, '***'); this.$refs.editOperate.doShow(data); diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue index 2140adde4..8a05ee87f 100644 --- a/src/views/trainingManage/editCondition.vue +++ b/src/views/trainingManage/editCondition.vue @@ -1,10 +1,10 @@
- 新增条件关系 + 删除条件关系 清空条件关系
@@ -42,6 +42,7 @@ + From ea8277adb7125e90349e77c43361071b3eebccc9 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 14 Sep 2022 13:28:06 +0800 Subject: [PATCH 111/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/designPlatform/scenePlayRole.vue | 33 ++++++++++++ src/views/designPlatform/trainingJlmap.vue | 9 +++- src/views/designPlatform/trainingList.vue | 60 +++++++++++++++++++--- 3 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 src/views/designPlatform/scenePlayRole.vue diff --git a/src/views/designPlatform/scenePlayRole.vue b/src/views/designPlatform/scenePlayRole.vue new file mode 100644 index 000000000..f2c965bdf --- /dev/null +++ b/src/views/designPlatform/scenePlayRole.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/views/designPlatform/trainingJlmap.vue b/src/views/designPlatform/trainingJlmap.vue index 9ad5059a7..a0fe0c485 100644 --- a/src/views/designPlatform/trainingJlmap.vue +++ b/src/views/designPlatform/trainingJlmap.vue @@ -73,6 +73,11 @@ export default { this.initLoadData(); }); }, + '$store.state.socket.trainingReloadCount': function () { + if (this.$store.state.trainingNew.trainingDetail && this.$store.state.trainingNew.trainingDetail.type === 'SCENE') { + this.initMemberUserInfo(); + } + }, '$store.state.app.windowSizeCount': function() { // 窗口缩放 this.setWindowSize(); }, @@ -96,7 +101,7 @@ export default { this.menus = this.$theme.loadMenuComponent(lineCode); this.$store.commit('training/notifyGetCommandDefinition', lineCode); } - this.initMemberUserInfo(true); + this.initMemberUserInfo(); }, '$store.state.map.map': function (map) { if (map) { @@ -458,7 +463,7 @@ export default { this.endViewLoading(); } }, - initMemberUserInfo(isFirst = false) { + initMemberUserInfo() { if (this.$route.query.newApi + '' === 'true') { getMemberListCommon(this.group).then(resp => { this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.userId }); diff --git a/src/views/designPlatform/trainingList.vue b/src/views/designPlatform/trainingList.vue index 031215ef0..0c6857c91 100644 --- a/src/views/designPlatform/trainingList.vue +++ b/src/views/designPlatform/trainingList.vue @@ -5,17 +5,20 @@
{{ `当前实训名称:${training.name || ''}` }}
{{ `当前实训描述:${training.description || ''}` }}
-
-
实训列表
-
-
- + + + + + + + +
+ + From afabcfbf3b76fb0cd4ea3b8fcde2cf04bfd15e8f Mon Sep 17 00:00:00 2001 From: Yuan Date: Wed, 14 Sep 2022 18:17:28 +0800 Subject: [PATCH 114/212] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pis/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/pis/index.vue b/src/views/pis/index.vue index e9bb42b15..fc936f5b0 100644 --- a/src/views/pis/index.vue +++ b/src/views/pis/index.vue @@ -99,7 +99,11 @@ export default { return `${this.datetime.getFullYear()}年${this.datetime.getMonth() + 1}月${this.datetime.getDate()}日` }, time() { - return `${this.datetime.getHours()}:${this.datetime.getMinutes() + 1}` + let h = this.datetime.getHours().toString(), + m = this.datetime.getMinutes().toString() + if (h.length === 1) h = '0' + h + if (m.length === 1) m = '0' + m + return `${h}:${m}` }, }, data() { From 6adcfd9f9b5b9684911e7b8a198fa10ea8c20cad Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 14 Sep 2022 18:31:20 +0800 Subject: [PATCH 115/212] =?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/scripts/ConstConfig.js | 4 +- src/views/trainingManage/editCondition.vue | 58 ++++--------- src/views/trainingManage/expression.vue | 88 +++++++++++++++----- src/views/trainingManage/expressionValue.vue | 38 +++++++-- 4 files changed, 117 insertions(+), 71 deletions(-) diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 5a37e5da9..0e9e545b2 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -291,7 +291,9 @@ export default { { label: '站台', value: 'StationStand' }, // Stand { label: '车站', value: 'Station' }, {label:'进路', value:'Route'}, - { label: '列车', value: 'Train' } + { label: '列车', value: 'Train' }, + { label: '自动闭塞', value: 'StationDirectionAuto' }, + { label: '半自动闭塞', value: 'StationDirectionSemi' } ] } }; diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue index 73b25d2db..649d4f706 100644 --- a/src/views/trainingManage/editCondition.vue +++ b/src/views/trainingManage/editCondition.vue @@ -47,11 +47,6 @@ export default { ExpressionValue, Expression }, - provide() { - return { - optionObj: this.optionObj - }; - }, props: { materialsList: { type: Array, @@ -68,44 +63,7 @@ export default { tableData: [], activeIndexPath: '', rowIndex: 0, - conditionKey: '', - optionObj: { - boolean: [ - { label: '是', value: true }, - { label: '否', value: false } - ], - RunLevel: [ - { label: 'cbtc级别', value: 'CBTC' }, - { label: '点式通信', value: 'ITC' }, - { label: '联锁级', value: 'IL' } - ], - SignalAspect: [ - {label:'红', value:1}, - {label:'绿', value:2}, - {label:'黄', value:3}, - {label:'黄红', value:4}, - {label:'绿绿', value:5}, - {label:'绿黄', value:6}, - {label:'黄黄', value:7}, - {label:'黄闪黄', value:8}, - {label:'白红', value:9}, - {label:'蓝', value:10}, - {label:'白', value:11}, - {label:'红闪', value:12} - ], - SwitchIndication: [// 道岔位置定位、反位 N-定位 R-反位 NO-无(失表) EX-挤叉 - { label: '定位', value: 'N' }, - { label: '反位', value: 'R' }, - { label: '失表', value: 'NO' }, - { label: '挤叉', value: 'EX' } - ], - DriveMode: [ - { label: '自动驾驶模式', value: 'AM' }, - { label: '人工驾驶模式', value: 'CM' }, - { label: '限制人工驾驶模式', value: 'RM' }, - { label: '非限制人工驾驶模式', value: 'NRM' } - ] - } + conditionKey: '' }; }, computed: { @@ -135,6 +93,9 @@ export default { typeObj[ii.value] = ii.label; }); const list = []; + const autoList = ['ASSIST', 'CHANGE_DIRECTION', 'PICK_ASSIST', 'DEPART_ASSIST']; // 自动闭塞 + const SemiList = ['OCCLUSION', 'RECOVERY', 'ACCIDENT']; // 半自动闭塞 + const allList = [...autoList, ...SemiList]; Object.values(this.mapDevice).forEach(item => { if (typeObj[item._type]) { list.push({ @@ -143,6 +104,17 @@ export default { _type: item._type }); } + if (item._type == 'SignalButton' && allList.includes(item.type)) { + let isAuto = true; + if (SemiList.includes(item.type)) { + isAuto = false; + } + list.push({ + code: item.code, + name: `${item.name}(${isAuto ? '自动闭塞' : '半自动闭塞'})`, + _type: `${isAuto ? 'StationDirectionAuto' : 'StationDirectionSemi'}` + }); + } }); this.getRouteList.forEach(item => { list.push({ diff --git a/src/views/trainingManage/expression.vue b/src/views/trainingManage/expression.vue index 90a721381..37c334761 100644 --- a/src/views/trainingManage/expression.vue +++ b/src/views/trainingManage/expression.vue @@ -12,7 +12,7 @@
- + + + + + - + 激活 - +
- + + -
+
激活
- +
@@ -92,7 +102,6 @@ import ConstConfig from '@/scripts/ConstConfig'; export default { name: 'Expression', components:{}, - inject: ['optionObj'], props: { getDeviceList: { type: Array, @@ -111,6 +120,7 @@ export default { return { indexPath: '', field: '', + deviceType: '', formModel: { t: 'E', t1: 'S', @@ -138,15 +148,12 @@ export default { return item.value == 'V'; }); }, - deviceType() { - let type = ''; - const findObj = this.getDeviceList.find(item => { - return item.code == this.formModel.elementCode; + filterDeviceList() { + let list = []; + list = this.getDeviceList.filter(item => { + return item._type == this.deviceType; }); - if (findObj) { - type = findObj._type || ''; - } - return type; + return list; }, getSectionList() { // 区段列表 let list = []; @@ -180,6 +187,22 @@ export default { } return attr; }, + optionObj() { + const obj = { + boolean: [ + { label: '是', value: true }, + { label: '否', value: false } + ] + }; + this.materialsList.forEach(item => { + item.materials.forEach(every => { + if (every.valueList) { + obj[every.type] = every.valueList; + } + }); + }); + return obj; + }, rules() { const crules = { t: [ @@ -234,21 +257,35 @@ export default { if (this.field && this.showDevice) { const model = this.$store.state.menuOperation.selected; let code = model.code; - if (model._type == 'SignalButton') { + if (model._type == 'SignalButton' && model.signalCode) { code = model.signalCode; } - const findObj = this.getDeviceList.find(item => { + let list = this.getDeviceList; + if (this.field == 'v') { + list = this.getSectionList; + } + const findObj = list.find(item => { return item.code == code; }); if (findObj) { this.formModel[this.field] = findObj.code; } + if (this.deviceType != this.getDeviceType()) { + this.deviceType = this.getDeviceType(); + this.formModel.filedName = ''; + this.formModel.v = ''; + } this.field = ''; } } }, created() {}, methods: { + changeDeviceType() { + this.formModel.elementCode = ''; + this.formModel.filedName = ''; + this.formModel.v = ''; + }, hover(field) { this.field = field == this.field ? '' : field; this.$emit('hover', field); @@ -331,6 +368,17 @@ export default { this.formModel.t2 = 'V'; } } + this.deviceType = this.getDeviceType(); + }, + getDeviceType() { + let type = ''; + const findObj = this.getDeviceList.find(item => { + return item.code == this.formModel.elementCode; + }); + if (findObj) { + type = findObj._type || ''; + } + return type; }, clearFromData() { this.$refs.formModel.resetFields(); diff --git a/src/views/trainingManage/expressionValue.vue b/src/views/trainingManage/expressionValue.vue index 42f160f97..beafc3d5b 100644 --- a/src/views/trainingManage/expressionValue.vue +++ b/src/views/trainingManage/expressionValue.vue @@ -45,7 +45,6 @@ import ConstConfig from '@/scripts/ConstConfig'; export default { name: 'ExpressionValue', components:{}, - inject: ['optionObj'], props: { valueObj: { type: Object, @@ -91,6 +90,22 @@ export default { return arr.includes(item.value); }); }, + optionObj() { + const obj = { + boolean: [ + { label: '是', value: true }, + { label: '否', value: false } + ] + }; + this.materialsList.forEach(item => { + item.materials.forEach(every => { + if (every.valueList) { + obj[every.type] = every.valueList; + } + }); + }); + return obj; + }, valueTypeList() { let list = []; Object.values(this.optionObj).forEach(item => { @@ -106,12 +121,21 @@ export default { let value = obj.valuables[1].v; const type = this.getValueType(obj.valuables[0]); if (type) { - const list = this.optionObj[type] || []; - const findObj = list.find(item => { - return item.value == value; - }); - if (findObj) { - value = findObj.label; + if (type != 'Section') { + const list = this.optionObj[type] || []; + const findObj = list.find(item => { + return item.value == value; + }); + if (findObj) { + value = findObj.label; + } + } else { + const findObj = this.getDeviceList.find(item => { + return item.code == value; + }); + if (findObj) { + value = findObj.name; + } } } return value; From 507e01ebe8a6642d2f578a798ed06f780faece97 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 15 Sep 2022 09:56:51 +0800 Subject: [PATCH 116/212] =?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/views/trainingManage/editCondition.vue | 1 + src/views/trainingManage/expression.vue | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue index 649d4f706..df5fa07fe 100644 --- a/src/views/trainingManage/editCondition.vue +++ b/src/views/trainingManage/editCondition.vue @@ -258,6 +258,7 @@ export default { doShow(data, rowIndex, conditionKey) { this.dialogVisible = true; this.tabVisible = true; + this.activeIndexPath = ''; if (data) { this.tableData = [data]; } else { diff --git a/src/views/trainingManage/expression.vue b/src/views/trainingManage/expression.vue index 37c334761..5603608c3 100644 --- a/src/views/trainingManage/expression.vue +++ b/src/views/trainingManage/expression.vue @@ -44,7 +44,7 @@ 激活
- + Date: Thu, 15 Sep 2022 10:55:23 +0800 Subject: [PATCH 117/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=BD=95=E5=88=B6=20?= =?UTF-8?q?=E8=AF=84=E5=88=86=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trainingManage.js | 8 ++++++++ src/views/trainingManage/demonMenu.vue | 2 +- src/views/trainingManage/editDetails.vue | 4 ++++ src/views/trainingManage/gradeRules.vue | 6 +++--- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/api/trainingManage.js b/src/api/trainingManage.js index 978d94636..68577b0a2 100644 --- a/src/api/trainingManage.js +++ b/src/api/trainingManage.js @@ -112,6 +112,14 @@ export function getTrainingMmembers(trainingId) { }); } +/** 获取实训所有参与者 */ +export function getTrainingPlayers(trainingId) { + return request({ + url: `/api/v2/draft/training/${trainingId}/player/list`, + method: 'get' + }); +} + /** 更新所有评分规则*/ export function updateTrainingGradeRules(trainingId, data) { return request({ diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue index 058c433fb..05bfdc10e 100644 --- a/src/views/trainingManage/demonMenu.vue +++ b/src/views/trainingManage/demonMenu.vue @@ -8,7 +8,7 @@
- + diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index 7bbfc0559..f58f0fb42 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -10,6 +10,7 @@ 实训名称:{{ editData.name || '' }}
+ 评分 预览 发布 清空步骤 @@ -252,6 +253,9 @@ export default { this.tableData[data.index].tipPosition = data.tipPosition; } }, + gradeRules() { + this.$emit('gradeRules', this.editData); + }, handleDelete(index, row) { console.log('删除', index, row); this.$confirm('确定删除该条步骤数据?', '警告', { diff --git a/src/views/trainingManage/gradeRules.vue b/src/views/trainingManage/gradeRules.vue index a7ea81b42..c583f8f1b 100644 --- a/src/views/trainingManage/gradeRules.vue +++ b/src/views/trainingManage/gradeRules.vue @@ -39,7 +39,7 @@ /> + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 86b9e48c1..027ed2e6a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -100,6 +100,9 @@ {{ $t('login.login') }} +
+
忘记密码
+
@@ -128,6 +131,7 @@ + @@ -156,10 +160,11 @@ import { getSimulationInfoNew } from '@/api/simulation'; import { getSimulationInfoByGroup } from '@/api/rtSimulation'; import { getSessionStorage } from '@/utils/auth'; import Register from './register'; +import ForgetPassword from './forgetPassword'; export default { name: 'Login', - components: { QrcodeVue, FloatPart, Register }, + components: { QrcodeVue, FloatPart, Register, ForgetPassword }, data() { const validateName = (rule, value, callback) => { if (value) { @@ -623,6 +628,9 @@ export default { // }, registerUser() { this.$refs.register.doShow(); + }, + forgetPassword() { + this.$refs.forgetPassword.doShow(); } } }; @@ -762,7 +770,7 @@ export default { .popover_box { position: absolute; right: 80px; - bottom: 106px; + bottom: 124px; cursor: pointer; color: #225592; font-size: 14px; diff --git a/src/views/system/userControl/index.vue b/src/views/system/userControl/index.vue index c31ad1a67..1faf04231 100644 --- a/src/views/system/userControl/index.vue +++ b/src/views/system/userControl/index.vue @@ -15,6 +15,7 @@ import DictionaryEdit from './edit'; import CreateUser from './createUser'; import CreateSingleUser from './createSingleUser'; import BindCompany from './bindCompany'; +import {adminResetUserPassword} from '@/api/management/user'; export default { name: 'UserControl', @@ -163,6 +164,10 @@ export default { name: '绑定组织管理员', handleClick: this.handleBind }, + { + name: '重置密码', + handleClick: this.resetPassword + }, { name: '删除', handleClick: this.handleDelete @@ -222,6 +227,19 @@ export default { handleBind(index, row) { this.$refs.bindCompany.doShow(row); }, + resetPassword(index, row) { + this.$confirm('操作会将改用户密码重置为初始密码,是否继续', this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), + type: 'warning' + }).then(() => { + adminResetUserPassword(row.id).then(response => { + this.$message.success('重置密码成功!'); + }).catch(() => { + this.$message.error('重置密码失败!'); + }); + }); + }, handleDelete(index, row) { deleteUserInLogic(row.id).then(resp=> { // 逻辑删除 From abf01b79455d4808035216ffb3d87fd69e83620c Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 15 Sep 2022 13:15:17 +0800 Subject: [PATCH 120/212] =?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/views/trainingManage/expression.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/trainingManage/expression.vue b/src/views/trainingManage/expression.vue index 9f4d4cbd8..a43d97c62 100644 --- a/src/views/trainingManage/expression.vue +++ b/src/views/trainingManage/expression.vue @@ -304,6 +304,7 @@ export default { if (findObj) { if (this.field == 'startSignal') { this[this.field] = findObj.code; + this.formModel.elementCode = ''; } else { this.formModel[this.field] = findObj.code; } From 78e065ec7a868777fcd790fda388d9bdc40b4620 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 15 Sep 2022 13:29:52 +0800 Subject: [PATCH 121/212] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=89=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E5=88=97=E8=BD=A6=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Train/ETriangle.js | 49 ++++++++++++++++++++-- src/jmapNew/shape/graph/Train/index.js | 3 ++ src/utils/baseUrl.js | 4 +- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/shape/graph/Train/ETriangle.js b/src/jmapNew/shape/graph/Train/ETriangle.js index 72a07e6c9..ce3fbf8b3 100644 --- a/src/jmapNew/shape/graph/Train/ETriangle.js +++ b/src/jmapNew/shape/graph/Train/ETriangle.js @@ -17,7 +17,7 @@ export default class ETriangle extends Group { if (model && model.point) { const right = model.right == 1 ? 1 : -1; if (this.style.Section.trainPosition.specialShow) { - this.stopRect = new Rect({ // 停车标识 + this.openDoorRect = new Rect({ // 停车标识 zlevel: model.zlevel, z: model.z, shape: { @@ -31,6 +31,20 @@ export default class ETriangle extends Group { fill: 'rgba(26, 54, 88, 0.7)' } }); + this.stopRect = new Rect({ + zlevel: model.zlevel, + z: model.z, + shape: { + x: model.point.x - this.style.Section.trainPosition.stopTrainRectWidth, + y: model.point.y - this.style.Section.line.width / 4, + width: 4, + height: this.style.Section.line.width + 2 + }, + style: { + lineWidth: 0, + fill: 'rgba(255,0,0,0.7)' + } + }); this.angle1 = new Rect({ zlevel: model.zlevel, z: model.z, @@ -64,8 +78,9 @@ export default class ETriangle extends Group { }); this.add(this.angle1); this.add(this.angle); + this.add(this.openDoorRect); this.add(this.stopRect); - this.stopRect.hide(); + this.openDoorRect.hide(); } else { this.angle = new Polygon({ zlevel: model.zlevel, @@ -136,7 +151,7 @@ export default class ETriangle extends Group { }); this.angle1.dirty(); } - if (this.stopRect) { + if (this.openDoorRect) { const offset = (this.style.Section.trainPosition.specialRectWidth - this.style.Section.line.width) / 2; let trainRight = model.x + offset; if (right == 1) { @@ -148,6 +163,26 @@ export default class ETriangle extends Group { width: this.style.Section.line.width - 2, height: this.style.Section.line.width - 2 }; + this.openDoorRect.attr({ + shape: pointsData + }); + this.openDoorRect.animateTo({ + shape: pointsData + }, 10, 0, 'elasticOut', function () { + }); + this.openDoorRect.dirty(); + } + if (this.stopRect) { + let trainRight = model.x + this.style.Section.trainPosition.specialRectWidth; + if (right == 1) { + trainRight = model.x - this.style.Section.trainPosition.specialRectWidth - 4; + } + const pointsData = { + x: trainRight, + y: model.y - this.style.Section.line.width / 2, + width: 4, + height: this.style.Section.line.width + 2 + }; this.stopRect.attr({ shape: pointsData }); @@ -161,7 +196,6 @@ export default class ETriangle extends Group { trainB.setPositionText(model, right); } } - setStopShow(flag) { if (flag) { this.stopRect && this.stopRect.show(); @@ -169,4 +203,11 @@ export default class ETriangle extends Group { this.stopRect && this.stopRect.hide(); } } + setOpenDoorShow(flag) { + if (flag) { + this.openDoorRect && this.openDoorRect.show(); + } else { + this.openDoorRect && this.openDoorRect.hide(); + } + } } diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index 66e737160..4bd545f5c 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -347,11 +347,14 @@ export default class Train extends Group { if (status != undefined) { if (status) { this.trainB && this.trainB.setDShow(false); + this.triangle && this.triangle.setOpenDoorShow(false); } else { this.trainB && this.trainB.setDShow(true); + this.triangle && this.triangle.setOpenDoorShow(true); } } else { this.trainB && this.trainB.setDShow(false); + this.triangle && this.triangle.setOpenDoorShow(false); } } // 设置通信状态类型 diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index b654d6b38..0c6bfc252 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -24,14 +24,14 @@ export function handlerUrl(data) { if (process.env.NODE_ENV === 'development') { // const data = null; // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.233/rtss-server'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.3.90:9100'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 - BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 + // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 From e8c23acab777e194836693b5db62fabde61c1d02 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 15 Sep 2022 14:23:58 +0800 Subject: [PATCH 122/212] =?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/views/trainingManage/demonMenu.vue | 2 +- src/views/trainingManage/editCondition.vue | 24 ++++++++++++++-------- src/views/trainingManage/editDetails.vue | 5 +++++ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue index 05bfdc10e..064f38031 100644 --- a/src/views/trainingManage/demonMenu.vue +++ b/src/views/trainingManage/demonMenu.vue @@ -81,7 +81,7 @@ export default { this.$refs.editDetails.backStep(); }, handleCondition(index, row, key) { - this.$refs.editCondition.doShow(row[key], index, key); + this.$refs.editCondition.doShow(row, index, key); }, getMaterials() { getTrainingMaterials().then(res => { diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue index 949342964..db9128d6f 100644 --- a/src/views/trainingManage/editCondition.vue +++ b/src/views/trainingManage/editCondition.vue @@ -61,6 +61,7 @@ export default { tabVisible: false, dialogVisible: false, tableData: [], + roleDeviceCode: '', // 角色对应站点code activeIndexPath: '', rowIndex: 0, conditionKey: '' @@ -106,15 +107,17 @@ export default { } }); Object.values(this.mapStationDirectionData).forEach(item => { - let isAuto = true; - if (item.runModel == 'S') { - isAuto = false; + if (!this.roleDeviceCode || this.roleDeviceCode == item.relativeStationCode) { + let isAuto = true; + if (item.runModel == 'S') { + isAuto = false; + } + list.push({ + code: item.code, + name: `${item.name}_${item.labelEnum}(${isAuto ? '自动闭塞' : '半自动闭塞'})`, + _type: `${isAuto ? 'StationDirectionAuto' : 'StationDirectionSemi'}` + }); } - list.push({ - code: item.code, - name: `${item.name}_${item.labelEnum}(${isAuto ? '自动闭塞' : '半自动闭塞'})`, - _type: `${isAuto ? 'StationDirectionAuto' : 'StationDirectionSemi'}` - }); }); this.getRouteList.forEach(item => { list.push({ @@ -256,7 +259,10 @@ export default { this.$emit('backStep'); this.doClose(); }, - doShow(data, rowIndex, conditionKey) { + doShow(row, rowIndex, conditionKey) { + const data = row[conditionKey]; + const member = this.$store.state.training.memberData[row.memberId]; + this.roleDeviceCode = member.deviceCode || ''; this.dialogVisible = true; this.tabVisible = true; this.activeIndexPath = ''; diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue index f58f0fb42..3cdf48a4d 100644 --- a/src/views/trainingManage/editDetails.vue +++ b/src/views/trainingManage/editDetails.vue @@ -268,6 +268,11 @@ export default { }, handleCondition(index, row, key) { console.log(key, '条件', index, row); + const member = this.$store.state.training.memberData[row.memberId]; + if (!member.userId) { + assignUsersPlayRoles([{ userId: this.$store.state.user.id, memberId: member.id}], this.$route.query.group).then(resp => { + }).catch(() => { this.$message.error('调整角色失败!'); }); + } this.$emit('handleCondition', index, row, key); this.doClose(); }, From ff2536c90d12917b5be2545d48f055db75143a10 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 15 Sep 2022 17:34:09 +0800 Subject: [PATCH 123/212] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=BD=A8=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trainingManage.js | 8 ++ src/i18n/langs/en/trainingManage.js | 1 + src/i18n/langs/zh/trainingManage.js | 1 + src/views/trainingManage/demonMenu.vue | 10 +- src/views/trainingManage/trackList.vue | 120 ++++++++++++++++++++++ src/views/trainingManage/trainingList.vue | 13 ++- 6 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 src/views/trainingManage/trackList.vue diff --git a/src/api/trainingManage.js b/src/api/trainingManage.js index 68577b0a2..101fe443c 100644 --- a/src/api/trainingManage.js +++ b/src/api/trainingManage.js @@ -64,6 +64,14 @@ export function publishTraining(data) { data }); } +/** 查询实现草稿发布轨迹 */ +export function draftPubTrace(data) { + return request({ + url: `/api/v2/training/draft/pub/trace/find/page`, + method: 'post', + data + }); +} /** 更新当前用户的某个实训草稿的大字段信息 */ export function updateTrainingContent(data) { return request({ diff --git a/src/i18n/langs/en/trainingManage.js b/src/i18n/langs/en/trainingManage.js index e01913a7a..e4347f399 100644 --- a/src/i18n/langs/en/trainingManage.js +++ b/src/i18n/langs/en/trainingManage.js @@ -10,6 +10,7 @@ export default { modify: 'modify', delete: 'delete', publish: 'publish', + publishTrack: 'track', preview: 'preview', mapLocation: 'Save map positioning', saveBackground: 'Save Background', diff --git a/src/i18n/langs/zh/trainingManage.js b/src/i18n/langs/zh/trainingManage.js index e929f29af..af18d55a5 100644 --- a/src/i18n/langs/zh/trainingManage.js +++ b/src/i18n/langs/zh/trainingManage.js @@ -10,6 +10,7 @@ export default { modify: '修改', delete: '删除', publish: '发布', + publishTrack: '发布轨迹', preview: '预览', mapLocation: '保存地图定位', saveBackground: '保存背景', diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue index 064f38031..41ecb6ba7 100644 --- a/src/views/trainingManage/demonMenu.vue +++ b/src/views/trainingManage/demonMenu.vue @@ -7,17 +7,19 @@ 实训列表 - + + + diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue index 7ff77225f..7a51ddb54 100644 --- a/src/views/trainingManage/trainingList.vue +++ b/src/views/trainingManage/trainingList.vue @@ -1,5 +1,5 @@ @@ -63,10 +64,12 @@ import { ScriptMode } from '@/scripts/ConstDic'; import { clearSimulation } from '@/api/simulation'; import { startTraining, endTraining } from '@/api/jmap/training'; +import ScenePlayRole from './scenePlayRole'; export default { name: 'TipTrainingDetail', components: { + ScenePlayRole }, props: { offsetBottom: { @@ -77,11 +80,6 @@ export default { data() { return { isShrink: true, - courseModel: { - id: '', - name: '', - description: '' - }, showSumbit: false, demoMode: ScriptMode.TEACH, TrainingMode: ScriptMode @@ -101,28 +99,13 @@ export default { return this.$route.query.group; } }, - watch: { - '$store.state.trainingNew.trainingDetail': function (val) { - if (val) { - this.courseModel = { - id: val.id, - name: val.name, - description: val.description - }; - } - } - }, + watch: {}, mounted() { this.loadInitData(); }, methods: { loadInitData() { this.showSumbit = false; - this.courseModel = { - id: '', - name: '', - description: '' - }; }, shrink() { // const height = this.$refs.dragBody.offsetHeight + 40; @@ -149,6 +132,13 @@ export default { this.$store.dispatch('trainingNew/changeTeachMode', this.demoMode); }, handlerStart() { + if (this.trainingDetail.type === 'SCENE') { + this.$refs.scenePlayRole.doShow(); + } else { + this.startTraining(); + } + }, + startTraining() { startTraining(this.group, {mode: this.teachMode}).then(() => { this.$store.dispatch('trainingNew/trainingStart'); this.$store.dispatch('trainingNew/setTrainingScore', ''); diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue index 6d5e35b2f..01a7a4f1f 100644 --- a/src/views/designPlatform/trainingPreview.vue +++ b/src/views/designPlatform/trainingPreview.vue @@ -4,12 +4,12 @@ - - + +
- 开始 - 结束 + + 返回
@@ -22,8 +22,8 @@ import MenuDemon from './demonMenu.vue'; import TrainingTip from './trainingTip'; import TrainingPositionTip from './trainingPositionTip'; import TrainingJlmap from './trainingJlmap'; -import ScenePlayRole from './scenePlayRole'; -// import TrainingMenu from './trainingMenu'; +// import ScenePlayRole from './scenePlayRole'; +import TrainingMenu from './trainingMenu'; export default { name: 'TrainingDesign', components: { @@ -31,8 +31,8 @@ export default { TrainingTip, TrainingJlmap, TrainingPositionTip, - ScenePlayRole - // TrainingMenu + // ScenePlayRole, + TrainingMenu }, props: { widthLeft: { @@ -47,7 +47,7 @@ export default { starting: false, selected: null, menus: null, - offsetBottom: 50 + offsetBottom: 15 }; }, computed: { @@ -89,8 +89,22 @@ export default { }, mounted() { this.$store.dispatch('trainingNew/setTrainingScore', ''); + this.handleOffsetBottom(); }, methods: { + handleOffsetBottom() { + setTimeout(() => { + const menuBottom = document.getElementById('menuButtons_box'); + const tipInfoBox = document.getElementById('tipInfoBox'); + const buttonWidth = this.width - 1200; + if (menuBottom && buttonWidth < 780) { + this.offsetBottom = (menuBottom.offsetHeight || 0) + 15; + } + if (tipInfoBox) { + this.offsetBottom += tipInfoBox.offsetHeight; + } + }, 500); + }, overallTranslation(flag) { const panel = document.getElementById('leftSlider'); if (flag) { diff --git a/src/views/designPlatform/trainingTip.vue b/src/views/designPlatform/trainingTip.vue index 36ee68dc7..1fa054b31 100644 --- a/src/views/designPlatform/trainingTip.vue +++ b/src/views/designPlatform/trainingTip.vue @@ -38,6 +38,9 @@ export default { this.trainingTipMessage = ''; } }, + '$store.state.socket.trainingStepFinishCount': function(val) { + this.trainingTipMessage = ''; + }, '$store.state.socket.trainingOverCount': function(val) { if (this.teachMode === ScriptMode.TEACH) { this.trainingTipMessage = '实训完成,请点击结束按钮。'; diff --git a/src/views/newMap/chatView/voiceChatBox.vue b/src/views/newMap/chatView/voiceChatBox.vue index b60e7fe1d..48f7cb2c0 100644 --- a/src/views/newMap/chatView/voiceChatBox.vue +++ b/src/views/newMap/chatView/voiceChatBox.vue @@ -513,6 +513,8 @@ export default { }, '$store.state.socket.simulationReset': function () { // 仿真重置 this.conversitionStateMap = {}; + this.commonMessageList = []; + this.messageList = []; const voiceName = document.querySelector('#voiceName'); if (voiceName) { voiceName.classList.remove('flash'); diff --git a/src/views/trainingManage/editOperate.vue b/src/views/trainingManage/editOperate.vue index d67d09da8..4a375ee00 100644 --- a/src/views/trainingManage/editOperate.vue +++ b/src/views/trainingManage/editOperate.vue @@ -33,6 +33,7 @@ diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue new file mode 100644 index 000000000..af51ab882 --- /dev/null +++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue @@ -0,0 +1,162 @@ + + + diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue index 4bb85ee5a..9920156b2 100644 --- a/src/views/newMap/newMapdraft/dataRelation/index.vue +++ b/src/views/newMap/newMapdraft/dataRelation/index.vue @@ -33,6 +33,7 @@ import RouteOperate from './routeoperate/index'; import RoutingOperate from './routingoperate/index'; import BigRoutingOperate from './bigroutingoperate/index'; import IndicatorAssociatedInfo from './indicatorAssociatedInfo/index'; +import DisStationOperate from './disStationOperate/index'; import AutomaticOperate from './automaticoperate/index'; // import PathOperate from './pathoperate/index'; import RunLevelOperate from './runLeveloperate/index'; @@ -58,6 +59,7 @@ export default { TurnedOperate, DwellTimeOperate, ContinueProtectOperate, + DisStationOperate, IndicatorAssociatedInfo // DestinationOperate }, @@ -102,6 +104,9 @@ export default { {label: '出入口', name: 'indicatorAssociatedInfo', menus: IndicatorAssociatedInfo} // {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate} ]; + if (this.$route.query.lineCode == '16') { + this.tabList.push({label: '调度台', name: 'DisStationOperate', menus: DisStationOperate}); + } this.enabledTab = 'bigRoutingOperate'; } else { this.tabList = [ From 806b237ae7f20bb3d84e8a182c75588f3611c4f0 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 19 Sep 2022 16:04:07 +0800 Subject: [PATCH 136/212] =?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/views/trainingManage/gradeRules.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/trainingManage/gradeRules.vue b/src/views/trainingManage/gradeRules.vue index c583f8f1b..c95aa0c95 100644 --- a/src/views/trainingManage/gradeRules.vue +++ b/src/views/trainingManage/gradeRules.vue @@ -43,7 +43,7 @@ width="200" > @@ -133,21 +133,22 @@ export default { }); }, changeMember(memberId) { - this.currentStepMap = {}; + const currentStepMap = {}; if (this.gradeRulesMap[memberId]) { this.addModel.fullMarks = this.gradeRulesMap[memberId].fullMarks; this.gradeRulesMap[memberId].details.forEach(each=>{ - this.currentStepMap[each.elementId] = each.score; + currentStepMap['step' + each.elementId] = each.score; }); } else { this.allstepList.forEach(each=>{ if (each.memberId == memberId) { - this.currentStepMap[each.id] = 0; + currentStepMap['step' + each.id] = 0; } }); this.addModel.fullMarks = ''; this.addModel.details = []; } + this.currentStepMap = Object.assign({}, currentStepMap); this.addModel.memberId = memberId; }, doClose() { From e5174d7796e4dec264b664c3d928551fcb3bdef8 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Mon, 19 Sep 2022 16:35:57 +0800 Subject: [PATCH 137/212] =?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/views/designPlatform/trainingJlmap.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/designPlatform/trainingJlmap.vue b/src/views/designPlatform/trainingJlmap.vue index 33a55045a..d1ea6f2dc 100644 --- a/src/views/designPlatform/trainingJlmap.vue +++ b/src/views/designPlatform/trainingJlmap.vue @@ -1,7 +1,7 @@ diff --git a/src/views/newMap/displayBaSiDi/baSiDiNew.vue b/src/views/newMap/displayBaSiDi/baSiDiNew.vue index 9089753df..be5ff9da0 100644 --- a/src/views/newMap/displayBaSiDi/baSiDiNew.vue +++ b/src/views/newMap/displayBaSiDi/baSiDiNew.vue @@ -106,11 +106,10 @@ diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue index 8f1bf3294..dbbab7be3 100644 --- a/src/views/newMap/displayBaSiDi/index.vue +++ b/src/views/newMap/displayBaSiDi/index.vue @@ -26,7 +26,6 @@ import { getSessionStorage } from '@/utils/auth'; import { mapGetters } from 'vuex'; import { OperateMode } from '@/scripts/ConstDic'; -import { timeFormat } from '@/utils/date'; import { getToken } from '@/utils/auth'; import { creatSubscribe, clearSubscribe, displayTopic, getTopic } from '@/utils/stomp'; import SetTime from '@/views/newMap/displayNew/demon/setTime'; @@ -309,7 +308,7 @@ export default { if (resp && resp.code == 200 && resp.data) { if (!resp.data.dataError) { this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断 - this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`)); + this.$store.dispatch('training/setInitTime', resp.data.systemTime); this.$store.dispatch('training/countTime'); this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan); this.planRunning = resp.data.planRunning; @@ -342,7 +341,7 @@ export default { data.loadNumber = model.loadNum; } ranAsPlan(data, this.group).then(res => { - this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`)); + this.$store.dispatch('training/setInitTime', model.initTime); }).catch(error => { let message = ''; switch (error.code) { diff --git a/src/views/newMap/displayCity/demon/setTime.vue b/src/views/newMap/displayCity/demon/setTime.vue index d64695573..d189fea63 100644 --- a/src/views/newMap/displayCity/demon/setTime.vue +++ b/src/views/newMap/displayCity/demon/setTime.vue @@ -22,7 +22,7 @@ + diff --git a/src/views/fileManage/voiceManage/index.vue b/src/views/fileManage/voiceManage/index.vue index 13d2a5fe0..6d6b79315 100644 --- a/src/views/fileManage/voiceManage/index.vue +++ b/src/views/fileManage/voiceManage/index.vue @@ -2,15 +2,18 @@
+
+ + + diff --git a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue index 6bf010f3f..57dfc6360 100644 --- a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue +++ b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue @@ -144,74 +144,87 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ + +
时间控制
+
+ + + +
排定描述
+
+ + +
+ + +
开始时间
+
+ + + + +
结束时间
+
+ + + + +
延时时间
+
+ + + + +
今日
+
+ +
一次
+
+ +
无截至
+
+
+
+ +
设定
确认
+
+
+
+
+ +
实时广播
-
广播
+
广播
@@ -244,26 +257,35 @@
+
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue index d3a5751f7..88ea5bb97 100644 --- a/src/views/iscs/iscsSystem/stationNav.vue +++ b/src/views/iscs/iscsSystem/stationNav.vue @@ -2,17 +2,17 @@
-
-
-
+
+
+
+
+
{{ item.name }}
-
{{ item.name }}
-
@@ -512,10 +512,9 @@ export default { } .station-line{ height: 12px; - width: 80%; + width: 100%; position: absolute; background-image: linear-gradient(to bottom , #9c9c9c, #F0F0F0,#9c9c9c); - left: 10px; top: 25px; border: 1px #505050 solid; } @@ -574,7 +573,7 @@ export default { .station-box{ display: inline-block; position: relative; - margin-right: 1.8vw; + // margin-right: 1.8vw; width: 1.5vw; margin-top: 20px; cursor: pointer; @@ -704,8 +703,13 @@ background:rgba(231,237,253,0.9); padding:0px 1vw; } .stationList{ - display: inline-block; + // display: inline-block; + display: flex; + position: relative; + justify-content: space-between; + float: left; height: 100%; + width: 82%; } .station-nav-out{ position: absolute; diff --git a/src/views/pis/index.vue b/src/views/pis/index.vue index 20509b3cd..e43038c4e 100644 --- a/src/views/pis/index.vue +++ b/src/views/pis/index.vue @@ -44,8 +44,8 @@
@@ -73,12 +73,12 @@
@@ -94,8 +94,8 @@
@@ -130,13 +130,14 @@ export default { firstEndStationName: '', secondTrainRemain: NaN, secondEndStationName: '', + text: '' }, - bannerText: - '党的十八大提出,倡导富强、民主、文明、和谐,倡导自由、平等、公正、法治,倡导爱国、敬业、诚信、友善,积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标,自由、平等、公正、法治是社会层面的价值取向,爱国、敬业、诚信、友善是公民个人层面的价值准则,这24个字是社会主义核心价值观的基本内容。', onboardPisState: { groupNumber: '', - nextStationName: '', + stationName: '', endStationName: '', + parking: 0, + text: '党的十八大提出,倡导富强、民主、文明、和谐,倡导自由、平等、公正、法治,倡导爱国、敬业、诚信、友善,积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标,自由、平等、公正、法治是社会层面的价值取向,爱国、敬业、诚信、友善是公民个人层面的价值准则,这24个字是社会主义核心价值观的基本内容。' }, } }, From f0ee41a06c70feb12be14b50fc2ba8eeb20a023b Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 23 Sep 2022 09:20:06 +0800 Subject: [PATCH 161/212] =?UTF-8?q?pa=20=E6=97=B6=E9=97=B4=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/broadcast/stationHome.vue | 45 +++++++++++++++---- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue index 57dfc6360..2aa943298 100644 --- a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue +++ b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue @@ -427,7 +427,10 @@ export default { if (month < 10) { month = '0' + month; } - const day = new Date().getDate(); + let day = new Date().getDate(); + if (day < 10) { + day = '0' + day; + } this.addModel.startTime = year + '-' + month + '-' + day + ' 00:00:00'; this.addModel.endTime = year + '-' + month + '-' + day + ' 23:59:59'; this.addModel.delayTime = '00:01:00'; @@ -438,10 +441,22 @@ export default { if (month < 10) { month = '0' + month; } - const day = new Date().getDate(); - const hour = new Date().getHours(); - const minute = new Date().getMinutes(); - const second = new Date().getSeconds(); + let day = new Date().getDate(); + if (day < 10) { + day = '0' + day; + } + let hour = new Date().getHours(); + if (hour < 10) { + hour = '0' + hour; + } + let minute = new Date().getMinutes(); + if (minute < 10) { + minute = '0' + minute; + } + let second = new Date().getSeconds(); + if (second < 10) { + second = '0' + second; + } this.addModel.startTime = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second; this.addModel.endTime = ''; this.addModel.delayTime = ''; @@ -452,10 +467,22 @@ export default { if (month < 10) { month = '0' + month; } - const day = new Date().getDate(); - const hour = new Date().getHours(); - const minute = new Date().getMinutes(); - const second = new Date().getSeconds(); + let day = new Date().getDate(); + if (day < 10) { + day = '0' + day; + } + let hour = new Date().getHours(); + if (hour < 10) { + hour = '0' + hour; + } + let minute = new Date().getMinutes(); + if (minute < 10) { + minute = '0' + minute; + } + let second = new Date().getSeconds(); + if (second < 10) { + second = '0' + second; + } this.addModel.startTime = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second; this.addModel.endTime = ''; this.addModel.delayTime = '00:01:00'; From b6401aef96b5e90093dba31925572f4e34825537 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 23 Sep 2022 11:18:27 +0800 Subject: [PATCH 162/212] =?UTF-8?q?ISCS=20=E4=BF=A1=E6=81=AF=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscsSystem/config/pis/infoBroadcast.vue | 4 ++-- .../iscs/iscsSystem/config/pis/mainScreen.vue | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue b/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue index d0d1158ef..f50753d52 100644 --- a/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue +++ b/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue @@ -7,7 +7,7 @@ class="iscs-voice-broadcast-dialog" >
-
信息广播
+
滚动信息发布
实时信息 @@ -90,7 +90,7 @@
设定中
发布
-
取消
+
取消
diff --git a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue index 6793c1516..3f3ae2d33 100644 --- a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue +++ b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue @@ -57,10 +57,13 @@
-
{{ item.name }}
+
{{ item.name }}
+
+
{{ currentStation.stationName }}
+
-
{{ isSingleStation }}
操作
-
信息发布
窗口
+
滚动信息
发布
信息清除
@@ -142,9 +144,6 @@ export default { isSingleStation() { return this.$route.query.stationId.startsWith('Station') }, - singleStationHeader() { - return this.verticalHeader.slice(1) - }, }, data() { return { @@ -428,6 +427,12 @@ export default { width: 11%; text-align: center; } + .stationButton { + margin: 0; + .screen_station_name { + width: auto; + } + } } } } From 255964bfe36c0819a5c91f570115e2cf38d7f301 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 23 Sep 2022 14:11:08 +0800 Subject: [PATCH 163/212] =?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/utils/stomp.js | 8 ++++---- src/views/designPlatform/trainingJlmap.vue | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/utils/stomp.js b/src/utils/stomp.js index 1ded04c6b..ba80b426f 100644 --- a/src/utils/stomp.js +++ b/src/utils/stomp.js @@ -58,7 +58,7 @@ export function creatSubscribe(topic, header) { if (!Vue.prototype.$stomp) { Vue.prototype.$stomp = new StompClient(); } - if (!Vue.prototype.$stomp.subscribeMap[topic]) { + if (!Vue.prototype.$stomp.subscribeMap.has(topic)) { Vue.prototype.$stomp.subscribe(topic, callback, header); } } catch (error) { @@ -81,10 +81,10 @@ function callback(Response) { store.dispatch('socket/handleIscsPaState', JSON.parse(Response.body)); } else if (Response.headers.destination.includes('iscs/pis')) { store.dispatch('socket/handleIscsPisState', JSON.parse(Response.body)); - } else if (Response.headers.destination.includes('standPis')) { - store.dispatch('socket/handleStandPisState', JSON.parse(Response.body)) + } else if (Response.headers.destination.includes('standPis')) { + store.dispatch('socket/handleStandPisState', JSON.parse(Response.body)); } else if (Response.headers.destination.includes('onboardPis')) { - store.dispatch('socket/handleOnboardPisState', JSON.parse(Response.body)) + store.dispatch('socket/handleOnboardPisState', JSON.parse(Response.body)); } else { const data = JSON.parse(Response.body); store.dispatch('socket/setStomp', data); diff --git a/src/views/designPlatform/trainingJlmap.vue b/src/views/designPlatform/trainingJlmap.vue index 0bba1bc54..9c4167f39 100644 --- a/src/views/designPlatform/trainingJlmap.vue +++ b/src/views/designPlatform/trainingJlmap.vue @@ -406,10 +406,15 @@ export default { history.go(-1); }); }, - async subscribe() { - this.clearSubscribe(); - const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; - creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); + subscribe() { + // this.clearSubscribe(); + const topic = `${displayTopic}\/${this.$route.query.group}`; + const subscription = this.$stomp.subscribeMap.get(topic); + if (!subscription || !subscription.sub) { + const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; + creatSubscribe(topic, header); + } + }, clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.$route.query.group}`); From 21e3d49f48f89d614c7102a31368d24c31bf0877 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 23 Sep 2022 16:11:59 +0800 Subject: [PATCH 164/212] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=92=8C=E7=AB=99?= =?UTF-8?q?=E5=8F=B0PIS=E5=A2=9E=E5=8A=A0=E8=83=8C=E6=99=AF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pis/index.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/pis/index.vue b/src/views/pis/index.vue index e43038c4e..42cb3677a 100644 --- a/src/views/pis/index.vue +++ b/src/views/pis/index.vue @@ -42,7 +42,7 @@
-
+
-
+
- 车务终端 - 车务管理终端 - 路票 - 簿册 + 车务终端 + 车务管理终端 + 路票 + 簿册 - {{ faultMode?'切换到普通模式':'切换到故障模式' }} + {{ faultMode?'切换到普通模式':'切换到故障模式' }}
@@ -39,6 +39,7 @@ import {mapGetters} from 'vuex'; import { OperateMode } from '@/scripts/ConstDic'; import TrainTicket from '@/views/newMap/trainTicket/index.vue'; import RegisterBook from '@/views/newMap/registerBook/index'; +import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import DispatcherStation from '@/views/newMap/jointTrainingNew/dispatcherStation.vue'; export default { @@ -72,6 +73,21 @@ export default { 'trainList', 'trainWindowList' ]), + goCTCDom() { + return OperationEvent.TrainingDesign.menuButton.goCtc; + }, + goRpManageDom() { + return OperationEvent.TrainingDesign.menuButton.goRpManage; + }, + trainTicketDom() { + return OperationEvent.TrainingDesign.menuButton.trainTicket; + }, + registerBookDom() { + return OperationEvent.TrainingDesign.menuButton.registerBook; + }, + faultModeDom() { + return OperationEvent.TrainingDesign.menuButton.faultMode; + }, prdType() { return this.$store.state.training.prdType; }, @@ -171,56 +187,94 @@ export default { mode = OperateMode.NORMAL; } this.$store.dispatch('training/changeOperateMode', { mode: mode }); + const operate = { + operation: this.faultModeDom.operation, + param: { mode: mode }, + userOperationType: 'leftClick' + }; + this.$store.dispatch('training/nextNew', operate); }, goCtc() { - const routeData = this.$router.resolve({ - path:'/displayNew/demon', - query:{ - lineCode:this.$route.query.lineCode, - group: this.$route.query.group, - prdType: '01', - mapId:this.$route.query.mapId, - project: this.project, - newApi: false, - ctc: true, - try: this.$route.query.try || 0, - token: getToken(), - noPreLogout: true + const operate = { + operation: this.goCTCDom.operation, + userOperationType: 'leftClick' + }; + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + const routeData = this.$router.resolve({ + path:'/displayNew/demon', + query:{ + lineCode:this.$route.query.lineCode, + group: this.$route.query.group, + prdType: '01', + mapId:this.$route.query.mapId, + project: this.project, + newApi: false, + ctc: true, + try: this.$route.query.try || 0, + token: getToken(), + noPreLogout: true + } + }); + window.open(routeData.href, '_blank'); } }); - window.open(routeData.href, '_blank'); }, goRpManage() { - const routeData = this.$router.resolve({ - path:'/bigTrainRunplanManage', - query:{ - group: this.$route.query.group, - mapId:this.$route.query.mapId, - project: this.project, - prdType: this.prdType, - lineCode:this.$route.query.lineCode, - // stationCode:this.$store.state.training.roleDeviceCode, - // token:getToken(), - noPreLogout: true + const operate = { + operation: this.goRpManageDom.operation, + userOperationType: 'leftClick' + }; + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + const routeData = this.$router.resolve({ + path:'/bigTrainRunplanManage', + query:{ + group: this.$route.query.group, + mapId:this.$route.query.mapId, + project: this.project, + prdType: this.prdType, + lineCode:this.$route.query.lineCode, + // stationCode:this.$store.state.training.roleDeviceCode, + // token:getToken(), + noPreLogout: true + } + }); + window.open(routeData.href, '_blank'); } }); - window.open(routeData.href, '_blank'); }, showTrainTicket() { - const stationSupervisorList = []; - for (const memberId in this.$store.state.training.memberData) { - const item = this.$store.state.training.memberData[memberId]; - if (item.type === 'STATION_SUPERVISOR') { - const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); - const memberData = { labelName: '值班员-' + device.name + (item.name ? `-${item.name }` : ''), id:item.id, userId:item.userId }; - stationSupervisorList.push(memberData); + const operate = { + operation: this.trainTicketDom.operation, + userOperationType: 'leftClick' + }; + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + const stationSupervisorList = []; + for (const memberId in this.$store.state.training.memberData) { + const item = this.$store.state.training.memberData[memberId]; + if (item.type === 'STATION_SUPERVISOR') { + const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); + const memberData = { labelName: '值班员-' + device.name + (item.name ? `-${item.name }` : ''), id:item.id, userId:item.userId }; + stationSupervisorList.push(memberData); + } + } + EventBus.$emit('trainTicketMember', stationSupervisorList); + this.$refs.trainTicket.doShow(); } - } - EventBus.$emit('trainTicketMember', stationSupervisorList); - this.$refs.trainTicket.doShow(); + }); }, showRegisterBook() { - this.$refs.registerBook.doShow(); + const operate = { + operation: this.registerBookDom.operation, + userOperationType: 'leftClick' + }; + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$refs.registerBook.doShow(); + } + }); }, // 获取设备数据 getDeviceByEm(em) { diff --git a/src/views/newMap/chatView/voiceChatBox.vue b/src/views/newMap/chatView/voiceChatBox.vue index 48f7cb2c0..ccc23c38f 100644 --- a/src/views/newMap/chatView/voiceChatBox.vue +++ b/src/views/newMap/chatView/voiceChatBox.vue @@ -1,6 +1,6 @@