From 6742f0810f15e4f33a5ca9f7a26240b7337fed5c Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Tue, 19 Jan 2021 19:31:56 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9productionSourceMap?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 340fccb47480c7370debdd53adbe69f17cc0a558) --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index efe54c291..6c42bf449 100644 --- a/vue.config.js +++ b/vue.config.js @@ -32,7 +32,7 @@ module.exports = { outputDir: outputDir, assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录 lintOnSave: false, - productionSourceMap: process.env.VUE_APP_SOURCE_MAP, + productionSourceMap: false, devServer: { port: port, host: '0.0.0.0', From 68366b25b120860926ecaa9b7020a69bff6af7ea Mon Sep 17 00:00:00 2001 From: lVAL Date: Wed, 20 Jan 2021 09:49:15 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=20=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=94=9F=E4=BA=A7source-map?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 - .env.production | 1 - .env.staging | 1 - vue.config.js | 11 ++++++----- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index ddb549af1..b387ff05b 100644 --- a/.env.development +++ b/.env.development @@ -19,4 +19,3 @@ VUE_APP_UPLOAD_API = 'https://upload.joylink.club' # Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js VUE_CLI_BABEL_TRANSPILE_MODULES = true -VUE_APP_SOURCE_MAP = true diff --git a/.env.production b/.env.production index 4c64df13f..71363ca9f 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,3 @@ NODE_ENV = 'production' VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' VUE_APP_UPLOAD_API = 'https://upload.joylink.club' -VUE_APP_SOURCE_MAP = false diff --git a/.env.staging b/.env.staging index 9277c1c33..d1042b068 100644 --- a/.env.staging +++ b/.env.staging @@ -5,4 +5,3 @@ NODE_ENV = 'test' VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' VUE_APP_UPLOAD_API = 'https://upload.joylink.club' -VUE_APP_SOURCE_MAP = false diff --git a/vue.config.js b/vue.config.js index efe54c291..c9d69dcba 100644 --- a/vue.config.js +++ b/vue.config.js @@ -19,6 +19,7 @@ let outputDir = ''; outputDir = process.env.VUE_APP_PRO == 'local' || process.env.VUE_APP_PRO == 'ntyl' ? 'dist' : 'dist/cbtc'; })(); + // All configuration item explanations can be find in https://cli.vuejs.org/config/ module.exports = { /** @@ -32,7 +33,7 @@ module.exports = { outputDir: outputDir, assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录 lintOnSave: false, - productionSourceMap: process.env.VUE_APP_SOURCE_MAP, + productionSourceMap: false, devServer: { port: port, host: '0.0.0.0', @@ -72,7 +73,7 @@ module.exports = { // }) // ); if (process.env.NODE_ENV != 'development') { - config.mode = 'production'; + config.mode = 'production'; Object.assign(config, { output:{ @@ -83,8 +84,8 @@ module.exports = { }); } else { // 为开发环境修改配置... - config.mode = 'development'; - config.name = name; + config.mode = 'development'; + config.name = name; } config.resolve = { @@ -142,7 +143,7 @@ module.exports = { config // https://webpack.js.org/configuration/devtool/#development .when(process.env.NODE_ENV === 'development', - config => config.devtool('cheap-source-map') + config => config.devtool('eval-source-map') ); config From 5b5d635f07d0da9aa2cfbc3ada381c16d1369456 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 20 Jan 2021 09:54:01 +0800 Subject: [PATCH 03/25] =?UTF-8?q?bug103=20=E8=AE=BE=E7=BD=AE=E5=81=9C?= =?UTF-8?q?=E7=AB=99=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?15-300S=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue | 7 ++++--- .../theme/components/menus/dialog/standStopTime.vue | 3 ++- src/jmapNew/theme/foshan_01/menus/index.vue | 2 ++ src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue | 5 +++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue index 517b12677..a19e2463e 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue @@ -185,7 +185,8 @@ td { diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue index 2c605c30b..8b6e8c7f6 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue @@ -34,7 +34,8 @@ v-model="time" :disabled="disabledInput" controls-position="right" - :min="0" + :min="15" + :max="300" size="mini" style="width: 125px; padding-left:25px" @change="inputTime" @@ -87,7 +88,7 @@ export default { return { dialogShow: false, loading: false, - time: 0, + time: 15, control: '01', direction: '01', effective: false, From 5cbfa16d6c252d18d7ab4e8afd943984f0091a84 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 20 Jan 2021 10:16:15 +0800 Subject: [PATCH 04/25] =?UTF-8?q?bug104=20=E4=BA=A4=E6=8E=A7=E7=BA=BF?= =?UTF-8?q?=E8=A1=8C=E8=B0=83=E4=BB=BF=E7=9C=9F=EF=BC=9A=E7=AB=99=E5=8F=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=81=9C=E7=AB=99=E6=97=B6=E9=97=B4=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue index 600e69919..e6a3821f2 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue @@ -156,7 +156,7 @@ export default { // } // } this.modelData = { - stopTime: selected.parkingTime == 0 ? '自动' : `${selected.parkingTime} 秒`, + stopTime: selected.parkingTime < 0 ? '自动' : `${selected.parkingTime} 秒`, runLevel: this.runLevelList[selected.runLevelTime], detainCar: selected.stationHoldTrain || selected.centerHoldTrain ? '已设置' : '无扣车', jumpStop: selected.allSkip || selected.assignSkip ? '已设置' : '无跳停' From 79f0de576cc0ad65f14ea0d2c07dcb49a729831a Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 20 Jan 2021 11:16:09 +0800 Subject: [PATCH 05/25] =?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/chengdu_03/menus/menuButton.vue | 2 +- src/jmapNew/theme/chengdu_03/menus/menuSection.vue | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue index 02c4cbfd0..8702183b8 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue @@ -690,7 +690,7 @@ export default { } } else { this.clearOperate(); - this.$messageBox('请先切换到站控或紧急站控'); + // this.$messageBox('请先切换到站控或紧急站控'); } } } diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue index 8c864a28d..708c6639f 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue @@ -49,11 +49,6 @@ export default { menu: [], menuNormal: { Local: [ - { - label: '区故解', - handler: this.fault, - cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK - } ], Center: [ { From 330f58eba4f118e909b61b64e52d7759be9dc805 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 20 Jan 2021 13:50:37 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E5=8F=B3=E9=94=AE=E9=80=89=E6=8B=A9=20?= =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=BF=AB=E6=8D=B7=E6=93=8D=E4=BD=9C=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/nanjing_02/menus/menuButton.vue | 264 +++++++----------- .../newMap/mapsystemNew/common/index.vue | 7 +- 2 files changed, 107 insertions(+), 164 deletions(-) diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index e304ab4cf..8351d66a1 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -203,6 +203,18 @@ +
+ + + +
@@ -270,10 +282,15 @@ export default { tipList: [], modeMatch: false, stationDialogVisible:false, + rightClickDialogVisible: false, isAllowCommand:true, allowDetain:true, allowCancle:true, - allowJump:true + allowJump:true, + State2SimulationMap: { + '01': 'Local', // 现地工作站 + '02': 'Center' // 中心调度工作站 + } }; }, computed: { @@ -282,12 +299,6 @@ export default { 'stationList', 'routeData' ]), - State2SimulationMap() { - return { - '01': 'Local', // 现地工作站 - '02': 'Center' // 中心调度工作站 - }; - }, commandId() { return OperationEvent.Command.commandHaerbin.confirm.domId; }, @@ -311,90 +322,14 @@ export default { }, stationContorl() { return this.getStationControl(this.selected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {}; + }, + menuPosition() { + return this.$store.state.menuOperation.menuPosition; } }, watch: { '$store.state.menuOperation.setMenuChangeCount': function (val) { - if (this.selected._type) { - const type = this.State2SimulationMap[this.$store.state.training.prdType]; - this.modeMatch = true; - if (this.stationContorl.controlMode != type) { - this.modeMatch = false; - if (this.$store.state.training.prdType == '02' && this.selected._type == 'Station') { - this.selectedObj = this.selected; - if (this.selectedObj._type) { - this.canCommand = true; - const step = { - operation: 'click', - code: this.selectedObj.code, - subType:this.$store.state.menuOperation.subType - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.centralizedStationList = new Array(15).fill({}); - this.centralizedStationList[0] = { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledName: 'controlMode', mode: 'Center' }; - this.pushTempData([this.selectedObj]); - this.param = { stationCode: this.selectedObj.code }; - } - }); - } - } - } else { - this.centralizedStationList = new Array(15).fill({}); - } - } - this.pushTempData([]); // 清空执行栏 - this.selectedObj = this.selected; - if (this.selectedObj._type) { - if (this.selectedObj._type == 'Section' && (this.selectedObj.type == '03' || this.selectedObj.type == '04')) { // 道岔区段 道岔计轴区段 都是道岔操作 - this.selectedObj = this.selectedObj.switch; - } - this.canCommand = true; - const step = { - operation: 'click', - code: this.selectedObj.code, - subType:this.$store.state.menuOperation.subType - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - switch (this.selectedObj._type) { - case 'Switch': - this.handleSwicthMenu(); - break; - case 'Signal': - if (this.oldClickObj && this.oldClickObj.code != this.selectedObj.code) { - this.checkSignal(); - } else { - this.handleSingalMenu(); - } - break; - case 'Section': - if (this.trainOperationShow) { - this.handleTrainParam(); - } else { - this.handleSectionMenu(); - } - break; - case 'Station': - this.handleStationMenu(); - this.deviceHighLight(this.oldDevice, false); - this.deviceHighLight(this.selectedObj, true); - this.oldDevice = this.selectedObj; - break; - // case 'StationStand': - // if (this.$store.state.menuOperation.subType == 'trainSetButton') { - // this.handleStandMenu(); - // } - // break; - } - } - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - } }, '$store.state.training.prdType': function (val) { this.trainOperationShow = false; @@ -407,34 +342,36 @@ export default { } }, 'selected': function (val) { - this.initMenus(); - if (val.code && val._event == MouseEvent.Left) { + this.initMenus();// 初始化菜单数据 + this.pushTempData([]); // 清空执行栏 + this.selectedObj = this.selected; + this.rightClickDialogVisible = false; + if (this.selectedObj._type && (val._event == MouseEvent.Left || (val._event == MouseEvent.Right || this.$store.state.training.prdType === '01'))) { + const type = this.State2SimulationMap[this.$store.state.training.prdType]; + this.modeMatch = this.stationContorl.controlMode == type; + // 道岔区段 道岔计轴区段 都是道岔操作 + if (this.selectedObj._type == 'Section' && (this.selectedObj.type == '03' || this.selectedObj.type == '04')) { + this.selectedObj = this.selectedObj.switch; + } + this.canCommand = true; + const step = { + operation: 'click', + code: this.selectedObj.code, + subType:this.$store.state.menuOperation.subType + }; + this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + if (valid) { this.handleDeviceMenu(); } + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); if (val._type != 'Psd' && val._type != 'StationStand') { this.dialogVisible = !this.isLocal; } - if (val._type == 'StationStand' && this.$store.state.menuOperation.subType == 'trainSetButton') { - if (!(this.selectedObj.assignSkip || this.selectedObj.allSkip || this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain)) { - this.allowCancle = false; - } else { - if (this.selectedObj.assignSkip || this.selectedObj.allSkip) { - this.allowJump = false; - this.allowCancle = true; - this.allowDetain = false; - } - if (this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain) { - this.allowDetain = false; - this.allowCancle = true; - this.allowJump = false; - } - } - - this.stationDialogVisible = true; - } - } else if (!val.code) { + this.handleIbpShow(); + } else { this.dialogVisible = false; - if (this.$store.state.training.mode != TrainingMode.TEACH) { - this.handleBasicMenu(); - } + this.handleBasicMenu(); } }, '$store.state.map.showCentralizedStationCode': function(val) { @@ -476,6 +413,53 @@ export default { } } }, + handleDeviceMenu() { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + switch (this.selectedObj._type) { + case 'Switch': + this.handleSwicthMenu(); + break; + case 'Signal': + if (this.oldClickObj && this.oldClickObj.code != this.selectedObj.code) { + this.checkSignal(); + } else { + this.handleSingalMenu(); + } + break; + case 'Section': + if (this.trainOperationShow) { + this.handleTrainParam(); + } else { + this.handleSectionMenu(); + } + break; + case 'Station': + this.handleStationMenu(); + this.deviceHighLight(this.oldDevice, false); + this.deviceHighLight(this.selectedObj, true); + this.oldDevice = this.selectedObj; + break; + } + }, + handleIbpShow() { + if (this.selectedObj._type == 'StationStand' && this.$store.state.menuOperation.subType == 'trainSetButton') { + if (!(this.selectedObj.assignSkip || this.selectedObj.allSkip || this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain)) { + this.allowCancle = false; + } else { + if (this.selectedObj.assignSkip || this.selectedObj.allSkip) { + this.allowJump = false; + this.allowCancle = true; + this.allowDetain = false; + } + if (this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain) { + this.allowDetain = false; + this.allowCancle = true; + this.allowJump = false; + } + } + this.stationDialogVisible = true; + } + }, getStationControl(selected) { let control; if (selected._type == 'StationStand') { @@ -632,8 +616,13 @@ export default { this.centralizedStationList = new Array(15).fill({}); this.routeParamList.forEach((swicth, index) => { this.centralizedStationList[index] = swicth; + if (swicth.disabledCb && this.selectedObj) { + swicth.disabled = swicth.disabledCb(this.selectedObj); + } }); - + if (this.selectedObj._event === MouseEvent.Right) { + this.rightClickDialogVisible = true; + } this.pushTempData(this.selectRouteList); this.param = { routeCode: this.route.code @@ -702,7 +691,6 @@ export default { this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) { this.canCommand = true; } - // this.param.speedLimitValue = this.speedLimitValue; this.centralizedStationList = new Array(15).fill({ name: '' }); [65, 55, 45, 35, 25, 0].forEach((el, i) => { this.centralizedStationList[i] = { @@ -717,6 +705,7 @@ export default { } }, clickCommand(row, index) { + this.rightClickDialogVisible = false; this.paramIndex = row.next ? index : -1; if (row.next) { this.pushTempData([row]); @@ -817,6 +806,9 @@ export default { this.$refs.noticeInfo.doShow(); }); }, + handleRightClickClose() { + this.rightClickDialogVisible = false; + }, cancle() { if (this.$store.state.training.mode != TrainingMode.TEACH) { clearTimeout(this.timer); @@ -867,14 +859,7 @@ export default { } }); } - // this.trainModel = this.selectedObj; physicalCode - // this.formModelTripNum = this.trainModel.destinationCode + this.trainModel.serviceNumber + this.trainModel.tripNumber; - // this.formModelSectionName = this.trainModel.sectionModel.name; - // this.formModelNewTrip = ''; }, - // setSpeedLimitValue(val) { - // this.speedLimitValue = val; - // }, pushTempData(list) { this.tempData = []; list.forEach(el => { @@ -986,14 +971,6 @@ export default { { name: '' }, { name: '' }, { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (selectedObj) => ['None'].includes(selectedObj.controlMode) } - - // { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu }, - // { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu }, - // { name: '释放指令', cmdType: '', operate: OperationEvent.Station.humanControlALL.menu }, - // { name: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate:OperationEvent.Station.stationRestart.menuButton, securityCommand: true}, - // { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu }, - // { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu }, - // { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu }, ] : [ { name: '' }, { name: '' }, @@ -1011,7 +988,6 @@ export default { { name: '' }, { name: '' } ]; - this.sectionParamList = this.selected && this.selected.type == '05' ? [ { name: '岔芯设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, { name: '岔芯消限', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, @@ -1042,9 +1018,6 @@ export default { { name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, { name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, { name: '强行消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch } - - // { name: '转换定位', cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION, operate: OperationEvent.Switch.locate.menuButton, disabledName: 'normalPosition', disabledCb: (selectedObj) => !this.modeMatch }, - // { name: '转换反位', cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION, operate: OperationEvent.Switch.reverse.menuButton, disabledName: 'reversePosition', disabledCb: (selectedObj) => !this.modeMatch }, ]; this.signalParamList = this.$store.state.training.prdType === '01' ? [ { name: '关闭信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, @@ -1078,8 +1051,6 @@ export default { { name: '车队单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch } - - // { name: '重复开放', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, ]; this.stationParamList = this.$store.state.training.prdType === '01' ? [ { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, disabledCb: (selectedObj) => !['Local'].includes(selectedObj.controlMode) || !this.modeMatch } @@ -1088,33 +1059,6 @@ export default { { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, disabledCb: (selectedObj) => ['Center'].includes(selectedObj.controlMode) }, { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, disabledCb: (selectedObj) => ['Local', 'None'].includes(selectedObj.controlMode) } ]; - // [ - // { name: '' }, - // { name: '' }, - // { name: '' }, - // { name: '' }, - // { name: '' }, - // { name: '' }, - // { name: '' }, - // { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, securityCommand: true }, - // { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu }, - // { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu }, - // { name: '' }, - // { name: '' }, - // { name: '' }, - // { name: '' }, - // { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestStationControl.menu }, - // { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton }, - // { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton }, - // { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton }, - // { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton } - // ]; - // this.standParamList = this.$store.state.training.prdType === '01' ? [] : [ - // { name: '扣车', cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, operate: OperationEvent.StationStand.setDetainTrain.menuButton, show: false }, - // { name: '取消扣车', cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, operate: OperationEvent.StationStand.cancelDetainTrain.menuButton, show: false }, - // { name: '越站', cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, operate: OperationEvent.StationStand.setJumpStop.menuButton, show: false }, - // { name: '取消越站', cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, operate: OperationEvent.StationStand.cancelJumpStop.menuButton, show: false } - // ]; this.routeParamList = [ { name: '排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, { name: '取消进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (selectedObj) => !this.modeMatch } diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index 263c0d03e..b9e51ae4c 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -80,9 +80,8 @@ export default { if (section) { device = this.$store.getters['map/getDeviceByCode'](section.relSwitchCode); } - } - - // 过滤道岔相关区段变成道岔model + } + // 过滤道岔相关区段变成道岔model if (device._type == 'Section' && device.type == '03') { device = this.$store.getters['map/getDeviceByCode'](device.switch.code); } @@ -105,7 +104,7 @@ export default { this.selected = { ...device, _event: MouseEvent.Left }; this.$store.dispatch('menuOperation/setSelected', {device: device, subType: em.subType}); this.$store.dispatch('menuOperation/setLeftClickCount'); - if (this.$route.query.lineCode == '07' || this.$route.query.lineCode == '14') { + if (this.$route.query.lineCode == '07') { this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType}); } this.$store.dispatch('training/emitTipFresh'); From 057d7a7d758cb4c424bfdd2f75cd164b9b09336f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 20 Jan 2021 15:31:41 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E5=A4=A7=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E8=BF=90=E8=A1=8C=E5=9B=BE=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E6=89=93=E4=B8=8D=E5=BC=80=20bug=20=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/demon/planSchedule.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/newMap/displayNew/demon/planSchedule.vue b/src/views/newMap/displayNew/demon/planSchedule.vue index d9480fd60..069496033 100644 --- a/src/views/newMap/displayNew/demon/planSchedule.vue +++ b/src/views/newMap/displayNew/demon/planSchedule.vue @@ -35,6 +35,7 @@ import { EventBus } from '@/scripts/event-bus'; import { getByGroupStationList, getPassengerHistoryList } from '@/api/jmap/map'; import { loadRunPlanData } from '@/utils/loaddata'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; +import { getSimulationInfoNew } from '@/api/simulation'; import { getToken } from '@/utils/auth'; export default { name: 'PlanSchedule', @@ -188,8 +189,11 @@ export default { if (this.$route.query.group) { // 获取排序的车站列表 getByGroupStationList(this.$route.query.group).then(response => { - this.$store.dispatch('runPlan/setStations', response.data).then(async() => { - loadRunPlanData(this.$route.query.group, this.dataError); + getSimulationInfoNew(this.$route.query.group).then(res => { + this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan); + this.$store.dispatch('runPlan/setStations', response.data).then(async() => { + loadRunPlanData(this.$route.query.group, this.dataError); + }); }); }).catch(() => { this.$messageBox(this.$t('display.schema.getStationListFail')); From 0fb8eeb52b1529a33898911a50b00ecaa612ca82 Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Wed, 20 Jan 2021 15:41:20 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=92=8C=E6=B2=99=E7=9B=98=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E7=AB=99=E5=9C=BA=E5=9B=BE=E5=86=85=E5=A4=96=E4=BE=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edit/testEditorModel/StationStandList.js | 11 +++++++++-- src/jlmap3d/main/loaders/DriverLoadNew.js | 13 ++++++------- src/jlmap3d/main/loaders/SimulationLoadNew.js | 5 ++--- src/jlmap3d/main/newmodel/StationStandListN.js | 5 ++--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/jlmap3d/edit/testEditorModel/StationStandList.js b/src/jlmap3d/edit/testEditorModel/StationStandList.js index 2171bb837..8dd08b630 100644 --- a/src/jlmap3d/edit/testEditorModel/StationStandList.js +++ b/src/jlmap3d/edit/testEditorModel/StationStandList.js @@ -92,19 +92,25 @@ export function StationStandList() { // console.log(jlmap3ddata); let jlmapstationdata = jlmapdata.stationList; let jlmapstanddata = jlmapdata.stationStandList; + // + // console.log(jlmapstationdata); + // + // console.log(standsdata); // console.log(jlmapstationdata); for(let i=0;i Date: Wed, 20 Jan 2021 15:53:13 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E7=8E=B0=E5=9C=B0=E8=A1=8C=E8=B0=83?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=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/map.js | 19 +++++++++++------- src/jmapNew/shape/Arrow/index.js | 4 +--- src/jmapNew/shape/AutoTurnBack/index.js | 4 +--- src/jmapNew/shape/AutomacticRoute/index.js | 4 +--- src/jmapNew/shape/AxleReset/index.js | 4 +--- src/jmapNew/shape/DirectionRod/index.js | 4 +--- src/jmapNew/shape/FloodGate/index.js | 4 +--- src/jmapNew/shape/GuideLock/index.js | 4 +--- src/jmapNew/shape/Line/index.js | 4 +--- src/jmapNew/shape/OutFrame/index.js | 4 +--- src/jmapNew/shape/Power/index.js | 4 +--- src/jmapNew/shape/SaidLamp/index.js | 4 +--- src/jmapNew/shape/Signal/index.js | 4 +--- src/jmapNew/shape/Text/index.js | 4 +--- .../theme/ningbo_01/menus/menuSection.vue | 2 +- .../theme/ningbo_01/operationConfig.js | 20 +++++++++---------- src/jmapNew/utils/handlePath.js | 17 ++++------------ src/scripts/cmdPlugin/ValidateHandler.js | 1 - src/views/newMap/jlmapNew/index.vue | 9 +++++++-- 19 files changed, 47 insertions(+), 73 deletions(-) diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index e22b8bd4e..9a92dbf61 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -418,11 +418,16 @@ class Jlmap { }); } } - updatePrdType(val, list) { + updatePrdType(list, val, showMode) { this.showConfig.prdType = val; + this.showConfig.showMode = showMode; (list || []).forEach(item => { - this.hookHandle(item, this.showConfig); - this.$painter.update(item); + const code = item.code; + const type = item._type; + const oDevice = this.mapDevice[code] || deviceFactory(type, item, this.showConfig); + this.hookHandle(oDevice, this.showConfig); + this.$painter.update(oDevice); + this.$painter.updateShowMode(oDevice); }); } update(list) { @@ -482,9 +487,9 @@ class Jlmap { this.$painter.delete(oDevice); } else { this.$painter.update(oDevice); - } - } - store.commit('map/mapStationStateUpdate'); + } + } + store.commit('map/mapStationStateUpdate'); } else { if (elem.deviceType === 'TRAIN') { this.isUpdateShowTrainList = true; @@ -647,7 +652,7 @@ class Jlmap { break; case this.events.__Zoom: this.$mouseController.on(this.events.__Zoom, this.optionsHandler); - break; + break; } } } diff --git a/src/jmapNew/shape/Arrow/index.js b/src/jmapNew/shape/Arrow/index.js index 6f382dc89..f81df67d6 100644 --- a/src/jmapNew/shape/Arrow/index.js +++ b/src/jmapNew/shape/Arrow/index.js @@ -16,9 +16,7 @@ export default class Arrow extends Group { this.create(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/AutoTurnBack/index.js b/src/jmapNew/shape/AutoTurnBack/index.js index 83c303df7..b6196a323 100644 --- a/src/jmapNew/shape/AutoTurnBack/index.js +++ b/src/jmapNew/shape/AutoTurnBack/index.js @@ -24,9 +24,7 @@ export default class AutoTurnBack extends Group { this.createMouseEvent(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/AutomacticRoute/index.js b/src/jmapNew/shape/AutomacticRoute/index.js index eac3df196..5665bc9da 100644 --- a/src/jmapNew/shape/AutomacticRoute/index.js +++ b/src/jmapNew/shape/AutomacticRoute/index.js @@ -23,9 +23,7 @@ export default class AutomacticRoute extends Group { this.createMouseEvent(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/AxleReset/index.js b/src/jmapNew/shape/AxleReset/index.js index e4ae37973..0e36e059f 100644 --- a/src/jmapNew/shape/AxleReset/index.js +++ b/src/jmapNew/shape/AxleReset/index.js @@ -23,9 +23,7 @@ export default class AxleReset extends Group { this.createMouseEvent(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/DirectionRod/index.js b/src/jmapNew/shape/DirectionRod/index.js index 63518ce31..ea98b3b13 100644 --- a/src/jmapNew/shape/DirectionRod/index.js +++ b/src/jmapNew/shape/DirectionRod/index.js @@ -18,9 +18,7 @@ export default class DirectionRod extends Group { this.createMouseEvent(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { const model = this.model; diff --git a/src/jmapNew/shape/FloodGate/index.js b/src/jmapNew/shape/FloodGate/index.js index 8aec39cb2..5fb6e8d9a 100644 --- a/src/jmapNew/shape/FloodGate/index.js +++ b/src/jmapNew/shape/FloodGate/index.js @@ -21,9 +21,7 @@ export default class FloodGate extends Group { this.createMouseEvent(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/GuideLock/index.js b/src/jmapNew/shape/GuideLock/index.js index 0f7e0dcf7..451110d99 100644 --- a/src/jmapNew/shape/GuideLock/index.js +++ b/src/jmapNew/shape/GuideLock/index.js @@ -23,9 +23,7 @@ export default class GuideLock extends Group { this.createMouseEvent(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/Line/index.js b/src/jmapNew/shape/Line/index.js index 762a4dcb6..161b6736b 100644 --- a/src/jmapNew/shape/Line/index.js +++ b/src/jmapNew/shape/Line/index.js @@ -16,9 +16,7 @@ export default class Line2 extends Group { this.create(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/OutFrame/index.js b/src/jmapNew/shape/OutFrame/index.js index 23875e2dd..45cbce365 100644 --- a/src/jmapNew/shape/OutFrame/index.js +++ b/src/jmapNew/shape/OutFrame/index.js @@ -16,9 +16,7 @@ export default class OutFrame extends Group { this.create(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/Power/index.js b/src/jmapNew/shape/Power/index.js index ea2d54f65..d621f25f1 100644 --- a/src/jmapNew/shape/Power/index.js +++ b/src/jmapNew/shape/Power/index.js @@ -19,9 +19,7 @@ export default class Line2 extends Group { this.createTerminal(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/SaidLamp/index.js b/src/jmapNew/shape/SaidLamp/index.js index 5536254bf..8a4f585ef 100644 --- a/src/jmapNew/shape/SaidLamp/index.js +++ b/src/jmapNew/shape/SaidLamp/index.js @@ -28,9 +28,7 @@ export default class SaidLamp extends Group { this.createMouseEvent(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } } diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js index 1b660cd7a..cf5604de0 100644 --- a/src/jmapNew/shape/Signal/index.js +++ b/src/jmapNew/shape/Signal/index.js @@ -49,9 +49,7 @@ class Signal extends Group { this.createMouseEvent(); this.checkIsDrawMap(); this.transformRotation(this); - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); this.setState(model); // this.checkIsDrawMap(); } diff --git a/src/jmapNew/shape/Text/index.js b/src/jmapNew/shape/Text/index.js index 4379fd822..4deda11a3 100644 --- a/src/jmapNew/shape/Text/index.js +++ b/src/jmapNew/shape/Text/index.js @@ -19,9 +19,7 @@ export default class Text2 extends Group { this.create(); this.setState(model); } - if (model.previewOrMapDraw) { - this.setShowMode(); - } + this.setShowMode(); } create() { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue index 000c3ca4b..f6fa84734 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue @@ -276,7 +276,7 @@ export default { if (this.selected.type == '02' || this.selected.type == '03') { sectionCode = this.selected.parentCode; } - commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{ + commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.speedLimitControl.doShow(operate, this.selected); } diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 8d1c5f8f6..e306228e0 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -304,20 +304,20 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: 'Section_Set_Limit_Speed', + operateType: 'Section_Cancel_Limit_Speed', skinCode: '06', - trainingName: '设置临时限速({8}{9})', - trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）', + trainingName: '取消临时限速({8}{9})', + trainingRemark: '取消临时限速功能', trainingType: 'Section', productTypes: ['02'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, - { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值: 不限速】', val: '0' }, - { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, - { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, - { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' }, - { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' }, - { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } + { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【取消临时限速】' }, + // { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值: 不限速】', val: '0' }, + { deviceType: '03', orderNum: 2, operateCode: '4081', tip: '鼠标左键点击【下达】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '4082', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '03', orderNum: 4, operateCode: '4083', tip: '鼠标左键点击【确认1】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '4084', tip: '鼠标左键点击【确认2】按钮', val: '0' }, + { deviceType: '03', orderNum: 6, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] }, { diff --git a/src/jmapNew/utils/handlePath.js b/src/jmapNew/utils/handlePath.js index 034ea8b28..145fbe908 100644 --- a/src/jmapNew/utils/handlePath.js +++ b/src/jmapNew/utils/handlePath.js @@ -1,17 +1,8 @@ -export function getPrdType() { - let prdType = ''; - const path = window.location.href; - if (path.includes('?')) { - const arr = window.location.href.split('?')[1].split('&'); - arr.forEach(elem => { - if (elem.split('=')[0] === 'prdType') { - prdType = elem.split('=')[1]; - } - }); - } - return prdType; -} export function isShowThePrdType (prdType, showConditions) { + const path = window.location.href; + if (path.includes('jointTrainingNew')) { + return true; + } if (showConditions === '01' || (showConditions === '02' && prdType === '02') || (showConditions === '03' && prdType === '01')) { return true; } else if (!showConditions) { diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js index 9e4fcff79..87706d888 100644 --- a/src/scripts/cmdPlugin/ValidateHandler.js +++ b/src/scripts/cmdPlugin/ValidateHandler.js @@ -30,7 +30,6 @@ class ValidateHandler { judge (operate) { const steps = Handler.getSteps(); const order = Handler.getOrder(); - console.log(operate, steps); let valid = false; if (operate.over && steps.length == 1) { // 右键菜单直接发送校验 if (operate && steps[0] && diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 1ceaa98ab..f5a013f65 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -479,7 +479,7 @@ export default { // 综合演练切换现地行调模式 changePrdType(val) { const nameList = Object.keys(this.$store.state.map.map || {}); - let list = []; + let list = []; let showMode = ''; nameList.forEach(item => { if (item !== 'skinVO') { const data = this.$store.state.map.map[item]; @@ -488,7 +488,12 @@ export default { } } }); - this.$jlmap.updatePrdType(val, nameList); + if (val === '01') { + showMode = '03'; + } else if (val === '02') { + showMode = '02'; + } + this.$jlmap.updatePrdType(list, val, showMode); }, // 切换现地行调显示界面（绘图和预览页面下） setShowMode(showMode) { From c8e2b30271cfe23f09b7f9c58672d34f65b9cbc4 Mon Sep 17 00:00:00 2001 From: lVAL Date: Wed, 20 Jan 2021 15:53:36 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=88=90=E9=83=BD3?= =?UTF-8?q?=20=20=E4=B8=AD=E6=8E=A7=E3=80=81=E7=AB=99=E6=8E=A7=E3=80=81?= =?UTF-8?q?=E7=B4=A7=E6=80=A5=E7=AB=99=E6=8E=A7=E3=80=81=E6=89=A3=E8=BD=A6?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E7=BD=AE=E8=B7=B3=E5=81=9C=E3=80=81=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=B7=B3=E5=81=9C=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Station/index.js | 28 ++++-- .../theme/chengdu_03/menus/menuButton.vue | 11 ++- .../theme/chengdu_03/operationConfig.js | 94 ++++++++++++++++++- 3 files changed, 119 insertions(+), 14 deletions(-) diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index ac8da8e23..4bc8841a8 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -460,12 +460,28 @@ export default class Station extends Group { // } getShapeTipPoint(opts) { - let rect; - if (opts.subDeviceType === 'button') { - rect = this.centerControlButton.getArcBoundingRect(); - } else { - rect = this.stationText.getBoundingRect(); - } + let rect; + switch(opts.subDeviceType) { + case 'button': + rect = this.centerControlButton.getArcBoundingRect(); + break; + case 'center': + rect = this.centerControl.getArcBoundingRect(); + break; + case 'substation': + rect = this.substationControl.getArcBoundingRect(); + break; + case 'emergency': + rect = this.emergencyControl.getArcBoundingRect() + break; + case 'interconnected': + rect = this.interconnectedControl.getArcBoundingRect() + break; + default: + rect = this.stationText.getBoundingRect(); + break; + } + return { x: rect.x + rect.width, y: rect.y diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue index 02c4cbfd0..f6e5f6021 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue @@ -406,16 +406,19 @@ export default { } else if (model._type === 'Station') { switch (subType) { case 'substation': - operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL; - operate.param = {stationCodes: [model.code]}; + operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL; + operate.param = {stationCodes: [model.code]}; + operate.code = model.code; break; case 'center': operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL; - operate.param = {stationCodes: [model.code]}; + operate.param = {stationCodes: [model.code]}; + operate.code = model.code; break; case 'emergency': operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL; - operate.param = {stationCodes: [model.code]}; + operate.param = {stationCodes: [model.code]}; + operate.code = model.code; break; } } diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index bb58320ef..42f0bf0fd 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -11,6 +11,49 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { list: [ + // 控制模式 + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value, + skinCode: '04', + trainingName: '请求站控({2})', + trainingRemark: '请求站控功能', + trainingType: 'ControlConvertMenu', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' }, + { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【站控】', codeType:'STATION', subType:'substation' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value, + skinCode: '04', + trainingName: '请求紧急站控({2})', + trainingRemark: '请求紧急站控功能', + trainingType: 'ControlConvertMenu', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' }, + { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL.value, + skinCode: '04', + trainingName: '请求中控({2})', + trainingRemark: '请求请求中控功能', + trainingType: 'ControlConvertMenu', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' }, + { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' } + ] + }, // 信号机列表 { maxDuration: 15, @@ -74,7 +117,22 @@ export default { { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }, { deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' } ] - }, + }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: CMD.Signal.CMD_STATION_SET_MASTER_GUIDE_LOCK.value, + // skinCode: '04', + // trainingName: '引导总锁({3})', + // trainingRemark: '进路办理引导总锁', + // trainingType: 'Signal', + // productTypes: ['01'], + // stepVOList: [ + // { deviceType: '04', orderNum: 1, operateCode: '1190', tip: '鼠标左键点击【引导总锁】' }, + // { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }, + // { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'', subType: ''} + // ] + // }, { maxDuration: 15, minDuration: 8, @@ -568,6 +626,20 @@ export default { { deviceType: '06', orderNum: 2, operateCode: '5051', tip: '鼠标左键点击【上行全线】按钮', val: '02' }, { deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮' } ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value, + skinCode: '04', + trainingName: '设置跳停({10}-{12}站台)', + trainingRemark: '设置跳停功能', + trainingType: 'Stand', + productTypes: ['01'], + stepVOList: [ + { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'}, + { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【跳停】', codeType:'STAND', subType:'StopJumpLamp' } + ] }, { maxDuration: 15, @@ -582,6 +654,20 @@ export default { { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' } ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value, + skinCode: '04', + trainingName: '取消跳停({10}-{12}站台)', + trainingRemark: '设置取消跳停功能', + trainingType: 'Stand', + productTypes: ['01'], + stepVOList: [ + { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'}, + { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【取消跳停】', codeType:'STAND', subType:'CancelStopJumpLamp' } + ] }, { maxDuration: 15, @@ -596,7 +682,7 @@ export default { { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' } ] - }, + }, { maxDuration: 15, minDuration: 8, @@ -694,12 +780,12 @@ export default { minDuration: 5, operateType: CMD.Stand.CMD_STAND_VIEW_STATUS.value, skinCode: '04', - trainingName: '属性({10}-{12}站台)', + trainingName: '显示站台信息({10}-{12}站台)', trainingRemark: '查询站台状态功能', trainingType: 'Stand', productTypes: ['02'], stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【属性】' }, + { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【显示站台信息】' }, { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【退出】按钮' } ] } From 70045c8f879adbff8a0edfa984ddb27db1e5530a Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 20 Jan 2021 16:07:10 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E7=8E=B0=E5=9C=B0=E8=A1=8C=E8=B0=83?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=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/Arrow/index.js | 7 ++----- src/jmapNew/shape/AutoTurnBack/index.js | 9 +++------ src/jmapNew/shape/AutomacticRoute/index.js | 9 +++------ src/jmapNew/shape/AxleReset/index.js | 9 +++------ src/jmapNew/shape/DirectionRod/index.js | 9 +++------ src/jmapNew/shape/FloodGate/index.js | 9 +++------ src/jmapNew/shape/GuideLock/index.js | 9 +++------ src/jmapNew/shape/Line/index.js | 7 ++----- src/jmapNew/shape/OutFrame/index.js | 7 ++----- src/jmapNew/shape/OverAp/index.js | 1 - src/jmapNew/shape/Power/index.js | 9 +++------ src/jmapNew/shape/SaidLamp/index.js | 9 +++------ src/jmapNew/shape/Signal/index.js | 15 ++++++--------- src/jmapNew/shape/StationStand/index.js | 5 +---- src/jmapNew/shape/Text/index.js | 8 +++----- 15 files changed, 40 insertions(+), 82 deletions(-) diff --git a/src/jmapNew/shape/Arrow/index.js b/src/jmapNew/shape/Arrow/index.js index f81df67d6..96fa09298 100644 --- a/src/jmapNew/shape/Arrow/index.js +++ b/src/jmapNew/shape/Arrow/index.js @@ -1,5 +1,4 @@ import Group from 'zrender/src/container/Group'; -import {isShowThePrdType} from '../../utils/handlePath'; import Polygon from 'zrender/src/graphic/shape/Polygon'; export default class Arrow extends Group { @@ -12,10 +11,8 @@ export default class Arrow extends Group { this.model = model; // this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) { - this.create(); - this.setState(model); - } + this.create(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/AutoTurnBack/index.js b/src/jmapNew/shape/AutoTurnBack/index.js index b6196a323..592318814 100644 --- a/src/jmapNew/shape/AutoTurnBack/index.js +++ b/src/jmapNew/shape/AutoTurnBack/index.js @@ -7,7 +7,6 @@ import Text from 'zrender/src/graphic/Text'; import Rect from 'zrender/src/graphic/shape/Rect'; import EMouse from './EMouse'; import BoundingRect from 'zrender/src/core/BoundingRect'; -import {isShowThePrdType} from '../../utils/handlePath'; export default class AutoTurnBack extends Group { constructor(model, style) { @@ -19,11 +18,9 @@ export default class AutoTurnBack extends Group { this.model = model; this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, style.AutoTurnBack.visibleConditions) || model.previewOrMapDraw) { - this.create(); - this.createMouseEvent(); - this.setState(model); - } + this.create(); + this.createMouseEvent(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/AutomacticRoute/index.js b/src/jmapNew/shape/AutomacticRoute/index.js index 5665bc9da..218af519b 100644 --- a/src/jmapNew/shape/AutomacticRoute/index.js +++ b/src/jmapNew/shape/AutomacticRoute/index.js @@ -6,7 +6,6 @@ import Arc from 'zrender/src/graphic/shape/Arc'; import Text from 'zrender/src/graphic/Text'; import EMouse from './EMouse'; import BoundingRect from 'zrender/src/core/BoundingRect'; -import {isShowThePrdType} from '../../utils/handlePath'; export default class AutomacticRoute extends Group { constructor(model, style) { @@ -18,11 +17,9 @@ export default class AutomacticRoute extends Group { this.model = model; this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, (style.AutomaticRoute || {}).displayCondition) || model.previewOrMapDraw) { - this.create(); - this.createMouseEvent(); - this.setState(model); - } + this.create(); + this.createMouseEvent(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/AxleReset/index.js b/src/jmapNew/shape/AxleReset/index.js index 0e36e059f..ed8361b3f 100644 --- a/src/jmapNew/shape/AxleReset/index.js +++ b/src/jmapNew/shape/AxleReset/index.js @@ -6,7 +6,6 @@ import Arc from 'zrender/src/graphic/shape/Arc'; import Text from 'zrender/src/graphic/Text'; import EMouse from './EMouse'; import BoundingRect from 'zrender/src/core/BoundingRect'; -import {isShowThePrdType} from '../../utils/handlePath'; export default class AxleReset extends Group { constructor(model, style) { @@ -18,11 +17,9 @@ export default class AxleReset extends Group { this.model = model; this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, (style.AxleReset || {}).displayCondition) || model.previewOrMapDraw) { - this.create(); - this.createMouseEvent(); - this.setState(model); - } + this.create(); + this.createMouseEvent(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/DirectionRod/index.js b/src/jmapNew/shape/DirectionRod/index.js index ea98b3b13..1f9e71681 100644 --- a/src/jmapNew/shape/DirectionRod/index.js +++ b/src/jmapNew/shape/DirectionRod/index.js @@ -1,6 +1,5 @@ import Group from 'zrender/src/container/Group'; import Polygon from 'zrender/src/graphic/shape/Polygon'; -import {isShowThePrdType} from '../../utils/handlePath'; import Text from 'zrender/src/graphic/Text'; export default class DirectionRod extends Group { @@ -13,11 +12,9 @@ export default class DirectionRod extends Group { this.model = model; this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, (style.DirectionRod || {}).displayCondition) || model.previewOrMapDraw) { - this.create(); - this.createMouseEvent(); - this.setState(model); - } + this.create(); + this.createMouseEvent(); + this.setState(model); this.setShowMode(); } create() { diff --git a/src/jmapNew/shape/FloodGate/index.js b/src/jmapNew/shape/FloodGate/index.js index 5fb6e8d9a..ca2992e10 100644 --- a/src/jmapNew/shape/FloodGate/index.js +++ b/src/jmapNew/shape/FloodGate/index.js @@ -3,7 +3,6 @@ */ import Group from 'zrender/src/container/Group'; import Rect from 'zrender/src/graphic/shape/Rect'; -import {isShowThePrdType} from '../../utils/handlePath'; export default class FloodGate extends Group { constructor(model, style) { @@ -16,11 +15,9 @@ export default class FloodGate extends Group { this.model = model; this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, (style.FloodGate || {}).displayCondition) || model.previewOrMapDraw) { - this.create(); - this.createMouseEvent(); - this.setState(model); - } + this.create(); + this.createMouseEvent(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/GuideLock/index.js b/src/jmapNew/shape/GuideLock/index.js index 451110d99..9fee9be78 100644 --- a/src/jmapNew/shape/GuideLock/index.js +++ b/src/jmapNew/shape/GuideLock/index.js @@ -6,7 +6,6 @@ import Arc from 'zrender/src/graphic/shape/Arc'; import Text from 'zrender/src/graphic/Text'; import EMouse from './EMouse'; import BoundingRect from 'zrender/src/core/BoundingRect'; -import {isShowThePrdType} from '../../utils/handlePath'; export default class GuideLock extends Group { constructor(model, style) { @@ -18,11 +17,9 @@ export default class GuideLock extends Group { this.model = model; this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, (style.GuideLock || {}).displayCondition) || model.previewOrMapDraw) { - this.create(); - this.createMouseEvent(); - this.setState(model); - } + this.create(); + this.createMouseEvent(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/Line/index.js b/src/jmapNew/shape/Line/index.js index 161b6736b..2f62894be 100644 --- a/src/jmapNew/shape/Line/index.js +++ b/src/jmapNew/shape/Line/index.js @@ -1,5 +1,4 @@ import Group from 'zrender/src/container/Group'; -import {isShowThePrdType} from '../../utils/handlePath'; import Polyline from 'zrender/src/graphic/shape/Polyline'; export default class Line2 extends Group { @@ -12,10 +11,8 @@ export default class Line2 extends Group { this.model = model; this.style = style.Line; this.isShowShape = true; - if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) { - this.create(); - this.setState(model); - } + this.create(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/OutFrame/index.js b/src/jmapNew/shape/OutFrame/index.js index 45cbce365..691d66f17 100644 --- a/src/jmapNew/shape/OutFrame/index.js +++ b/src/jmapNew/shape/OutFrame/index.js @@ -1,6 +1,5 @@ import Group from 'zrender/src/container/Group'; import Rect from 'zrender/src/graphic/shape/Rect'; -import {isShowThePrdType} from '../../utils/handlePath'; export default class OutFrame extends Group { constructor(model, style) { @@ -12,10 +11,8 @@ export default class OutFrame extends Group { this.zlevel = model.zlevel; this.isShowShape = true; this.z = 0; - if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) { - this.create(); - this.setState(model); - } + this.create(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/OverAp/index.js b/src/jmapNew/shape/OverAp/index.js index af29915e6..a718bf898 100644 --- a/src/jmapNew/shape/OverAp/index.js +++ b/src/jmapNew/shape/OverAp/index.js @@ -1,5 +1,4 @@ import Group from 'zrender/src/container/Group'; -// import {isShowThePrdType} from '../../utils/handlePath'; import ETextName from '../element/ETextName'; // 名称文字 (共有) import BoundingRect from 'zrender/src/core/BoundingRect'; diff --git a/src/jmapNew/shape/Power/index.js b/src/jmapNew/shape/Power/index.js index d621f25f1..8cd14cbd9 100644 --- a/src/jmapNew/shape/Power/index.js +++ b/src/jmapNew/shape/Power/index.js @@ -2,7 +2,6 @@ import Polyline from 'zrender/src/graphic/shape/Polyline'; import Group from 'zrender/src/container/Group'; import JTriangle from '../../utils/JTriangle'; import ESeparator from './ESeparator'; -import {isShowThePrdType} from '../../utils/handlePath'; export default class Line2 extends Group { constructor(model, style) { @@ -14,11 +13,9 @@ export default class Line2 extends Group { this.model = model; this.style = style; this.isShowShape = true; - if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) { - this.create(); - this.createTerminal(); - this.setState(model); - } + this.create(); + this.createTerminal(); + this.setState(model); this.setShowMode(); } diff --git a/src/jmapNew/shape/SaidLamp/index.js b/src/jmapNew/shape/SaidLamp/index.js index 8a4f585ef..d50500d80 100644 --- a/src/jmapNew/shape/SaidLamp/index.js +++ b/src/jmapNew/shape/SaidLamp/index.js @@ -1,7 +1,6 @@ import Group from 'zrender/src/container/Group'; import EControl from '../element/EControl'; import EMouse from './EMouse'; -import {isShowThePrdType} from '../../utils/handlePath'; import deviceType from '../../constant/deviceType'; import ELampFilament from './ELampFilament'; import EControlSwitch from './EControlSwitch'; @@ -23,11 +22,9 @@ export default class SaidLamp extends Group { this.deviceStyle = style[model._type]; if (this.deviceStyle) { this.isShowShape = true; - if (isShowThePrdType(model.prdType, (this.deviceStyle || {}).displayCondition) || model.previewOrMapDraw) { - this.create(); - this.createMouseEvent(); - this.setState(model); - } + this.create(); + this.createMouseEvent(); + this.setState(model); this.setShowMode(); } } diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js index cf5604de0..c8546adde 100644 --- a/src/jmapNew/shape/Signal/index.js +++ b/src/jmapNew/shape/Signal/index.js @@ -12,7 +12,6 @@ import Group from 'zrender/src/container/Group'; import EHighlight from '../element/EHighlight'; import EVirtualSignal from './EVirtualSignal'; import ELowButton from './ELowButton'; -import {isShowThePrdType} from '../../utils/handlePath'; import Rect from 'zrender/src/graphic/shape/Rect'; import Polygon from 'zrender/src/graphic/shape/Polygon'; import Text from 'zrender/src/graphic/Text'; @@ -735,15 +734,13 @@ class Signal extends Group { this.recover(); /** 信号机进路按钮显示 */ - if (isShowThePrdType(model.prdType, '03') && this.style.Signal.lowButton.display) { - /** 终端信号机按钮 */ - if (model.isRouteActive) { - this.setLowButtonActive(); - } else { - this.setLowButtonRecover(); - } - model.isRouteSignal && this.setLowButtonShow(); + /** 终端信号机按钮 */ + if (model.isRouteActive) { + this.setLowButtonActive(); + } else { + this.setLowButtonRecover(); } + model.isRouteSignal && this.setLowButtonShow(); /** 设置灯的颜色 */ model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(model.logicLight); // 信号关闭 diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index c12625734..f10febd4c 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -36,7 +36,6 @@ import EDownDetainLamp from './functionButton/EDownDetainLamp'; import ETrainSetButton from './ETrainSetButton'; import EStationPlatform from './EStationPlatform'; -import {isShowThePrdType} from '../../utils/handlePath'; import {traverseLineElements, traverseStatusElements} from '../utils/ShapeStatusCovert'; class StationStand extends Group { @@ -99,9 +98,7 @@ class StationStand extends Group { 'downDetainLamp':EDownDetainLamp }; // 遍历后端返回的状态控制的绘图 - if (model.previewOrMapDraw || isShowThePrdType(model.prdType, style.StationStand.common.functionButtonShow)) { - traverseStatusElements(statusElementList, model, style, this); - } + traverseStatusElements(statusElementList, model, style, this); } createMouseEvent() { diff --git a/src/jmapNew/shape/Text/index.js b/src/jmapNew/shape/Text/index.js index 4deda11a3..d9622acf7 100644 --- a/src/jmapNew/shape/Text/index.js +++ b/src/jmapNew/shape/Text/index.js @@ -1,6 +1,5 @@ import Text from 'zrender/src/graphic/Text'; import Group from 'zrender/src/container/Group'; -import {isShowThePrdType} from '../../utils/handlePath'; import BoundingRect from 'zrender/src/core/BoundingRect'; import Vue from 'vue'; @@ -15,10 +14,8 @@ export default class Text2 extends Group { this.style = style; this.z = 6; this.isShowShape = true; - if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) { - this.create(); - this.setState(model); - } + this.create(); + this.setState(model); this.setShowMode(); } @@ -65,6 +62,7 @@ export default class Text2 extends Group { return; } const showConditions = this.model.showConditions; + console.log(showMode, showConditions); if (!showConditions || showConditions === '01' || showMode === showConditions) { this.text && this.text.show(); } else { From 78822e9c30ec7fcd912b77a3845776e3ec6a5839 Mon Sep 17 00:00:00 2001 From: lVAL Date: Wed, 20 Jan 2021 16:10:14 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E6=88=90=E9=83=BD3=20=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E6=80=BB=E9=94=81=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E5=85=88=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/chengdu_03/operationConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index 42f0bf0fd..a4d323448 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -130,7 +130,7 @@ export default { // stepVOList: [ // { deviceType: '04', orderNum: 1, operateCode: '1190', tip: '鼠标左键点击【引导总锁】' }, // { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }, - // { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'', subType: ''} + // { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'GUIDELOCK' } // ] // }, { From fe81a318830272c695944ffbbd8bfdf9ccdaac00 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 20 Jan 2021 16:20:20 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E4=BD=9B=E5=B1=B1=E6=9C=89=E8=BD=A8?= =?UTF-8?q?=E7=94=B5=E8=BD=A6=20=E7=BA=BF=E8=B7=AF=20=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E9=9A=90=E8=97=8F=20iscs=20ibp=20=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/menuSchema.vue | 2 +- .../newMap/jointTrainingNew/menuSchema.vue | 42 ++++++++++--------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index aa3b1d634..c77c561c4 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -4,7 +4,7 @@