From 82bef6ed4d8063ea7b94e9a663f5de9d47c6212d Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 8 Jan 2020 18:26:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E6=96=B0=E7=89=88=20=E5=8F=B3=E9=94=AE=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=8C=87=E4=BB=A4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beijing_01/menus/dialog/alxeEffective.vue | 17 +- .../menus/dialog/sectionControl.vue | 404 ++++---- .../menus/dialog/speedLimitControl.vue | 936 +++++++++--------- .../beijing_01/menus/dialog/switchControl.vue | 508 +++++----- 4 files changed, 963 insertions(+), 902 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue index 62c8b4047..52c1f1391 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue @@ -84,6 +84,7 @@ import { mouseCancelState } from '../utils/menuItemStatus'; import NoticeInfo from './childDialog/childDialog/noticeInfo' import PopupAlarm from './childDialog/popupAlarm'; + import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'AlxeEffective', @@ -293,7 +294,7 @@ operate.operation = OperationEvent.Switch.alxeEffective.confirm1.operation } - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.type = 'password'; @@ -321,7 +322,7 @@ operate.operation = OperationEvent.Switch.alxeEffective.choose1.operation } - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); }) }, @@ -344,7 +345,7 @@ operate.operation = OperationEvent.Switch.alxeEffective.choose2.operation } - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); }) }, @@ -352,9 +353,11 @@ commit() { let operate = { send: true, + over:true, type: this.operate.type, operation: '', - val: this.selected.code + val: this.selected.code, + cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE, } if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) { @@ -369,7 +372,7 @@ this.stepNum = 3; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.type = 'text'; @@ -378,7 +381,7 @@ this.$refs.popupAlarm.doShow(Object.assign(this.operate, { val: operate.val }), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]); } - }).catch(error => { + }).catch(() => { this.$refs.noticeInfo.doShow(operate); }) } else { @@ -400,7 +403,7 @@ if (valid) { this.doClose(); } - }).catch(error => { + }).catch(() => { this.doClose(); }); } diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue index 2bed358f9..c016f5682 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue @@ -1,207 +1,219 @@ \ No newline at end of file +}; + diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue index d21d7f8f7..2a0bb41f0 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/speedLimitControl.vue @@ -75,480 +75,514 @@ \ No newline at end of file diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue index b446fb596..4fc85576b 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue @@ -1,259 +1,271 @@ \ No newline at end of file +}; + From 2b4aa891eb921b1257099a761db3f70242087b84 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 9 Jan 2020 09:02:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chengdu_01/menus/dialog/platformDwell.vue | 168 ++++++++++++++++++ src/jmapNew/theme/chengdu_01/menus/index.vue | 7 +- .../theme/chengdu_01/menus/menuSignal.vue | 40 ++--- .../chengdu_01/menus/menuStationPlatform.vue | 65 ++++--- .../chengdu_01/menus/menuStationStand.vue | 76 ++++++-- src/utils/baseUrl.js | 4 +- .../newMap/mapsystemNew/common/index.vue | 5 + 7 files changed, 308 insertions(+), 57 deletions(-) create mode 100644 src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue new file mode 100644 index 000000000..ee2ebfdbb --- /dev/null +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/jmapNew/theme/chengdu_01/menus/index.vue b/src/jmapNew/theme/chengdu_01/menus/index.vue index 9318790ad..cebf4ac02 100644 --- a/src/jmapNew/theme/chengdu_01/menus/index.vue +++ b/src/jmapNew/theme/chengdu_01/menus/index.vue @@ -13,7 +13,7 @@ - + @@ -86,6 +86,11 @@ export default { this.$nextTick(() => { this.$store.dispatch('config/updateMenuBar'); }); + }, + methods: { + popMenuStationStand(param) { + this.$refs.menuStationStand.doShow(param.position, param.type); + } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 66a66673c..4e8382e87 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -364,12 +364,12 @@ export default { Signal_Code: `${this.selected.code}` } }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - if (valid) { - this.$refs.routeControl.doShow(step, this.selected); - } - }); + // this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // if (valid) { + // this.$refs.routeControl.doShow(step, this.selected); + // } + // }); }, // 总人解 humanTrainRoute() { @@ -416,14 +416,14 @@ export default { } }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.routeControl.doShow(step, this.selected); - } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); - }); + // this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + // if (valid) { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.routeControl.doShow(step, this.selected); + // } + // }).catch(() => { + // this.$refs.noticeInfo.doShow(step); + // }); }, // 信号解封 unlock() { @@ -435,12 +435,12 @@ export default { Signal_Code: `${this.selected.code}` } }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.routeControl.doShow(step, this.selected); - } - }); + // this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + // if (valid) { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.routeControl.doShow(step, this.selected); + // } + // }); }, // 进路交人工控 humanControl() { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue index ae2abb147..fac411ace 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue @@ -10,20 +10,36 @@ :modal="false" :close-on-click-modal="false" > - -
EUROPA - PLATFORM 2
 - - - - - - - - - Ok - Apply - Cancel - Help + +
EUROPA - PLATFORM 2
 + + +
Field Devices
 +
Control Requests
 +
Field Indications
 + + + +
