From 297688974232609ad6d233b6f181691328c2b0a3 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 31 May 2022 18:12:47 +0800 Subject: [PATCH 1/8] =?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 | 135 +++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index 61bb849fb..9e2a3bbde 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -33,7 +33,102 @@
- table + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -48,7 +143,9 @@ export default { name:'RunplanPane', data() { return { - isShow:false + isShow:false, + tableData:[ + ] }; }, methods:{ @@ -147,6 +244,8 @@ export default { border-right: 2px #4c4c4c solid; padding: 6px 15px; margin-top: 2px; + cursor:pointer; + margin-left: 3px; } .runplanBtnGroup{ display: flex; @@ -169,5 +268,37 @@ export default { padding: 6px 15px; margin-top: 2px; background: #f0f0f0; + cursor: text; +} +.runplanTableNo{ + height: 30px; + width: 100%; + text-align: center; + line-height: 30px; + border-top: 1px #ebeef5 solid; + // position: absolute; + // bottom: 0px; +} +.runplanTableTname{ + width: 100%; + // flex-grow: 1; + text-align: center; + line-height: 20px; + font-size: 15px; } + From c1e7198fa8ed2ab10f59baa7ca54904abd28bc2d Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 1 Jun 2022 13:18:17 +0800 Subject: [PATCH 2/8] =?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 | 173 ++++++++++++++++-- 1 file changed, 154 insertions(+), 19 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index 9e2a3bbde..d90cdc466 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -37,6 +37,7 @@ id="runplanContentTable" :data="tableData" border + height="695" style="width: 100%;border:1px #ccc solid" > - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -145,6 +261,8 @@ export default { return { isShow:false, tableData:[ + {section:'11002', up:'11002', recieveTrain:'王孙上行', depatureTrain:'京哈上行'}, + {section:'11102', up:'11102', recieveTrain:'王孙上行', depatureTrain:'京哈上行'} ] }; }, @@ -275,7 +393,8 @@ export default { width: 100%; text-align: center; line-height: 30px; - border-top: 1px #ebeef5 solid; + border-top: 1px #777777 solid; + font-weight: normal; // position: absolute; // bottom: 0px; } @@ -283,15 +402,23 @@ export default { width: 100%; // flex-grow: 1; text-align: center; - line-height: 20px; + // line-height: 20px; font-size: 15px; + font-weight: normal; + display: inline-block; } +.runplanFourLevel{line-height: 22px;} +.runplanThreeLevel{line-height: 20px;} +.runplanTwo2Level{line-height:35px} +.runplanTwo1Level{line-height: 27px;} +.runplanZhe{width: 16px;display: inline-block;vertical-align: top;} From fcd3110e9f5292b2c664f2f82dbc61d5a2230b78 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 1 Jun 2022 15:34:53 +0800 Subject: [PATCH 3/8] =?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 | 94 +++++++++++++++++-- 1 file changed, 87 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index d90cdc466..ec02d7530 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -248,9 +248,36 @@
-
-
-
+
+
+
+
+
+
与调度台的信息
+
+
+
casco：下达新阶段计划 22:30
+
王岗：casco,我签收新下达的阶段计划 22:31
+
+
+
+
+
键盘输入区
+
+ 222 +
+
+
+
与邻站的信息
+
+
+
王岗：收到计划！22:32:02
+
+
+
+
+
+
@@ -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 4/8] =?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 5/8] =?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" /> - +