From 2a27cf6f462d624fc9cf39ed552782258a148cec Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 10 Jun 2022 10:09:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=20=E6=8C=87=E7=A4=BA?= =?UTF-8?q?=E7=81=AF=E5=85=B3=E8=81=94=20=E5=A2=9E=E5=8A=A0=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataRelation/indicatorAssociatedInfo/detail.vue | 4 ++++ .../dataRelation/indicatorAssociatedInfo/route.vue | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue index b8a157f66..36b3148c3 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue @@ -49,6 +49,10 @@ title: 'code', prop: 'code' }, + { + title: '名称', + prop: 'name' + }, { title: '关联车站', prop: 'stationCode', diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue index e156cf82f..f5a71be1f 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue @@ -4,6 +4,9 @@ + + + Date: Fri, 10 Jun 2022 10:38:43 +0800 Subject: [PATCH 2/3] =?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 --- .../menus/dialog/modifyTripNumber.vue | 29 +++++++++++++------ .../theme/datie_02/menus/runplanPane.vue | 2 ++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue index ef662686b..4ef3d9e20 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue @@ -33,31 +33,35 @@
原列车信息
到达车次：
- +
出发车次：
- +
新列车信息
到达车次：
- +
出发车次：
- +
+ + + + - - + + 确定 - + 取 消 @@ -78,6 +82,9 @@ export default { return { dialogShow: false, loading: false, + oldArriveTripNumber:'', + oldDepartTripNumber:'', + trainTypeList:[], model:{ stationCode:'', // 车站编码 runPlanCode:'', // 运行编码 @@ -107,8 +114,8 @@ export default { doShow(row) { this.model.stationCode = row.stationCode; this.model.runPlanCode = row.code; - this.model.arriveTripNumber = (row.arriveRunPlan && row.arriveRunPlan.tripNumber) || ''; - this.model.departTripNumber = (row.departRunPlan && row.departRunPlan.tripNumber) || ''; + this.oldArriveTripNumber = (row.arriveRunPlan && row.arriveRunPlan.arriveTripNumber) || ''; + this.oldDepartTripNumber = (row.departRunPlan && row.departRunPlan.departTripNumber) || ''; this.dialogShow = true; this.$nextTick(function () { this.$store.dispatch('training/emitTipFresh'); @@ -170,3 +177,7 @@ export default { .modifyTripNumberName{display: inline-block;} .modifyTripNumberE{margin-top:10px;} + diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index cf15031b5..b0aaf5554 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -559,6 +559,8 @@ export default { }, doClose() { this.isShow = false; + this.rpMenuPopShow = false; + this.currentRow = null; }, sendRunplan() { if (document.getElementById('sendRunplan').className.includes('active')) { From c2b3034cd15e39de914023f14e55039cc2210799 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 10 Jun 2022 11:06:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A1=8C=E8=BD=A6=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/runplanPane.vue | 9 ++++++--- src/store/modules/socket.js | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index b0aaf5554..541bd921b 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -86,7 +86,11 @@ prop="tripNumber" label="" width="100" - /> + > + + @@ -524,8 +528,7 @@ export default { ]) }, watch:{ - '$store.state.socket.railCtcRunplanInitMsg': function (val) { - debugger; + '$store.state.socket.railCtcRunplanChange': function (val) { const railCtcRunplanInitMsg = this.$store.state.socket.railCtcRunplanInitMsg; this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{ return data.stationCode == this.$store.state.training.roleDeviceCode; }); } diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 023416451..2914ef377 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -216,6 +216,7 @@ function handle(state, data) { msg.forEach(element => { state.railCtcRunplanInitMsg[element.code] = copyAssign(state.railCtcRunplanInitMsg[element.code], element); }); + state.railCtcRunplanChange++; break; } } @@ -368,7 +369,8 @@ const socket = { simulationPlanChange:{}, // 运行图加线/抽线/变化推送消息 loggedOutMsg: '', railCtcStatusMsg: {}, // 占线板信息 - railCtcRunplanInitMsg:{} // 大铁项目 ctc 运行图初始化信息 + railCtcRunplanInitMsg:{}, // 大铁项目 ctc 运行图初始化信息 + railCtcRunplanChange:0 // 大铁项目 ctc 运行图信息变化 }, getters: { },