Platform
+ + +
+ IN SERVICE
Adjust Dwell +
+ + +
Not Communicating
+ + + + +
Stopping Profile
+ + +
Northbound
Southbound
+ + +
@@ -43,6 +59,7 @@ export default { operation: null, dialogShow: false, loading: false, + position: '' }; }, computed: { @@ -77,15 +94,9 @@ export default { }); }, methods: { - doShow(operate) { - this.operate = operate || {}; - // this.operation = operate.operation; - - // 非断电激活时设置初始值 - if (!this.dialogShow) { - this.loading = false; - } - + doShow(position) { + // this.operate = operate || {}; + this.position = position; this.dialogShow = true; this.$nextTick(function () { this.$store.dispatch('training/emitTipFresh'); @@ -96,7 +107,15 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); }, + clickEvent(val) { + this.dialogShow = false; + this.$emit('popMenuStationStand', {position:this.position, type:val}); + event.stopPropagation(); + }, commit() { + this.$refs['form'].validate((valid) => { + + }); // this.$refs['form'].validate((valid) => { // if (valid) { // const operate = { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue index 04ad8e49d..364441a2d 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue @@ -4,6 +4,7 @@ +
@@ -12,9 +13,10 @@ import PopMenu from '@/components/PopMenu'; import StandControl from './dialog/standControl'; import StandDetail from './dialog/standDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; +import PlatformDwell from './dialog/platformDwell'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; -import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; +import { OperateMode } from '@/scripts/ConstDic'; import Handler from '@/scripts/cmdPlugin/Handler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; @@ -25,7 +27,8 @@ export default { PopMenu, StandControl, StandDetail, - NoticeInfo + NoticeInfo, + PlatformDwell }, props: { selected: { @@ -38,6 +41,46 @@ export default { data() { return { menu: [], + StoppingProfile: { + Local: [], + Center: [ + { + label: 'Platform Dwell ADJUST DWELL', // 设置停站时间 + handler: this.setStopTime, + cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME + }, + { + label: 'Platform Dwell', + handler: '', + cmdType: '' + }, + { + label: 'Help', + handler: '', + cmdType: '' + } + ] + }, + know: { + Local: [], + Center: [ + { + label: 'Skip Next Station', + handler: '', + cmdType: '' + }, + { + label: 'Skip Next Station', + handler: '', + cmdType: '' + }, + { + label: 'Help', + handler: '', + cmdType: '' + } + ] + }, menuNormal: { Local: [ { @@ -128,9 +171,17 @@ export default { self.doClose(); }; }, - initMenu() { + initMenu(type) { // 编辑模式菜单列表 - this.menu = MenuContextHandler.covert(this.menuNormal); + switch (type) { + case 'stoppingProfile': + this.menu = MenuContextHandler.covert(this.StoppingProfile); + break; + case 'know': + this.menu = MenuContextHandler.covert(this.StoppingProfile); + break; + } + // this.menu = MenuContextHandler.covert(this.menuNormal); // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { @@ -138,9 +189,10 @@ export default { } }, - doShow(point) { + doShow(point, type) { + this.menu = []; this.clickEvent(); - this.initMenu(); + this.initMenu(type); if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) { this.$refs.popMenu.resetShowPosition(point); } @@ -272,13 +324,15 @@ export default { StationStand_Code: `${this.selected.code}` } }; - this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => { + this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => { - const tempData = resp.data; - this.$refs.standControl.doShow(step, this.selected, tempData); - }); + this.$refs.platformDwell.doShow(step, this.selected); + // Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => { + // const tempData = resp.data; + // this.$refs.standControl.doShow(step, this.selected, tempData); + // }); + } }).catch(() => { this.$refs.noticeInfo.doShow(step); diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 79d1c6346..1e9afea51 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,11 +3,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index e94a7b2e2..4b70be9bf 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -87,6 +87,11 @@ export default { deviceType.Signal, deviceType.StationStand ]; + const lineCode = this.$store.getters['map/lineCode']; + if (em.deviceType === 'StationStand' && lineCode === '01') { + const menu = getDeviceMenuByDeviceType(device._type) || []; + this.$store.dispatch('menuOperation/setPopMenu', { position: { x: em.clientX, y: em.clientY }, menu: menu }); + } if (em.deviceCode) { device = this.getDeviceByEm(em); From 6e90989ececd9df5e22ef25b4444c1a2576f85f6 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 9 Jan 2020 09:28:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/chengdu_01/menus/menuSwitch.vue | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue index 9f9c45293..8673f6b54 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue @@ -210,12 +210,12 @@ export default { Switch_Code: this.selected.code } }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(operate, this.selected); - } - }); + // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + // if (valid) { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.switchControl.doShow(operate, this.selected); + // } + // }); }, // 道岔解锁 unlock() { @@ -226,12 +226,12 @@ export default { Switch_Code: this.selected.code } }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(operate, this.selected); - } - }); + // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + // if (valid) { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.switchControl.doShow(operate, this.selected); + // } + // }); }, // 道岔封锁 block() { @@ -306,12 +306,12 @@ export default { Switch_Code: this.selected.code } }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(operate, this.selected); - } - }); + // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + // if (valid) { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.switchControl.doShow(operate, this.selected); + // } + // }); }, // 单操到反位 reverse() { @@ -322,12 +322,12 @@ export default { Switch_Code: this.selected.code } }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.switchControl.doShow(operate, this.selected); - } - }); + // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + // if (valid) { + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.switchControl.doShow(operate, this.selected); + // } + // }); }, undeveloped() { this.doClose();