From 6794e6370f976029e312ea279037f7d8c096ecb9 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 21 Jul 2022 11:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E4=BA=8C=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=90=8D=E7=A7=B0=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 | 3 +- .../components/menus/dialog/setFault.vue | 32 +++++++++---------- .../theme/datie_02/menus/menuSection.vue | 2 +- .../theme/datie_02/menus/menuSignal.vue | 2 +- .../theme/datie_02/menus/menuSwitch.vue | 2 +- .../theme/datie_02/menus/menuTrain.vue | 2 +- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index ea2e0aa63..1391c9e8d 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -91,7 +91,8 @@ class Jlmap { this.style = selectLineCode(lineCode); this.$zr.dom.style.backgroundColor = this.style.backgroundColor || '#000'; } - handleModelData() { + // 处理私有属性 + handleModelData(oldLineCode, lineCode) { } loadDefaultState() { // 加载默认状态 diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index 17cd93abb..9ee3af586 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -201,12 +201,12 @@ export default { {label: '计轴故障', value: 'FAULT'}, {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'} ]; - } else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm'){ - this.faultList = [ - {label: '计轴故障', value: 'FAULT'}, - {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'} - ]; - } else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') { + } else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm') { + this.faultList = [ + {label: '电路故障', value: 'FAULT'} + // {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'} + ]; + } else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') { this.faultList = [ {label: '失表', value: 'SPLIT'}, {label: '定位失表', value: 'NORMAL_SPLIT'}, @@ -215,16 +215,16 @@ export default { {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}, {label: '计轴故障', value: 'AXLE_FAULT'} ]; - } else if(selected._type === 'Switch' && this.popClass === 'datie-02__systerm') { - this.faultList = [ - {label: '失表', value: 'SPLIT'}, - {label: '定位失表', value: 'NORMAL_SPLIT'}, - {label: '反位失表', value: 'REVERSE_SPLIT'}, - {label: '挤岔', value: 'SQUEEZE'}, - {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}, - {label: '红光带故障', value: 'AXLE_FAULT'} - ]; - } else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') { + } else if (selected._type === 'Switch' && this.popClass === 'datie-02__systerm') { + this.faultList = [ + {label: '失表', value: 'SPLIT'}, + {label: '定位失表', value: 'NORMAL_SPLIT'}, + {label: '反位失表', value: 'REVERSE_SPLIT'}, + // {label: '挤岔', value: 'SQUEEZE'}, + // {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}, + {label: '电路故障', value: 'AXLE_FAULT'} + ]; + } else if (selected._type === 'Section' && this.popClass === 'xian-01__systerm') { this.faultList = [ {label: '红光带故障', value: 'FAULT'}, {label: '粉光带故障', value: 'CBTC_OCCUPIED_FAULT'}, diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue index 3bfec1c27..37db1bd04 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue @@ -145,7 +145,7 @@ export default { // this.menu = MenuContextHandler.covert(this.menuNormal); this.menu = this.menuNormal.Local; const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode); - if (station.controlMode === 'Interlock' && this.$route.query.ctc) { + if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) { this.menu.forEach(item => { item.disabled = true; }); } else { this.menu.forEach(item => { item.disabled = false; }); } } else { diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue index f6947241c..0cf472ed0 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue @@ -210,7 +210,7 @@ export default { // this.menu = MenuContextHandler.covert(this.menuNormal); this.menu = this.menuNormal.Local; const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode); - if (station.controlMode === 'Interlock' && this.$route.query.ctc) { + if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) { this.menu.forEach(item => { item.disabled = true; }); } else { this.menu.forEach(item => { item.disabled = false; }); } // 故障模式菜单列表 diff --git a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue index 559fd1aec..d7a35a11f 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue @@ -200,7 +200,7 @@ export default { // this.menu = MenuContextHandler.covert(this.menuNormal); this.menu = this.menuNormal.Local; const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode); - if (station.controlMode === 'Interlock' && this.$route.query.ctc) { + if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) { this.menu.forEach(item => { item.disabled = true; }); } else { this.menu.forEach(item => { item.disabled = false; }); } // 故障模式菜单列表 diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue index aa543d90c..175177c97 100644 --- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue @@ -239,7 +239,7 @@ export default { // 编辑模式菜单列表 this.menu = MenuContextHandler.covert(this.menuNormal); const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode); - if (station.controlMode === 'Interlock' && this.$route.query.ctc) { + if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) { this.menu.forEach(item => { item.disabled = true; }); } else { this.menu.forEach(item => { item.disabled = false; }); } // 故障模式菜单列表