From 6e6c548d739efcf57e7fbeb6980ed194c0cd7662 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 30 May 2022 18:06:03 +0800 Subject: [PATCH 01/84] =?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 --- .../datie_02/menus/dialog/updateTrip.vue | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue index 0e985813a..49a60e088 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue @@ -71,33 +71,31 @@ export default { }); }, handleTripNumber() { + this.judgeTripNumber(); + }, + judgeTripNumber() { const figuresOfServiceMinNumber = 2; const figuresOfServiceMaxNumber = 6; // this.$store.state.map.mapConfig.figuresOfServiceNumber; const tripNumber = this.tripNumber; const judge = /^[a-zA-Z0-9]*[\d]$/.test(this.tripNumber); + let result = false; if (judge) { if (tripNumber.toString().length > figuresOfServiceMaxNumber || tripNumber.toString().length < figuresOfServiceMinNumber) { this.messageTip1 = '车次号长度' + figuresOfServiceMinNumber + '-' + figuresOfServiceMaxNumber + '位'; + result = false; } else { - // this.tripNumber = tripNumber; this.messageTip1 = ''; + result = true; } } else { this.tripNumber = ''; this.messageTip1 = '请输入车次号(最后一位数字)'; } + return result; }, commit() { - const figuresOfServiceMinNumber = 2; - const figuresOfServiceMaxNumber = 6; - let result = false; - const tripNumber = this.tripNumber; - if (tripNumber.toString().length > figuresOfServiceMaxNumber || tripNumber.toString().length < figuresOfServiceMinNumber) { - result = false; - } else { - result = true; - } + const result = this.judgeTripNumber(); if (this.tripNumber && result) { const params = { tripNumber: this.tripNumber @@ -114,15 +112,7 @@ export default { this.doClose(); this.$refs.noticeInfo.doShow(); }); - - } else { - if (this.tripNumber) { - this.messageTip1 = '该车次号长度' + figuresOfServiceMinNumber + '-' + figuresOfServiceMaxNumber + '位'; - } else { - this.messageTip1 = '请输入车次号(最后一位数字)'; - } } - }, cancel() { const operate = { From 0c0b9074334cc4c399022e8aea4d80643d0dd524 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 31 May 2022 11:31:21 +0800 Subject: [PATCH 02/84] =?UTF-8?q?ctc=20=E6=B7=BB=E5=8A=A0=20=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/index.vue | 12 ++- .../theme/datie_02/menus/runplanPane.vue | 74 +++++++++++++++++++ 2 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 src/jmapNew/theme/datie_02/menus/runplanPane.vue diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index 6158fbfdd..a0c356eba 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -19,7 +19,7 @@ - + @@ -54,6 +54,7 @@ + @@ -68,6 +69,7 @@ import MenuTrain from './menuTrain'; import MenuStation from './menuStation'; import MenuBar from './menuBar'; import MenuButtonCtc from './menuButtonCtc'; +import RunplanPane from './runplanPane'; import PassiveAlarm from './passiveDialog/alarm'; import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; import PassiveTimeout from './passiveDialog/timeout'; @@ -106,7 +108,8 @@ export default { PassiveAlarm, PassiveContorl, PassiveTimeout, - MenuButtonCtc + MenuButtonCtc, + RunplanPane }, props: { selected: { @@ -208,7 +211,10 @@ export default { if (months.length < 2) { months = '0' + months; } if (dates.length < 2) { dates = '0' + dates; } this.dateString = years + months + dates; - } + }, + handleRunplan(){ + this.$refs.runplanPane.doShow() + } } }; diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue new file mode 100644 index 000000000..dc488fb0d --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -0,0 +1,74 @@ + + + From 90428b6f8e113c98a7602455a3405f54ecc215ea Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 31 May 2022 14:28:15 +0800 Subject: [PATCH 03/84] =?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 --- .../theme/datie_02/menus/runplanPane.vue | 113 ++++++++++++++++-- 1 file changed, 106 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index dc488fb0d..61bb849fb 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -1,10 +1,40 @@ - {{ projectDevice?'退出':$t('display.demon.back') }} + {{ projectDevice || isCtc?'退出':$t('display.demon.back') }} @@ -155,6 +155,9 @@ export default { isDisable() { return this.$store.state.training.started; }, + isCtc() { + return !!this.$route.query.ctc + }, project() { return getSessionStorage('project'); }, @@ -399,7 +402,7 @@ export default { // || this.project === 'bjd' } else { - if (this.project === 'bjd') { + if (this.project === 'bjd' || this.isCtc) { window.close(); } else { this.$store.dispatch('map/setShowCentralizedStationCode', ''); diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index 08bea52ad..d3d38fe41 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -12,8 +12,8 @@ @@ -287,6 +314,20 @@ export default { z-index: 38; margin-top: 34px; display: block; + overflow: scroll; + &::-webkit-scrollbar { + width: 4px; + } + + &::-webkit-scrollbar-thumb { + border-radius: 10px; + background: #c3c3c3; + } + + &::-webkit-scrollbar-track { + border-radius: 0; + background: #f0f0f0; + } } .runplanMenuBar{ height: 35px; @@ -321,10 +362,49 @@ export default { overflow-x: auto; overflow-y: auto; } -.runplanBottom{} -.runplanBottomL{} -.runplanBottomC{} -.runplanBottomR{} +.runplanBottom{height:261px;background: #efefef;display: inline-block;width: 100%;} +.runplanBottomL,.runplanBottomC,.runplanBottomR{width:33%;padding: 5px;position: relative;} +.runplanBottomTLine{ + margin-top: 3px; + height: 7px; + border-top: 2px #e5e5e5 solid; + border-bottom: 2px #8b8b8b solid; + margin-left: 8px; + margin-right: 8px; + background: #f7f7f7; +} +.runplanBottomLTitle,.runplanBottomCTitle,.runplanBottomRTitle{ + position: absolute; + left: 10px; + top: -3px; + font-size: 14px; + padding: 0px 5px; + background: #efefef; +} +.runplanBottomLInM,.runplanBottomRInM{ + width: 100%; + height: 215px; + background: #fff; + border-top: 2px #393939 solid; + border-left: 2px #393939 solid; + padding: 5px; +} +.runplanMessage{font-size:12px;margin-bottom:3px;} +.runplanBottomLIn,.runplanBottomCIn,.runplanBottomRIn{width:100%;height:100%;border:1px #7e7e7e solid;padding-top: 11px;} +.runplanBottomB{display:inline-block;margin-top:7px;margin-left: 5px;width: calc(100% - 5px);} +.runplanBottomLLine{ + height: 241px; + width: 4px; + border: 1px #707070 solid; + background: #f7f7f7; + float: left; +} +.runplanBottomIn{ + display:flex; + flex-direction:row; + margin-top: 5px; + margin-left: 10px; +} .runplanLine{ margin-top: 1px; height: 31px; From 0529b94a5bdd1154468b33e822e55222a4f4d1d6 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 1 Jun 2022 18:15:26 +0800 Subject: [PATCH 08/84] =?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 --- .../theme/datie_02/menus/runplanPane.vue | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index ec02d7530..c25725cea 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -264,7 +264,30 @@
键盘输入区
- 222 +
+ [HOME]复位 类型：0股道 1预告 2同意邻站发车 3到达 4出发 5出发机车号码 6取消同意邻站发车 7取消发车 8记事 9邻站同意发车 10邻站出发 11邻站到达 12接车线别 13发车线别 14通过 +
+
+
+
+
车次
+ +
+
+
类型
+ +
+
+
内容
+ +
+
+
+
常用记事词汇
+
+
+
+
@@ -391,6 +414,22 @@ export default { } .runplanMessage{font-size:12px;margin-bottom:3px;} .runplanBottomLIn,.runplanBottomCIn,.runplanBottomRIn{width:100%;height:100%;border:1px #7e7e7e solid;padding-top: 11px;} +.runplanBottomCInT{ + font-size: 13px; + padding: 5px; + line-height: 20px; +} +.runplanBottomCInB{ + padding: 10px; + font-size: 12px; + position: absolute; + bottom: 7px; + left: 4px; +} +.runplanBottomCInB1{} +.runplanBottomCInB2{display:flex;flex-direction: row; margin-top: 5px;} +.runplanBottomCInB3{margin-top: 5px;width:100%;height:20px;border: 1px #7e7e7e solid;line-height:20px;} +.runplanBottomCInB1in{display:inline-block;} .runplanBottomB{display:inline-block;margin-top:7px;margin-left: 5px;width: calc(100% - 5px);} .runplanBottomLLine{ height: 241px; From eaafd6e0411e3b23cb36ccc0636ca9c46c6a91df Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 2 Jun 2022 11:02:42 +0800 Subject: [PATCH 09/84] =?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 --- .../theme/datie_02/menus/runplanPane.vue | 77 +++++++++++++++++-- 1 file changed, 70 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index c25725cea..fc003c606 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -45,7 +45,7 @@ label="" width="100" /> - + + diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue index 83654cc51..709b20f02 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue @@ -9,6 +9,7 @@ +
@@ -283,7 +284,8 @@ export default { guide() { commitOperate(menuOperate.Signal.guide, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$refs.passwordBox.doShow({...operate, ...{selected: this.selected}, ...{routesList: this.getRouteList(this.selected)}}); + // this.$refs.passwordBox.doShow({...operate, ...{selected: this.selected}, ...{routesList: this.getRouteList(this.selected)}}); + this.$refs.routeCancel.doShow(operate, this.selected) } }); }, @@ -291,7 +293,7 @@ export default { cancelTrainRoute() { commitOperate(menuOperate.Signal.cancelTrainRoute, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$refs.routeControl.doShow(operate, this.selected); + this.$refs.routeCancel.doShow(operate, this.selected); } }); }, @@ -308,7 +310,7 @@ export default { reopenSignal() { commitOperate(menuOperate.Signal.reopenSignal, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { - this.$refs.routeControl.doShow(operate, this.selected); + this.$refs.routeCancel.doShow(operate, this.selected); } }); }, From 1da8364afa6a2127b78f2b5404f4fae26e946728 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 8 Jun 2022 09:55:31 +0800 Subject: [PATCH 21/84] =?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/datie_02/menus/runplanPane.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index 69862d043..8bdd3e967 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -429,7 +429,7 @@ export default { }, watch:{ '$store.state.socket.railCtcRunplanInitMsg': function (val) { - debugger; + // debugger; const railCtcRunplanInitMsg = this.$store.state.socket.railCtcRunplanInitMsg; this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{ return data.stationCode == this.$store.state.training.roleDeviceCode; }); } @@ -441,7 +441,15 @@ export default { return section.standTrack && section.belongStation == this.$store.state.training.roleDeviceCode; }); const railCtcRunplanInitMsg = this.$store.state.socket.railCtcRunplanInitMsg; - this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{ return data.stationCode == this.$store.state.training.roleDeviceCode; }); + this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{ + if (data.departRunPlan) { + data.departRunPlan.planTime = data.departRunPlan.planTime.split(':').splice(0, 2).join(':'); + } + if (data.arriveRunPlan) { + data.arriveRunPlan.planTime = data.arriveRunPlan.planTime.split(':').splice(0, 2).join(':'); + } + return data.stationCode == this.$store.state.training.roleDeviceCode; + }); this.isShow = true; // arriveRunPlan: Object // code: "00110010" From 5b78c43b069b40a5f5ab651501bd1007051fd5c3 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 8 Jun 2022 11:13:46 +0800 Subject: [PATCH 22/84] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?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/assets/ctc_icon/rpb.png | Bin 0 -> 1044 bytes src/assets/ctc_icon/rpd.png | Bin 0 -> 1855 bytes src/assets/ctc_icon/rpdu.png | Bin 0 -> 2155 bytes src/assets/ctc_icon/rpe.png | Bin 0 -> 2441 bytes src/assets/ctc_icon/rph.png | Bin 0 -> 2003 bytes src/assets/ctc_icon/rpsa.png | Bin 0 -> 1974 bytes src/assets/ctc_icon/rpsw.png | Bin 0 -> 2351 bytes src/assets/ctc_icon/rpu.png | Bin 0 -> 1890 bytes src/assets/ctc_icon/rpvb.png | Bin 0 -> 2084 bytes src/assets/ctc_icon/rpvs.png | Bin 0 -> 1996 bytes src/assets/ctc_icon/rpw.png | Bin 0 -> 2324 bytes src/assets/ctc_icon/rpwp.png | Bin 0 -> 2147 bytes .../theme/datie_02/menus/runplanPane.vue | 71 +++++++++++++++++- 13 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 src/assets/ctc_icon/rpb.png create mode 100644 src/assets/ctc_icon/rpd.png create mode 100644 src/assets/ctc_icon/rpdu.png create mode 100644 src/assets/ctc_icon/rpe.png create mode 100644 src/assets/ctc_icon/rph.png create mode 100644 src/assets/ctc_icon/rpsa.png create mode 100644 src/assets/ctc_icon/rpsw.png create mode 100644 src/assets/ctc_icon/rpu.png create mode 100644 src/assets/ctc_icon/rpvb.png create mode 100644 src/assets/ctc_icon/rpvs.png create mode 100644 src/assets/ctc_icon/rpw.png create mode 100644 src/assets/ctc_icon/rpwp.png diff --git a/src/assets/ctc_icon/rpb.png b/src/assets/ctc_icon/rpb.png new file mode 100644 index 0000000000000000000000000000000000000000..cf8124350c3acf28f8c075f6ed98e2b13a0b7d12 GIT binary patch literal 1044 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 literal 0 HcmV?d00001 diff --git a/src/assets/ctc_icon/rpdu.png b/src/assets/ctc_icon/rpdu.png new file mode 100644 index 0000000000000000000000000000000000000000..8507d1437d5cf24261d318271095db77c0a7f700 GIT binary patch literal 2155 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 Hu0mjfVjHB~ literal 0 HcmV?d00001 diff --git a/src/assets/ctc_icon/rph.png b/src/assets/ctc_icon/rph.png new file mode 100644 index 0000000000000000000000000000000000000000..5c84cc8a6f102f5ddb30f9db09de8aceefc4dec6 GIT binary patch literal 2003 zcmV;^2Q2uBP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2WUw|K~zXfb(VW@ z)YTQoe+gg&5&{S+VB4W+ZLLh{!y;n#p}l9bu!@h5D0kj``rYCUIKnEUK#Uv+){fZ`r&_t`{jNmn#_HR zOp)rg+asU>y1IHOD=+6t%@y(r%p5wL!ja5$(mqJ#=+SISOG~+YxrXxcD(v=NF(!c1 z>C`0umrRkU0f#6mOFKGRsj4dB%;{WqC%#Wol8KU13mu(S%(1cs#^9tD30 zg7P1dz7c7U$Y6V06aU(~hk}ALLfEf?!+2q$FUV9w23<}E^>x+c<(Cc~?@ZJ+2Px0CL{|a$XPu%vt55w5b%x`7!%#zQzQa=W!iW=|t zz{ag$#H0{CWj6`SlL-z%AQ)ol(ih0h&0%zOG~%W5&hRKQhn-6o@+rtK&|o_f?HJK1 z7?Y2)YE7x`3kgG?5H#I@R-3d1Sd}gB2;rpTOrE)ur7KLjud1qyojbSF-`5w(P(^6? zd>(qbZRDQJ#^r|2UiigxZ30liglQK^PIGAhRo>m%F5V^xXc{HORl2XG8=hP&ghn25 z_oPzzsgI#hi07YQLQ~Uqtz(xZQfp^~LIK*_+c=z-sRxqMWa1qc85iF`bbK|dH+m>I z4}VF7?>^E*%(P6V&-yDTPLyf=@>-bxgv^P$fidm^3!mJBrM`pI!ynSna82uk*UylI z#!}aSxuAj`Cp?>AXW~6=jGHDgj&n!?l#10SB&?T+np%Z%=V9hPxQ7}cQRQH|GOmG% zvz2$1%zG#iYfC?8KRJihI=0Y}FpiD{#ezmEs%%)>;X6OF5IwC+$cBlU2IFSJ_`4zI z-foOoGjrzcq~fy1&}%n;p;btVne(tBE0pmanDeW6YwO#Tm0i$!Jv}{RVH^y&X>aYI zv2l>rPFVPql?ivr+Dsi0&jcWD6k|#sMtlV`=N+fGLeHn(Dr@y@y%1awBZe`=FvFg8Cm}rwN(oNKqMlmRx?=5(j zp1zxs**m}wwf{dBk|~}CNg4M7&oPu`@f&Xs?|lj zy}gwMkL3%nkj1x(UW-VrWUsW1H^};r5Dbj4eEAAV{RWNMC;M$|pLsnv9yqE1ew(|RBi&?w&Ro1Ux$Lp*AB=u{odt)VkcxefnH?8L2!F_VOpQ7L4#HZdM zg5&e~zCxtQ)LMDOGj*?drS{3oO8xu9x}l*V*(*(Q`)0|jDwFi|3^Fo~NS!WEfFoM+ z^73_Le7*sCdwcb}LnVbvvivq=5?hxd5Ya^9x(cfds?F$?Y#kmBF*q0?BsXR#G^mXT z4i3q^H7w!x(%YxNRp{JWT!N##`x=>Blx`==TD5*EWz}(`YKMf$>2OKymXNvV?Uz0= l&MEr37Gm|Ux}>a002ovPDHLkV1lT(>30AC literal 0 HcmV?d00001 diff --git a/src/assets/ctc_icon/rpsa.png b/src/assets/ctc_icon/rpsa.png new file mode 100644 index 0000000000000000000000000000000000000000..66df38ac6becd37e7282db2a347978bd75e64fc0 GIT binary patch literal 1974 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 VCFU%i2u}b2002ovPDHLkV1nPzlXL(8 literal 0 HcmV?d00001 diff --git a/src/assets/ctc_icon/rpu.png b/src/assets/ctc_icon/rpu.png new file mode 100644 index 0000000000000000000000000000000000000000..4c81a8aaf6a26af9203109195275fe917930c34a GIT binary patch literal 1890 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
-
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
@@ -356,8 +393,8 @@
与调度台的信息
-
casco：下达新阶段计划 22:30
-
王岗：casco,我签收新下达的阶段计划 22:31
+ +
@@ -394,7 +431,7 @@
与邻站的信息
-
王岗：收到计划！22:32:02
+
@@ -406,6 +443,18 @@
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue index b6d49d438..75c41c9bd 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue @@ -148,7 +148,7 @@ export default { return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Train.updateTrip.confirm.domId : ''; + return this.dialogShow ? OperationEvent.CTCCommand.batchModifyTrackSection.menu.domId : ''; }, title() { return '发送计划'; diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index ca666627e..f43bc5843 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -396,9 +396,9 @@
为终到车
上报速报信息
-
修改车次号
-
修改相关邻站
-
删除
+
修改车次号
+
修改相关邻站
+
删除
清楚闪烁
全体信息
@@ -462,7 +462,8 @@
- + +
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index bd6d242ef..c395be8c9 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -390,6 +390,8 @@ export default { CTC_ASSIST_PRESS_RESTORE:{value: 'ASSIST_PRESS_RESTORE', label: '复原'}, CTC_ASSIST_PRESS_ACCIDENT:{value: 'ASSIST_PRESS_ACCIDENT', label: '事故'}, CTC_MODIFY_TRACK_SECTION:{value: 'CTC_MODIFY_TRACK_SECTION', label: '修改股道'}, - CTC_BATCH_MODIFY_RUN_PLAN:{value: 'CTC_BATCH_MODIFY_RUN_PLAN', label: '批量修改股道'} + CTC_BATCH_MODIFY_RUN_PLAN:{value: 'CTC_BATCH_MODIFY_RUN_PLAN', label: '批量修改股道'}, + CTC_REMOVE_RUN_PLAN:{value: 'CTC_REMOVE_RUN_PLAN', label: '移除行车日志'}, + CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'} } }; diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 2cbcbd5e1..ab132a88d 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3667,19 +3667,34 @@ export const OperationEvent = { domId: '_Tips-CTC-AssistPressAccident-Menu{TOP}' } }, + // 修改股道 modifyTrackSection:{ menu: { operation: '1110', domId: '_Tips-CTC-modifyTrackSection-Menu{TOP}' } }, + // 批量修改股道 batchModifyTrackSection:{ menu: { operation: '1111', domId: '_Tips-CTC-batchModifyTrackSection-Menu{TOP}' } + }, + // 移除行车日志 + deleteRunplan:{ + menu: { + operation: '1112', + domId: '_Tips-CTC-deleteRunplan-Menu{TOP}' + } + }, + // 修改行车计划的邻站信息 + modifyAdjacentStation:{ + menu: { + operation: '1113', + domId: '_Tips-CTC-modifyAdjacentStation-Menu{TOP}' + } } - } }; From 602732bb6d6850fdd6ca93001f0b1d095559e009 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 9 Jun 2022 15:36:05 +0800 Subject: [PATCH 29/84] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E6=97=A5=E5=BF=97=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E8=AE=A1=E5=88=92=E9=82=BB=E7=AB=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=93=8D=E4=BD=9C=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/modifyAdjacentStation.vue | 151 ++++++++++++++++++ .../theme/datie_02/menus/runplanPane.vue | 2 +- 2 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue new file mode 100644 index 000000000..d0aba1013 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue @@ -0,0 +1,151 @@ + + + diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index f43bc5843..bede115ae 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -462,7 +462,7 @@
- +
From c83cf31bf3df7234c878bc78d3f360968a23df4f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 9 Jun 2022 17:16:01 +0800 Subject: [PATCH 30/84] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E6=97=A5=E5=BF=97=20=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E5=8F=B7=20=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/components/utils/menuOperate.js | 5 +++++ .../datie_02/menus/dialog/modifyAdjacentStation.vue | 10 +++++----- src/jmapNew/theme/datie_02/menus/runplanPane.vue | 11 ++++++++--- src/scripts/cmdPlugin/CommandEnum.js | 3 ++- src/scripts/cmdPlugin/OperationHandler.js | 7 +++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 279e5cab7..c03ff3e9f 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -553,6 +553,11 @@ export const menuOperate = { modifyAdjacentStation:{ operation: OperationEvent.CTCCommand.modifyAdjacentStation.menu.operation, cmdType: CMD.CTC.CTC_MODIFY_ADJACENT_STATION + }, + // 修改车次号(大铁CTC) + modifyTripNumber:{ + operation: OperationEvent.CTCCommand.modifyTripNumber.menu.operation, + cmdType: CMD.CTC.CTC_MODIFY_TRIP_NUMBER } } diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue index d0aba1013..38132058d 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue @@ -26,10 +26,10 @@ :value="item.code" /> - 站驶来 +
站驶来
- 驶向 +
驶向
- 站 +
站
@@ -101,8 +101,8 @@ export default { doShow(row) { this.model.stationCode = row.stationCode; this.model.runPlanCode = row.code; - this.model.arriveStationCode = row.arriveStationCode || ''; - this.model.departStationCode = row.departStationCode || ''; + this.model.arriveStationCode = (row.arriveRunPlan && row.arriveRunPlan.stationCode) || ''; + this.model.departStationCode = (row.departRunPlan && row.departRunPlan.stationCode) || ''; this.tripNumber = row.tripNumber; this.dialogShow = true; this.$nextTick(function () { diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index bede115ae..cf15031b5 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -464,6 +464,7 @@ + + From d36ee77d001d55494143f4b29f39ec5eb8423351 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 9 Jun 2022 18:06:47 +0800 Subject: [PATCH 32/84] =?UTF-8?q?ctc=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 --- .../theme/datie_02/menus/bottomTable.vue | 150 ++++++++++++++++++ src/jmapNew/theme/datie_02/menus/index.vue | 64 +++++--- src/jmapNew/theme/datie_02/menus/menuBar.vue | 6 +- .../theme/datie_02/menus/menuButtonCtc.vue | 139 ++++++++-------- .../datie_02/menus/menuDialog/routeCancel.vue | 14 ++ .../theme/datie_02/menus/menuSwitch.vue | 33 ++-- src/views/newMap/displayNew/demonMenu.vue | 7 +- src/views/newMap/displayNew/index.vue | 4 + src/views/newMap/displayNew/menuDemon.vue | 5 +- 9 files changed, 305 insertions(+), 117 deletions(-) create mode 100644 src/jmapNew/theme/datie_02/menus/bottomTable.vue diff --git a/src/jmapNew/theme/datie_02/menus/bottomTable.vue b/src/jmapNew/theme/datie_02/menus/bottomTable.vue new file mode 100644 index 000000000..434d3a8b6 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/bottomTable.vue @@ -0,0 +1,150 @@ + + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index da035373b..df56ebf77 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -1,25 +1,36 @@ @@ -75,6 +87,7 @@ import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/contr import PassiveTimeout from './passiveDialog/timeout'; import { timeFormat } from '@/utils/date'; import { prefixIntrger } from '@/utils/date'; +import BottomTable from './bottomTable'; import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png'; import CtcBarIcon2 from '@/assets/ctc_icon/pic2.png'; import CtcBarIcon3 from '@/assets/ctc_icon/pic3.png'; @@ -109,7 +122,8 @@ export default { PassiveContorl, PassiveTimeout, MenuButtonCtc, - RunplanPane + RunplanPane, + BottomTable }, props: { selected: { @@ -141,6 +155,7 @@ export default { ], time: '00:00:00', dateString: '', + dateString1: '', ctcBarIcon1: CtcBarIcon1, ctcBarIcon2: CtcBarIcon2, ctcBarIcon3: CtcBarIcon3, @@ -211,6 +226,7 @@ export default { if (months.length < 2) { months = '0' + months; } if (dates.length < 2) { dates = '0' + dates; } this.dateString = years + months + dates; + this.dateString1 = years + '年' + months + '月' + dates + '日'; }, handleRunplan(){ this.$refs.runplanPane.doShow() @@ -549,15 +565,15 @@ export default { .img-box{ width: 28px; height: 28px; - border: 3px #ccc inset; + border: 2px #ccc outset; margin-top: 0; background: #fff; cursor: pointer; } .img-box:active{ - border: 2px #ccc outset; + border: 2px #ccc inset; } .img-box:hover{ - border: 2px #ccc outset; + border: 2px #ccc inset; } diff --git a/src/jmapNew/theme/datie_02/menus/menuBar.vue b/src/jmapNew/theme/datie_02/menus/menuBar.vue index ee6963a42..6dd164786 100644 --- a/src/jmapNew/theme/datie_02/menus/menuBar.vue +++ b/src/jmapNew/theme/datie_02/menus/menuBar.vue @@ -25,6 +25,7 @@ import ViewName from './menuDialog/viewName'; import ManageUser from './menuDialog/manageUser'; import HelpAbout from './menuDialog/helpAbout'; import SetLimitSpeed from './menuDialog/setLimitSpeed'; +import { EventBus } from '@/scripts/event-bus'; export default { name: 'MenuBarChengdu03', @@ -84,7 +85,7 @@ export default { }, { title: '显示进路序列管理窗口', - click: this.undeveloped + click: this.bottomTableShowOrHidden }, { title: '显示信号员计划表', @@ -550,6 +551,9 @@ export default { } }); }, + bottomTableShowOrHidden(){ + EventBus.$emit('bottomTableShowOrHidden'); + }, undeveloped() { this.$refs.menuBar.doClose(); this.$alert('实现中......', '提示', { diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index d6dec40a7..d21221462 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -1,108 +1,108 @@ @@ -23,6 +24,7 @@ import CancelMouseState from '@/mixin/CancelMouseState'; import { mapGetters } from 'vuex'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; +import RouteCancel from './menuDialog/routeCancel'; export default { name: 'SwitchMenu', @@ -33,7 +35,8 @@ export default { NoticeInfo, SetFault, SwitchHookLock, - DrawSelect + DrawSelect, + RouteCancel }, mixins: [ CancelMouseState @@ -51,29 +54,25 @@ export default { menu: [], menuNormal: { Local: [ - // { - // label: '图纸调用', - // handler: this.drawingCall - // }, - // { - // label: '基础设备培训', - // handler: this.baDeTrCall - // } { label: '定操', - handler: '' + handler: this.locate, + cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION }, { label: '反操', - handler: '' + handler: this.reverse, + cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION }, { label: '单锁', - handler: '' + handler: this.lock, + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK }, { label: '单解', - handler: '' + handler: this.unlock, + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK }, { label: '封锁/解封', @@ -188,7 +187,7 @@ export default { }, watch: { '$store.state.menuOperation.menuCount': function (val) { - if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) { + if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && (!this.buttonOperation || this.$route.query.ctc)) { this.doShow(this.$store.state.menuOperation.menuPosition); } else { this.doClose(); @@ -299,7 +298,8 @@ export default { locate() { commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.switchControl.doShow(operate, this.selected); + // this.$refs.switchControl.doShow(operate, this.selected); + this.$refs.routeCancel.doShow(operate, this.selected); } }); }, @@ -307,7 +307,8 @@ export default { reverse() { commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.switchControl.doShow(operate, this.selected); + // this.$refs.switchControl.doShow(operate, this.selected); + this.$refs.routeCancel.doShow(operate, this.selected); } }); }, diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index 4fb725bfe..dff9d32c2 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -1,6 +1,6 @@ diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainRoute.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainRoute.vue new file mode 100644 index 000000000..98e3e4b46 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/trainRoute.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index ced0fcdb7..b21194ac9 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -119,9 +119,9 @@ export default { } }, data() { - return { - alarmMessages: [ - { id: 1, message: '这是告警信息一' }, + return { + alarmMessages: [ + { id: 1, message: '这是告警信息一' }, { id: 2, message: '这是告警信息二' }, { id: 3, message: '这是告警信息三' }, { id: 4, message: '这是告警信息四' }, @@ -169,7 +169,7 @@ export default { return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07'; }, isCtc() { - return this.$route.query.ctc; + return this.$route.query.ctc; } }, watch: { @@ -475,77 +475,260 @@ export default { font-weight: normal !important; color: #000 !important; } + .fuzhou-01__systerm .el-dialog { + background: rgba(100, 100, 100, 0.3); + border: 2px solid rgb(144, 144, 144, 0.8); + border-radius: 6px; + color: #000; + font-size: 14px; + } - .chengdou-03__systerm .el-dialog .context { - height: 100px; - border: 2px inset #E2E2E2; - overflow-y: scroll; - } - - .chengdou-03__systerm .el-dialog .table { - margin-top: 10px; - } - - .chengdou-03__systerm .el-dialog .notice { - margin-left: 62px; - line-height: 30px; - } - - .chengdou-03__systerm .el-dialog .button-group { - margin-top: 20px; - } - .alarm-window { - width: 450px; - height: 100px; - position: fixed; - top: 10px; - left: 55px; - background: #f00; - z-index: 10; - overflow-y: scroll; - border-bottom: 6px #ccc solid; - border-top: 6px #ccc solid; - border-right: 3px #ccc solid; - border-left: 3px #ccc solid; + .fuzhou-01__systerm .el-dialog .el-dialog__header { padding: 5px; + height: 26px; } - .device-status-window { - width: 160px; - height: 35px; - position: fixed; - top: 50px; - right: 10px; - z-index: 10; - display: flex; - border: 2px #FBFCFB solid; - align-items: center; - justify-content: center; + + .fuzhou-01__systerm .el-dialog .el-dialog__footer { + background: #F0F0F0; + opacity: 1; } - .device-status-button { - border-top: 2px #808080 solid; - border-left: 2px #808080 solid; - border-right: 2px #FDFBF9 solid; - border-bottom: 2px #FDFBF9 solid; - width: 79px; - height: 30px; - text-align: center; + + .fuzhou-01__systerm .el-dialog .el-dialog__body { + padding-top: 10px; + padding-bottom: 10px; + padding-left: 5px; + padding-right: 5px; + margin: 0px 5px 5px; + border: 2px solid rgba(120, 121, 123, 0.5); + box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset; + background: #F0F0F0; + opacity: 1; + } + + .fuzhou-01__systerm .el-dialog .el-dialog__title { + position: absolute; + top: 4px; + color: #000; + border-radius: 4px; + padding: 0px 2px; + height: 20px; + line-height: 20px + } + + .fuzhou-01__systerm .el-dialog .el-dialog__title::before { + content: ''; + position: absolute; + top: 0; + left: 0; + -webkit-filter: blur(10px); + filter: blur(10px); + height: 20px; + width: -webkit-fill-available; + background: rgba(128, 128, 128, 0.8); + z-index: -1; + } + + .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn { + background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770); + border: 1px solid #fff; + border-radius: 4px; + top: 4px; + right: 5px; + line-height: 16px; + } + + .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before { + font-size: 16px; + } + + .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close { + color: #fff; + } + + .fuzhou-01__systerm .el-dialog .el-button { + height: 32px; + line-height: 32px; + padding: 0px; + width: 80px; + border: 2px outset #E2E2E2; + border-radius: 0px !important; + color: #000; + background: #F0F0F0; + } + + .fuzhou-01__systerm .el-dialog .el-button:focus span { + border: 1px dashed gray; + } + + .fuzhou-01__systerm .el-dialog .el-button:active { + border: 2px inset #E2E2E2; + } + + .fuzhou-01__systerm .el-dialog .el-button:disabled { + border: 2px inset #E2E2E2; + } + + .fuzhou-01__systerm .el-dialog .el-button:disabled span { + border: 0px; + } + + .fuzhou-01__systerm .el-dialog .el-input { + border: 2px inset #E9E9E9; + } + + .fuzhou-01__systerm .el-dialog .el-input .el-input__inner { + color: #000; + background: #fff !important; + border: 0px; + border-radius: 0px !important; + box-sizing: border-box; + } + + .fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner { + background: #F0F0F0 !important; + } + + .fuzhou-01__systerm .el-dialog .el-textarea { + border: 2px inset #E9E9E9; + border-radius: 0px; + } + + .fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner { + color: #000; + background: #fff !important; + border: 0px; + border-radius: 0px !important; + box-sizing: border-box; + } + + .fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner { + background: #F0F0F0 !important; + } + + .fuzhou-01__systerm .el-dialog .el-table { + border: 2px inset #E9E9E9; + color: #000 !important; + } + + .fuzhou-01__systerm .el-dialog .el-table .cell { + line-height: unset !important; + } + + .fuzhou-01__systerm .el-dialog .el-table th.is-leaf { + background: #F0F0F0 !important; + border-right: 1px solid #BDBDBD !important; + border-bottom: 1px solid #BDBDBD !important; + color: #000 !important; + height: 20px !important; + padding: 0px; + } + + .fuzhou-01__systerm .el-dialog .el-table tr td { + height: 20px !important; + padding: 0px; + } + + .fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text { + top: 15px !important; + } + + .fuzhou-01__systerm .el-dialog .current-row>td { + background: #3399FF !important; + color: #fff !important; + } + + .fuzhou-01__systerm .el-dialog .el-checkbox__inner { + border: 1px inset #dcdfe6 !important; + } + + .fuzhou-01__systerm .el-dialog .el-checkbox__label { + color: #000 !important; + } + + .fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner { + background: #E6E6E6 !important; + } + + .fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label { + color: #C5C9CC !important; + } + + .fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner { + background: #fff !important; + border: 1px inset #dcdfe6 !important; + } + + .fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after { + position: absolute; + -webkit-box-sizing: content-box; + box-sizing: content-box; + content: ""; + border: 1px solid #000; + border-left: 0; + border-top: 0; + height: 7px; + left: 4px; + top: 1px; + } + + .fuzhou-01__systerm .el-dialog .el-radio__inner { + border: 1px inset #dcdfe6 !important; + } + + .fuzhou-01__systerm .el-dialog .el-radio__label { + color: #000 !important; + } + + .fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner { + background: #fff !important; + border: 1px inset #dcdfe6 !important; + } + + .fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after { + width: 4px; + height: 4px; + border-radius: 100%; + background-color: #000 !important; + position: absolute; + left: 50%; + top: 50%; + } + + .fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner { + background: #E6E6E6 !important; + } + + .fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label { + color: #C5C9CC !important; + } + + .fuzhou-01__systerm .el-dialog .base-label { + background: rgb(240 240 240); + position: relative; + } + + .fuzhou-01__systerm .el-dialog .el-form-item label { + font-weight: normal !important; + color: #000 !important; + } + + .fuzhou-01__systerm .el-dialog .context { + height: 100px; + border: 2px inset #E2E2E2; + overflow-y: scroll; + } + + .fuzhou-01__systerm .el-dialog .table { + margin-top: 10px; + } + + .fuzhou-01__systerm .el-dialog .notice { + margin-left: 62px; line-height: 30px; - cursor: pointer; } - .warning-window { - width: 400px; - height: 100px; - position: fixed; - right: 10px; - top: 60px; - background: #808080; - z-index: 10; - overflow-y: scroll; - border-bottom: 6px #ccc solid; - border-top: 6px #ccc solid; - border-right: 3px #ccc solid; - border-left: 3px #ccc solid; - padding: 5px; + + .fuzhou-01__systerm .el-dialog .button-group { + margin-top: 10px; } .img-box{ width: 28px; diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index 1a4688ae3..e047a4fd0 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -111,6 +111,8 @@ + + @@ -120,11 +122,12 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'; import Handler from '@/scripts/cmdPlugin/Handler'; import PasswordBox from './dialog/childDialog/passwordInputBox.vue'; +import TrainRoute from './dialog/trainRoute.vue'; +import ShuntRoute from './dialog/shuntRoute.vue'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { mapGetters } from 'vuex'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { MouseEvent, DeviceMenu } from '@/scripts/ConstDic'; -// import CenterConfig from '@/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig'; import { EventBus } from '@/scripts/event-bus'; export default { @@ -133,7 +136,9 @@ export default { // CenterConfig, PasswordBox, NoticeInfo, - PopMenu + PopMenu, + TrainRoute, + ShuntRoute }, props: { selected: { @@ -176,7 +181,8 @@ export default { handler: this.commandClear } ], - switchOperation: [] + switchOperation: [], + route: null }; }, computed: { @@ -495,6 +501,7 @@ export default { if (route) { operate.code = deviceList[deviceList.length - 1].code; operate.param = {routeCode: route.code}; + this.route = route; this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => { this.deviceTimeNode = 0; this.$store.dispatch('training/updateMapState', @@ -513,6 +520,7 @@ export default { if (route) { operate.code = deviceList[deviceList.length - 1].code; operate.param = {routeCode: route.code}; + this.route = route; this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => { this.deviceTimeNode = 0; this.$store.dispatch('training/updateMapState', @@ -718,15 +726,25 @@ export default { Handler.clear(); // 清空操作组 this.$store.dispatch('menuOperation/setButtonOperation', this.operation); }, + routeCommit(trainCode) { + const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, param:{ tripNumber: trainCode || '' }}; + this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => { + this.clearOperate(); + }).catch((e) => { + console.log(e, 'error'); + this.$refs.noticeInfo.doShow(); + this.clearOperate(); + }); + }, commandOrders() { if (this.operation === OperationEvent.Signal.arrangementRoute.button.operation) { - const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE}; - this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => { - this.clearOperate(); - }).catch(() => { - this.$refs.noticeInfo.doShow(); - this.clearOperate(); - }); + if (this.deviceList && this.deviceList[0] && this.deviceList[0].type === 'PICK') { + this.$refs.trainRoute.doShow(this.route); + } else if (this.deviceList && this.deviceList[0] && this.deviceList[0]._type === 'Signal') { + this.$refs.shuntRoute.doShow(this.route); + } else { + this.routeCommit(); + } } else if (this.operation === OperationEvent.MixinCommand.totalCancel.button.operation) { const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE}; this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => { diff --git a/src/scripts/cmdPlugin/Command.js b/src/scripts/cmdPlugin/Command.js index d63721116..e57622f9c 100644 --- a/src/scripts/cmdPlugin/Command.js +++ b/src/scripts/cmdPlugin/Command.js @@ -9,6 +9,7 @@ export default class Command { toFound(definition, wholeParam) { this.id = definition.operate; + console.log(wholeParam, definition.paramList, 'tripNumber-----'); (definition.paramList || []).forEach(param => { if (wholeParam.hasOwnProperty(param.name)) { this.command[param.name] = wholeParam[param.name]; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 05d02e164..f2ce36aff 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -24,7 +24,7 @@ export function handlerUrl(data) { if (process.env.NODE_ENV === 'development') { // const data = null; // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 @@ -33,7 +33,7 @@ export function handlerUrl(data) { // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 - // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 + BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 // BASE_API = data && data.domainName ? 'https://' + data.domainName : BASE_API; BASE_API = data && data.domainName ? 'http://' + data.domainName : BASE_API; VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink'; diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue index 9ad1a3b60..4701e53cd 100644 --- a/src/views/newMap/displayCity/lineBoard.vue +++ b/src/views/newMap/displayCity/lineBoard.vue @@ -26,9 +26,9 @@ :style="{borderColor: item.occupied ? '#f00': '#DFE3E6', fontWeight: item.occupied? 'bold': 'normal', color:item.occupied? '#f00':'#1e2024' }" >{{ item.trackName }}
{{ item.tripNumber }}
-
{{ item.trainType?'客':'' }}
-
{{ item.trainDistanceInfo }}
-
+
{{ item.trainType?'客':'' }}
+
{{ item.trainDistanceInfo }}
+
-
-
接预
+
+
接预
{{ '接路' + (item.receivingRouteLock ? '':getRouteName(item.receivingRouteCode)) }}
-
到点
+
到点
-
-
{{ item.arriveTime }}
-
{{ item.departureTime }}
+
+
{{ item.arriveTime || '-' }}
 +
{{ item.departureTime|| '-' }}
-
-
{{ item.planArriveTime }}
-
{{ item.planDepartureTime }}
+
+
{{ item.planArriveTime|| '-' }}
 +
{{ item.planDepartureTime || '-' }}
 +
+
+ {{ item.receivingDirection||'-' }} + {{ item.departureDirection||'-' }}
-
-
发预
+
+
发预
{{ '发路' + (item.departureRouteLock ? '':getRouteName(item.departureRouteCode)) }}
-
发点
+
发点
-
{{ item.tripNumber }}
+
{{ item.tripNumber }}
{{ item.trackName }}
From 746c54651adfe50cd28c78ce52f0a9b6b0216271 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 16 Jun 2022 15:20:12 +0800 Subject: [PATCH 64/84] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20ct?= =?UTF-8?q?c=20=E8=BD=A6=E5=8A=A1=E7=AE=A1=E7=90=86=E7=AB=AF=20=E5=88=97?= =?UTF-8?q?=E8=BD=A6=E5=9B=BA=E5=AE=9A=E8=B7=AF=E5=BE=84=20=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=20=20=E8=AE=A2=E9=98=85=E8=B7=AF=E5=BE=84=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/stomp.js | 2 +- src/views/bigTrainRunplanManage/addRunplan.vue | 7 ------- src/views/bigTrainRunplanManage/index.vue | 12 +++++++++--- .../terminalStationList.vue | 1 + .../bigTrainRunplanManage/trainFixedPath.vue | 16 +++++++++++++++- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/utils/stomp.js b/src/utils/stomp.js index fd476909b..9608de56d 100644 --- a/src/utils/stomp.js +++ b/src/utils/stomp.js @@ -35,7 +35,7 @@ export function getTopic(type, group, stationCode) { topic = `/queue/simulation/${group}/ctc`; break; case 'CTC_MANAGE': - topic = `/queue/simulation/ctc/manage/${group}`; + topic = `/queue/simulation/${group}/ctc/manage`; break; } diff --git a/src/views/bigTrainRunplanManage/addRunplan.vue b/src/views/bigTrainRunplanManage/addRunplan.vue index 86c60d217..b84669c30 100644 --- a/src/views/bigTrainRunplanManage/addRunplan.vue +++ b/src/views/bigTrainRunplanManage/addRunplan.vue @@ -219,7 +219,6 @@ export default { this.loading = true; const param = {stationCode:this.addModel.stationCode, runPlanParamList:[this.addModel]}; commitOperate(menuOperate.CTC.addTrainFixedPath, param, 3).then(({valid})=>{ - debugger; if (valid) { this.doClose(); } @@ -401,12 +400,6 @@ export default { // top: -18px; // } - // .chengdou-03__systerm .el-dialog .context { - // height: 100px; - // border: 2px inset #E2E2E2; - // overflow-y: scroll; - // } - // .chengdou-03__systerm .el-dialog .notice { // margin-left: 62px; // line-height: 30px; diff --git a/src/views/bigTrainRunplanManage/index.vue b/src/views/bigTrainRunplanManage/index.vue index 3ad6bdf3b..6472a3181 100644 --- a/src/views/bigTrainRunplanManage/index.vue +++ b/src/views/bigTrainRunplanManage/index.vue @@ -103,11 +103,11 @@ export default { }); if (!findTab) { this.currentTabs.push(Object.assign( {name:name}, nameMap[name])); + this.$nextTick(()=>{ + this.$refs[this.activeTab][0].loadStation(); + }); } this.activeTab = name; - this.$nextTick(()=>{ - this.$refs[this.activeTab][0].loadStation(); - }); }, quit() { window.close(); @@ -296,4 +296,10 @@ border-left: 1px #94b6f0 solid;border-right: 1px #c9d3e0 solid;} .datie-02__systerm .el-dialog span.el-input__suffix .el-input__icon{ line-height:22px; } +.datie-02__systerm .el-dialog .context { + height: 100px; + border: 2px inset #E2E2E2; + overflow-y: scroll; + margin-bottom: 10px; +} diff --git a/src/views/bigTrainRunplanManage/terminalStationList.vue b/src/views/bigTrainRunplanManage/terminalStationList.vue index 42501fc92..5f6c4251b 100644 --- a/src/views/bigTrainRunplanManage/terminalStationList.vue +++ b/src/views/bigTrainRunplanManage/terminalStationList.vue @@ -75,6 +75,7 @@ export default { this.$emit('loadStationData', data.id); }, loadStation() { + this.treeList[0].children = []; this.stationList.forEach(station => { if (!station.depot) { this.treeList[0].children.push({id:station.code, label:station.name}); diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue index 656da37dd..5e161c112 100644 --- a/src/views/bigTrainRunplanManage/trainFixedPath.vue +++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue @@ -21,7 +21,7 @@
版本号 - 备份 + 备份 更新至生效区 导入 比较 @@ -232,6 +232,7 @@