From e09d5f4affe28d8dac194f5b64c9a5bf63c36da7 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 28 May 2021 14:07:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=BF=E7=9C=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=98=BE=E7=A4=BA=E6=9A=82=E5=81=9C=E4=B8=AD?= =?UTF-8?q?=20&=20=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=88=97=E7=9B=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/socket.js | 2 +- src/views/newMap/displayBaSiDi/baSiDi.vue | 38 ++---- src/views/newMap/displayBaSiDi/index.vue | 27 +--- src/views/newMap/displayBaSiDi/tmt.vue | 150 ++++++++++++++++++++++ 4 files changed, 166 insertions(+), 51 deletions(-) create mode 100644 src/views/newMap/displayBaSiDi/tmt.vue diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index b8de1f320..60cbfbd70 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -15,7 +15,7 @@ function handleSimulationStateMsg(state, type) { store.dispatch('scriptRecord/updateSimulationPause', true); break; case 1: - store.dispatch('scriptRecord/updateSimulationPause', true); + store.dispatch('scriptRecord/updateSimulationPause', false); state.simulationPause = false; break; case 4: diff --git a/src/views/newMap/displayBaSiDi/baSiDi.vue b/src/views/newMap/displayBaSiDi/baSiDi.vue index 752921696..6281a2628 100644 --- a/src/views/newMap/displayBaSiDi/baSiDi.vue +++ b/src/views/newMap/displayBaSiDi/baSiDi.vue @@ -33,17 +33,17 @@
-
背投
-
车场
-
轨道
+
背投
+
车场
+
轨道
系统
-
列车
+
列车
联锁
-
列监
+
列监
运图
-
时刻表
+
时刻表
编表
调度
站控
@@ -199,16 +199,7 @@ export default { }, '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新 this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); - // const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); - // this.initDate(date); }, - // '$store.state.menuOperation.selectedCount':function(em) { - // const device = this.$store.state.menuOperation.selected; - // if (device && device._type === 'Station' && this.$store.state.menuOperation.subType === 'troButton') { - // this.$refs.troDialog.doClose(); - // setTimeout(() => { this.goTroDetail(device.code); }, 5000); - // } - // }, '$store.state.socket.simulationAlarmInfo': function(val) { (val || []).forEach(item => { if (!item.confirmed) { @@ -281,21 +272,8 @@ export default { } } }, - rpsClick() { - this.$emit('rpsClick'); - }, - troClick() { - this.$emit('troClick'); - }, - traClick() { - this.$emit('traClick'); - }, - ttlClick() { - this.$emit('ttlClick'); - }, - // 车场 - handleCarPark() { - this.$emit('handleCarPark'); + handleDialogShow(type) { + this.$emit('handleDialogShow', type); }, selectBeginTime() { this.$emit('selectBeginTime'); diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue index 83fb60921..4b0a3bab1 100644 --- a/src/views/newMap/displayBaSiDi/index.vue +++ b/src/views/newMap/displayBaSiDi/index.vue @@ -4,11 +4,7 @@ ref="baSiDi" :is-disable="isDisable" :data-error="dataError" - @rpsClick="rpsClick" - @troClick="troClick" - @traClick="traClick" - @ttlClick="ttlClick" - @handleCarPark="handleCarPark" + @handleDialogShow="handleDialogShow" @end="end" @back="back" @selectBeginTime="selectBeginTime" @@ -19,6 +15,7 @@ +
@@ -42,6 +39,7 @@ import CarPack from './carPack'; import TroDetail from './troDetail'; import TraDialog from './tra'; import TtlDialog from './ttl'; +import TmtDialog from './tmt'; import parseStatus from '@/utils/parseStatus'; export default { @@ -54,7 +52,8 @@ export default { TroDialog, TroDetail, TraDialog, - TtlDialog + TtlDialog, + TmtDialog }, data() { return { @@ -162,9 +161,6 @@ export default { this.clearSubscribeNew(); clearSimulation(this.group); this.$store.dispatch('training/reset'); - // this.$refs.rpsDialog.destroy(); - // this.$refs.troDialog.destroy(); - // this.$refs.troDetail.destroy(); }, async mounted() { const _that = this; @@ -390,20 +386,11 @@ export default { this.$messageBox(this.$t('display.demon.endSimulationFail')); }); }, - rpsClick() { - this.$refs.rpsDialog.doShow(); - }, troClick() { this.$refs.troDialog.doShow(); }, - ttlClick() { - this.$refs.ttlDialog.doShow(); - }, - traClick() { - this.$refs.traDialog.doShow(); - }, - handleCarPark() { - this.$refs.carPack.doShow(); + handleDialogShow(type) { + this.$refs[type].doShow; } } }; diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue new file mode 100644 index 000000000..6709b76f5 --- /dev/null +++ b/src/views/newMap/displayBaSiDi/tmt.vue @@ -0,0 +1,150 @@ + + + + + From ee6dfa9df2f96e0e6fd00ba84fe1c839b1bbfb04 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 28 May 2021 15:22:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=88=97?= =?UTF-8?q?=E7=9B=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 +-- src/views/newMap/displayBaSiDi/index.vue | 2 +- src/views/newMap/displayBaSiDi/tmt.vue | 38 +++++++++++++++--------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index aa7bf7e1b..11702c286 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ 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.8.107:9000'; // 袁琪 - BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线 + // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 // BASE_API = 'http://192.168.3.120:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue index 4b0a3bab1..25f3ab8c6 100644 --- a/src/views/newMap/displayBaSiDi/index.vue +++ b/src/views/newMap/displayBaSiDi/index.vue @@ -390,7 +390,7 @@ export default { this.$refs.troDialog.doShow(); }, handleDialogShow(type) { - this.$refs[type].doShow; + this.$refs[type].doShow(); } } }; diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue index 6709b76f5..8be9a7043 100644 --- a/src/views/newMap/displayBaSiDi/tmt.vue +++ b/src/views/newMap/displayBaSiDi/tmt.vue @@ -7,7 +7,7 @@ width="900px" label-position="top" :before-close="doClose" - :z-index="2002" + :z-index="2009" :modal="false" :close-on-click-modal="false" > @@ -21,17 +21,28 @@ - + + + -
- 显示列车信息 - 修改列车资料 - 创建列车号 - 删除列车号 - 步进列车号 - 重排列车号 +
+ 显示列车信息 + 修改列车资料 + 创建列车号
+
+ 删除列车号 + 步进列车号 + 重排列车号 +
+ + + + + + +
@@ -48,12 +59,12 @@ export default { return { dialogShow: false, loading: false, - selected: null + selected: null, + tableData: [] }; }, computed: { ...mapGetters('map', [ - 'map', 'stationList' ]), show() { @@ -65,20 +76,19 @@ export default { }, methods: { loadInitData(map) { - console.log(map, 11111); + // console.log(map, 11111); }, doShow(operate, selected) { this.dialogShow = true; this.selected = selected; - this.loadInitData(this.map); + this.loadInitData(); this.$nextTick(function () { this.$store.dispatch('training/emitTipFresh'); }); }, doClose() { - this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); From d11b0c6d47d67e63efaf7bdac10d1da11b7688a8 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 28 May 2021 17:18:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=93=8D=E4=BD=9C-=E6=8D=A2=E7=AB=AF&?= =?UTF-8?q?=E8=81=94=E9=94=81=E9=85=8D=E7=BD=AE=E9=A1=B9-CTC=E5=88=97?= =?UTF-8?q?=E8=BD=A6=E8=BF=9B=E8=B7=AF=E5=BB=B6=E7=BB=AD=E4=BF=9D=E6=8A=A4?= =?UTF-8?q?=E4=BB=85=E6=8A=98=E8=BF=94=E7=AB=99=E5=A4=84=E9=94=81=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/ningbo_01/menus/menuTrain.vue | 18 +++ src/jmapNew/theme/xian_01/menus/menuTrain.vue | 18 +++ src/scripts/cmdPlugin/CommandEnum.js | 4 +- src/views/newMap/displayBaSiDi/tmt.vue | 103 +++++++++++++++--- src/views/newMap/newMapdraft/ciConfig.vue | 5 +- 5 files changed, 127 insertions(+), 21 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index 5fb05d72d..094ee0cf4 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -237,6 +237,10 @@ export default { { label: '开/关门', handler: this.handleOpenCloseDoor + }, + { + label: '换端', + handler: this.handlerTurnDirection } ], menuSpeed: [ @@ -396,6 +400,20 @@ export default { this.$refs.noticeInfo.doShow(); }); }, + // 列车换端 + handlerTurnDirection() { + const group = this.$route.query.group; + const param = { + commandType: 'Turn_Direction', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: {} + }; + commitTrainSend(group, param).then(({valid, operate})=>{ + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, // 限速行驶 limitSpeed() { const operate = { diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index 1c7acdc91..0ac0937e9 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -132,6 +132,10 @@ export default { { label: '越红灯行驶', handler: this.handleOverEedLight + }, + { + label: '换端', + handler: this.handlerTurnDirection } ], menuSpeed: [ @@ -328,6 +332,20 @@ export default { this.$refs.noticeInfo.doShow(); }); }, + // 列车换端 + handlerTurnDirection() { + const group = this.$route.query.group; + const param = { + commandType: 'Turn_Direction', + targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id, + params: {} + }; + commitTrainSend(group, param).then(({valid, operate})=>{ + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, routeBlockRun() { // 处理显示车站列表 // const list = []; diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 507304c37..adcc00007 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -324,7 +324,9 @@ export default { /** 列车在指定站台跳停 */ CMD_TRAIN_SKIP_STOP : { value: 'Train_Skip_Stop', label: '指定站台跳停' }, /** 列车取消指定站台的跳停 */ - CMD_TRAIN_CANCEL_SKIP_STOP : { value: 'Train_Cancel_Skip_Stop', label: '取消指定站台跳停' } + CMD_TRAIN_CANCEL_SKIP_STOP : { value: 'Train_Cancel_Skip_Stop', label: '取消指定站台跳停' }, + /** 换端 */ + CMD_TRAIN_TURN_DIRECTION: { value: 'Turn_Direction', label: '换端' } }, TrainWindow: { /** 修改列车识别号 */ diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue index 8be9a7043..f50e80785 100644 --- a/src/views/newMap/displayBaSiDi/tmt.vue +++ b/src/views/newMap/displayBaSiDi/tmt.vue @@ -18,31 +18,84 @@ - + - - - + + +
- 显示列车信息 - 修改列车资料 - 创建列车号 + 显示列车信息 + 修改列车资料 + 创建列车号
- 删除列车号 - 步进列车号 - 重排列车号 + 删除列车号 + 步进列车号 + 重排列车号 +
+
+ + + + + + + +
+
+
+ + + + + +
+
+
+ 位置： + +
+
+ 新列车号： + +
+
+ 设置该列车为自动排列： + 开启 + 关闭 +
+
+ 车组号： + +
<>
+ +
+
+
+
插入位置（之前）：
+ + + + + +
+
+
+
+ + + + + +
+
+
所选列车号：
+ +
- - - - - - -
@@ -60,7 +113,11 @@ export default { dialogShow: false, loading: false, selected: null, - tableData: [] + tableData: [], + sectionName: '', + trainCode: '', + operationType: 'create', + autoArrange: false }; }, computed: { @@ -96,6 +153,16 @@ export default { handleSelect(tab) { this.activeIndex = tab; }, + trainFind() { + const train = this.$store.getters['map/getDeviceByCode'](this.trainCode); + this.tableData = [train]; + }, + resetTrainCode() { + this.trainCode = ''; + }, + changeOperationType(type) { + this.operationType = type; + }, commit() { // const operate = { // send: true, diff --git a/src/views/newMap/newMapdraft/ciConfig.vue b/src/views/newMap/newMapdraft/ciConfig.vue index 6f5ba4ed4..979d94761 100644 --- a/src/views/newMap/newMapdraft/ciConfig.vue +++ b/src/views/newMap/newMapdraft/ciConfig.vue @@ -93,7 +93,7 @@ export default { 'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen', 'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls', 'signalApproachNotPassPreSignal', - 'generateDestination' + 'generateDestination', 'ctcOverlapOnlyTurnBackStationLock' ], multipleList: ['sharingECStations'], selectList: [], @@ -126,7 +126,8 @@ export default { generateFls: '是否生成侧防：是-生成侧防，不要联动道岔，否-不生成侧防，用联动道岔', signalApproachNotPassPreSignal:'信号机接近区段不跨过前方同向信号机', generateDestination: '是否生成目的地码定义（泰雷兹）', - sharingECStations: '共享紧急关闭效果的车站' + sharingECStations: '共享紧急关闭效果的车站', + ctcOverlapOnlyTurnBackStationLock: 'CTC列车进路延续保护仅折返站处锁闭' } }; },