From 31f95a02c1c2cc4a43af2e63389270f89b086393 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 6 Sep 2022 15:43:43 +0800 Subject: [PATCH 1/5] =?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/trainingList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/designPlatform/trainingList.vue b/src/views/designPlatform/trainingList.vue index 8690ee76f..031215ef0 100644 --- a/src/views/designPlatform/trainingList.vue +++ b/src/views/designPlatform/trainingList.vue @@ -50,6 +50,7 @@ export default { selectCheckShow: false, paginationHiden: true, indexShow: true, + height: 500, columns: [ { title: this.$t('trainingManage.name'), From c7419c70668dfa53ea0c5177e3a9fac1eb124bda Mon Sep 17 00:00:00 2001 From: Yuan Date: Tue, 6 Sep 2022 16:52:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2&&=E4=BF=A1=E6=81=AF=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datie_02/menus/dialog/infoDialog.vue | 54 +++++++++++ .../menus/dialog/operationLogQuery.vue | 90 +++++++++++++++++++ .../theme/datie_02/menus/menuPanel.vue | 19 +++- 3 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue create mode 100644 src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue diff --git a/src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue b/src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue new file mode 100644 index 000000000..4b6e63ee9 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue @@ -0,0 +1,54 @@ + + + + + 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 3/5] =?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 4/5] =?UTF-8?q?pictureList=20=E6=98=BE=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/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 5/5] 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防溜，上行.铁鞋（无编号）；下行.无防溜措施',