From 5e5474aee994a353032981b4509a503f295ca7eb Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 6 Sep 2021 17:49:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=85=8D=E7=BD=AE=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/shape/graph/Arrow/index.js | 2 +- src/jmapNew/shape/graph/AutoTurnBack/index.js | 2 +- .../shape/graph/AutomacticRoute/index.js | 2 +- src/jmapNew/shape/graph/AxleReset/index.js | 2 +- src/jmapNew/shape/graph/DirectionRod/index.js | 2 +- src/jmapNew/shape/graph/FloodGate/index.js | 2 +- src/jmapNew/shape/graph/GuideLock/index.js | 2 +- src/jmapNew/shape/graph/LcControl/index.js | 2 +- src/jmapNew/shape/graph/LimitControl/index.js | 2 +- src/jmapNew/shape/graph/Line/index.js | 2 +- src/jmapNew/shape/graph/OutFrame/index.js | 2 +- src/jmapNew/shape/graph/Power/index.js | 2 +- src/jmapNew/shape/graph/Psd/index.js | 2 +- src/jmapNew/shape/graph/Resource/index.js | 2 +- src/jmapNew/shape/graph/Responder/index.js | 2 +- src/jmapNew/shape/graph/SaidLamp/index.js | 2 +- src/jmapNew/shape/graph/Section/index.js | 2 +- src/jmapNew/shape/graph/Signal/index.js | 2 +- src/jmapNew/shape/graph/SignalButton/index.js | 2 +- src/jmapNew/shape/graph/SplitStation/index.js | 2 +- src/jmapNew/shape/graph/Station/index.js | 2 +- .../shape/graph/StationCounter/index.js | 2 +- .../shape/graph/StationDelayUnlock/index.js | 2 +- src/jmapNew/shape/graph/StationStand/index.js | 2 +- .../shape/graph/StationTurnBack/index.js | 2 +- src/jmapNew/shape/graph/Switch/index.js | 2 +- src/jmapNew/shape/graph/Text/index.js | 2 +- src/jmapNew/shape/graph/Train/index.js | 2 +- src/jmapNew/shape/graph/ZcControl/index.js | 2 +- src/jmapNew/theme/xian_01/menus/index.vue | 4 +- src/store/modules/map.js | 6 ++- .../mapoperate/displayConfig/depotConfig.vue | 21 ++------ .../displayConfig/dispatchConfig.vue | 5 +- .../mapoperate/displayConfig/localConfig.vue | 52 +++++++++++++++++-- 34 files changed, 90 insertions(+), 56 deletions(-) diff --git a/src/jmapNew/shape/graph/Arrow/index.js b/src/jmapNew/shape/graph/Arrow/index.js index 407539661..d3abc7cdd 100644 --- a/src/jmapNew/shape/graph/Arrow/index.js +++ b/src/jmapNew/shape/graph/Arrow/index.js @@ -54,7 +54,7 @@ export default class Arrow extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/AutoTurnBack/index.js b/src/jmapNew/shape/graph/AutoTurnBack/index.js index 864cc4252..fe9068545 100644 --- a/src/jmapNew/shape/graph/AutoTurnBack/index.js +++ b/src/jmapNew/shape/graph/AutoTurnBack/index.js @@ -173,7 +173,7 @@ export default class AutoTurnBack extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/AutomacticRoute/index.js b/src/jmapNew/shape/graph/AutomacticRoute/index.js index 9d36efa3d..3498c6402 100644 --- a/src/jmapNew/shape/graph/AutomacticRoute/index.js +++ b/src/jmapNew/shape/graph/AutomacticRoute/index.js @@ -138,7 +138,7 @@ export default class AutomacticRoute extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/AxleReset/index.js b/src/jmapNew/shape/graph/AxleReset/index.js index d8582e78b..d5812cc85 100644 --- a/src/jmapNew/shape/graph/AxleReset/index.js +++ b/src/jmapNew/shape/graph/AxleReset/index.js @@ -142,7 +142,7 @@ export default class AxleReset extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/DirectionRod/index.js b/src/jmapNew/shape/graph/DirectionRod/index.js index e565710b0..7f3ad987e 100644 --- a/src/jmapNew/shape/graph/DirectionRod/index.js +++ b/src/jmapNew/shape/graph/DirectionRod/index.js @@ -98,7 +98,7 @@ export default class DirectionRod extends Group { } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/FloodGate/index.js b/src/jmapNew/shape/graph/FloodGate/index.js index 1b544c886..1103774e5 100644 --- a/src/jmapNew/shape/graph/FloodGate/index.js +++ b/src/jmapNew/shape/graph/FloodGate/index.js @@ -62,7 +62,7 @@ export default class FloodGate extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/GuideLock/index.js b/src/jmapNew/shape/graph/GuideLock/index.js index 04c46cbeb..22ac2311e 100644 --- a/src/jmapNew/shape/graph/GuideLock/index.js +++ b/src/jmapNew/shape/graph/GuideLock/index.js @@ -149,7 +149,7 @@ export default class GuideLock extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/LcControl/index.js b/src/jmapNew/shape/graph/LcControl/index.js index 468322f6d..ba619d55c 100644 --- a/src/jmapNew/shape/graph/LcControl/index.js +++ b/src/jmapNew/shape/graph/LcControl/index.js @@ -89,7 +89,7 @@ export default class LcControl extends Group { } setShowMode() {} setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.control.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/LimitControl/index.js b/src/jmapNew/shape/graph/LimitControl/index.js index d318cca2a..02f6a9bba 100644 --- a/src/jmapNew/shape/graph/LimitControl/index.js +++ b/src/jmapNew/shape/graph/LimitControl/index.js @@ -94,7 +94,7 @@ export default class LimitControl extends Group { } setShowMode() {} setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.control.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Line/index.js b/src/jmapNew/shape/graph/Line/index.js index ccb30003f..4d2e17433 100644 --- a/src/jmapNew/shape/graph/Line/index.js +++ b/src/jmapNew/shape/graph/Line/index.js @@ -106,7 +106,7 @@ export default class Line2 extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.segment && this.segment.show(); this.viceSegment && this.viceSegment.show(); this.isShowShape = true; diff --git a/src/jmapNew/shape/graph/OutFrame/index.js b/src/jmapNew/shape/graph/OutFrame/index.js index 3d17b19f2..58b2ba980 100644 --- a/src/jmapNew/shape/graph/OutFrame/index.js +++ b/src/jmapNew/shape/graph/OutFrame/index.js @@ -58,7 +58,7 @@ export default class OutFrame extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.box && this.box.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Power/index.js b/src/jmapNew/shape/graph/Power/index.js index 99563bc82..59fe2591d 100644 --- a/src/jmapNew/shape/graph/Power/index.js +++ b/src/jmapNew/shape/graph/Power/index.js @@ -136,7 +136,7 @@ export default class Line2 extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild((child) => { child.show(); }); diff --git a/src/jmapNew/shape/graph/Psd/index.js b/src/jmapNew/shape/graph/Psd/index.js index e01796eac..e54be1fb2 100644 --- a/src/jmapNew/shape/graph/Psd/index.js +++ b/src/jmapNew/shape/graph/Psd/index.js @@ -92,7 +92,7 @@ export default class Line2 extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Resource/index.js b/src/jmapNew/shape/graph/Resource/index.js index f90a5c02f..66e188d20 100644 --- a/src/jmapNew/shape/graph/Resource/index.js +++ b/src/jmapNew/shape/graph/Resource/index.js @@ -71,7 +71,7 @@ export default class Resource extends Group { } setShowMode() {} setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.image && this.image.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Responder/index.js b/src/jmapNew/shape/graph/Responder/index.js index 676a17802..c58e09523 100644 --- a/src/jmapNew/shape/graph/Responder/index.js +++ b/src/jmapNew/shape/graph/Responder/index.js @@ -189,7 +189,7 @@ export default class Responder extends Group { } setShowMode() {} setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.block && this.block.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/SaidLamp/index.js b/src/jmapNew/shape/graph/SaidLamp/index.js index b126ee18b..e1bedff9f 100644 --- a/src/jmapNew/shape/graph/SaidLamp/index.js +++ b/src/jmapNew/shape/graph/SaidLamp/index.js @@ -223,7 +223,7 @@ export default class SaidLamp extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.control && this.control.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index 33ace11cb..ec75cdefe 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -597,7 +597,7 @@ export default class Section extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index 95c4d6151..f557d9356 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -1189,7 +1189,7 @@ class Signal extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index 3ced63ed2..e406f7035 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -132,7 +132,7 @@ export default class SignalButton extends Group { setShowMode() { } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/SplitStation/index.js b/src/jmapNew/shape/graph/SplitStation/index.js index 0e075bc02..889ac5c28 100644 --- a/src/jmapNew/shape/graph/SplitStation/index.js +++ b/src/jmapNew/shape/graph/SplitStation/index.js @@ -133,7 +133,7 @@ export default class SplitStation extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 49ef9ae33..50b09ed83 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -784,7 +784,7 @@ export default class Station extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { if (this.model.visible) { this.eachChild(item => { item.show(); diff --git a/src/jmapNew/shape/graph/StationCounter/index.js b/src/jmapNew/shape/graph/StationCounter/index.js index 7a74bbbf6..10e382313 100644 --- a/src/jmapNew/shape/graph/StationCounter/index.js +++ b/src/jmapNew/shape/graph/StationCounter/index.js @@ -91,7 +91,7 @@ export default class StationCounter extends Group { } setShowMode() {} setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/StationDelayUnlock/index.js b/src/jmapNew/shape/graph/StationDelayUnlock/index.js index 3f061abf7..0231ebafa 100644 --- a/src/jmapNew/shape/graph/StationDelayUnlock/index.js +++ b/src/jmapNew/shape/graph/StationDelayUnlock/index.js @@ -109,7 +109,7 @@ export default class StationDelayUnlock extends Group { } setShowMode() {} setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/StationStand/index.js b/src/jmapNew/shape/graph/StationStand/index.js index 82d911d65..f773dceb1 100644 --- a/src/jmapNew/shape/graph/StationStand/index.js +++ b/src/jmapNew/shape/graph/StationStand/index.js @@ -249,7 +249,7 @@ class StationStand extends Group { } } setShowStation(stationCode) { - if ((!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) && this.model.visible) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code) && this.model.visible) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/StationTurnBack/index.js b/src/jmapNew/shape/graph/StationTurnBack/index.js index 5cb821923..c7ede760b 100644 --- a/src/jmapNew/shape/graph/StationTurnBack/index.js +++ b/src/jmapNew/shape/graph/StationTurnBack/index.js @@ -199,7 +199,7 @@ export default class StationTurnBack extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js index 565aedd83..b90ee8602 100644 --- a/src/jmapNew/shape/graph/Switch/index.js +++ b/src/jmapNew/shape/graph/Switch/index.js @@ -811,7 +811,7 @@ export default class Switch extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Text/index.js b/src/jmapNew/shape/graph/Text/index.js index ee484fe2d..e128ca6b0 100644 --- a/src/jmapNew/shape/graph/Text/index.js +++ b/src/jmapNew/shape/graph/Text/index.js @@ -70,7 +70,7 @@ export default class Text2 extends Group { } } setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index a98851c87..5a6236b64 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -462,7 +462,7 @@ export default class Train extends Group { } } setShowStation(stationCode) { - if ((this.model.sectionModel && store.getters['map/checkDeviceShow'](stationCode, this.model.sectionModel.code)) || !stationCode) { + if (this.model.sectionModel && store.getters['map/checkDeviceShow'](stationCode, this.model.sectionModel.code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/ZcControl/index.js b/src/jmapNew/shape/graph/ZcControl/index.js index 04d21ab79..e1e6250ca 100644 --- a/src/jmapNew/shape/graph/ZcControl/index.js +++ b/src/jmapNew/shape/graph/ZcControl/index.js @@ -111,7 +111,7 @@ export default class ZcControl extends Group { } setShowMode() {} setShowStation(stationCode) { - if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue index 2d1c4fb81..ad6a6c05b 100644 --- a/src/jmapNew/theme/xian_01/menus/index.vue +++ b/src/jmapNew/theme/xian_01/menus/index.vue @@ -148,7 +148,9 @@ export default { const roleDeviceCode = this.$store.state.training.roleDeviceCode; const displayList = this.$store.state.map.map.displayList; const display = displayList.find(each=>{ - return each.stationCodeList.includes(roleDeviceCode); + if (each.type === 'LOCAL') { + return each.stationCodeList.includes(roleDeviceCode); + } }); if (display) { const codeList = [...display.switchStationCodeList]; diff --git a/src/store/modules/map.js b/src/store/modules/map.js index d6984df37..d4b480abf 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -671,7 +671,11 @@ const map = { if (state.map && state.map.displayList && state.map.displayList.length) { let flag = false; state.map.displayList.forEach(item => { - if (item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) { + if ( store.state.training.prdType === '01' && item.type === 'LOCAL' && item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) { + flag = true; + } else if ( store.state.training.prdType === '02' && item.type === 'CENTER' && item.elementList.includes(deviceCode)) { + flag = true; + } else if ( store.state.training.prdType === '09' && item.type === 'DEPOT_IL' && item.elementList.includes(deviceCode)) { flag = true; } }); diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue index 3fb0003e7..dc0ab224a 100644 --- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue +++ b/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue @@ -141,28 +141,13 @@ export default { back() { this.$emit('goDraw'); }, - generateOverlab() { // 生成 - if (!this.addModel.stationCodeList.length) { - this.$messageBox('请选择车站!'); - return; - } - if (!this.addModel.switchStationCodeList.length) { - this.$messageBox('请选择可切换显示的车站!'); - return; - } - this.tableData.push(this.addModel); - this.clearData(); - }, + clear() { - this.addModel = { stationCodeList: [], elementList: [], switchStationCodeList:[] }; - }, - clearData() { - this.addModel = { stationCodeList: [], elementList: [], switchStationCodeList:[] }; - this.index = ''; + this.addModel = { type: 'DEPOT_IL', elementList: [] }; }, generateData() { this.loading = true; - this.tableData = []; + this.clear(); const station = this.stationList.find(item => item.depot); console.log(station, station.code); [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList, diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/dispatchConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/dispatchConfig.vue index 12a892c63..cee399e27 100644 --- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/dispatchConfig.vue +++ b/src/views/newMap/newMapdraft/mapoperate/displayConfig/dispatchConfig.vue @@ -142,13 +142,12 @@ export default { this.$emit('goDraw'); }, clear() { - this.addModel = {elementList: []}; + this.addModel = { type: 'CENTER', elementList: []}; }, generateData() { this.loading = true; - this.tableData = []; + this.clear(); const station = this.stationList.find(item => item.depot); - [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList, ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList, ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList].forEach(item => { diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue index 644b7db80..8010d9981 100644 --- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue +++ b/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue @@ -65,7 +65,8 @@
- 按集中站生成并保存 + 按集中站生成 + 全显生成 保存 返回
@@ -259,20 +260,63 @@ export default { this.clearData(); }, clear() { - this.addModel = { stationCodeList: [], elementList: [], switchStationCodeList:[] }; + this.addModel = { type: 'LOCAL', stationCodeList: [], elementList: [], switchStationCodeList:[] }; }, clearData() { - this.addModel = { stationCodeList: [], elementList: [], switchStationCodeList:[] }; + this.addModel = { type: 'LOCAL', stationCodeList: [], elementList: [], switchStationCodeList:[] }; this.index = ''; this.cardMode = 'generate'; }, + generateAllData() { + this.loading = true; + this.tableData = []; + const tempData = { type: 'LOCAL', stationCodeList: [], elementList: [], switchStationCodeList:[] }; + const stationCodeList = []; + this.stationList.forEach(item => { + if (!item.depot) { + tempData.stationCodeList.push(item.code); + } else { stationCodeList.push(item.code); } + }); + [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList, + ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList, + ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList].forEach(item => { + if (!stationCodeList.includes(item.stationCode)) { + tempData.elementList.push(item.code); + } + }); + [...this.directionRodList].forEach(item => { + if (!stationCodeList.includes(item.deviceStationCode)) { + tempData.elementList.push(item.code); + } + }); + this.psdList.forEach(item => { + const stand = this.$store.getters['map/getDeviceByCode'](item.standCode); + if (!stationCodeList.includes(stand.stationCode)) { + tempData.elementList.push(item.code); + } + }); + this.tableData.push(tempData); + const map = this.$store.state.map.map; + const param = { + displayList: [...this.tableData, ...this.otherData], + mapId: this.$route.params.mapId + }; + saveMap(Object.assign(map, param)).then(response => { + this.loading = false; + this.$message.success('保存现地配置成功'); + this.cancelOverlab(); + }).catch(() => { + this.loading = false; + this.$messageBox('保存现地配置失败'); + }); + }, generateData() { this.loading = true; this.tableData = []; // switchStationCodeList:[...item.switchStationCodeList, item.code] this.stationList.forEach(item => { if (item.centralized) { - this.tableData.push({stationCodeList: [...item.chargeStationCodeList, item.code], elementList: [...item.chargeStationCodeList, item.code], switchStationCodeList:[...item.chargeStationCodeList, item.code]}); + this.tableData.push({type: 'LOCAL', stationCodeList: [...item.chargeStationCodeList, item.code], elementList: [...item.chargeStationCodeList, item.code], switchStationCodeList:[...item.chargeStationCodeList, item.code]}); } });