From db9ca504007b3fea069b15823374b8beb9f675aa Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 17 Jun 2022 11:26:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E9=93=81ctc=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      | 28 ++++++++++++++++++-
 src/jmapNew/theme/datie_02/menus/index.vue    |  5 ++--
 src/jmapNew/theme/datie_02/menus/menuBar.vue  |  1 -
 src/views/newMap/displayCity/lineBoard.vue    |  2 +-
 src/views/newMap/displayNew/index.vue         |  6 ++--
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/bottomTable.vue b/src/jmapNew/theme/datie_02/menus/bottomTable.vue
index 4081c5f3b..a5c0a7948 100644
--- a/src/jmapNew/theme/datie_02/menus/bottomTable.vue
+++ b/src/jmapNew/theme/datie_02/menus/bottomTable.vue
@@ -10,10 +10,11 @@
               ref="sequenceTable"
               :data="sequenceList"
               height="90"
+              :row-class-name="tableRowClassName"
               border
               style="width: 650px"
               :cell-style="{padding: 0}"
-              :default-sort="{prop: 'startTime', order: 'descending'}"
+              :default-sort="{prop: 'startTime', order: 'ascending'}"
             >
               <el-table-column type="index" width="30" label="序" label-class-name="bottom-table-label-header" />
               <el-table-column property="tripNumber" label="车次" width="60" label-class-name="bottom-table-label-header">
@@ -218,6 +219,22 @@ export default {
                 }
             }
         },
+        tableRowClassName({row, rowIndex}) {
+            // if (status === '2') {
+            // 	return '触发完成';
+            // } else if (status === '1') {
+            // 	return '正在触发';
+            // } else {
+            // 	return '等待中';
+            // }
+            if (row.status === 0) {
+                return 'bottom-table-route-wait';
+            } else if (row.tripNumber) {
+                return 'bottom-table-route-gray';
+            } else {
+                return 'bottom-table-route-green';
+            }
+        },
         getRouteName(code) {
             if (code) {
                 const route = this.$store.state.map.routeData[code];
@@ -270,4 +287,13 @@ export default {
 	.bottom-table-label-header{
 		background: #FFF3EE;
 	}
+	.bottom-table-route-wait {
+		background: #ff0;
+	}
+	.bottom-table-route-gray{
+		background: #4c4c4c;
+	}
+	.bottom-table-route-green{
+		background: #0f0;
+	}
 </style>
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index c4f724d80..8aec7a23c 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-if="isCtc" ref="menuBar" :dateStrin="dateString1" :selected="selected" />
-    <div v-if="isCtc" style="position: absolute; top: 35px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">
+    <div v-if="isCtc" style="font-size: 14px;padding: 0 10px;background: #DEE3F3;line-height: 30px;">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
+    <menu-bar v-if="isCtc" ref="menuBar" :date-strin="dateString1" :selected="selected" />
+    <div v-if="isCtc" style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">
       <div style="display: flex;">
         <img :src="ctcBarIcon1" class="img-box">
         <img :src="ctcBarIcon2" class="img-box">
diff --git a/src/jmapNew/theme/datie_02/menus/menuBar.vue b/src/jmapNew/theme/datie_02/menus/menuBar.vue
index 63a005296..327fa9fce 100644
--- a/src/jmapNew/theme/datie_02/menus/menuBar.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuBar.vue
@@ -1,6 +1,5 @@
 <template>
   <div id="menuBarChengdu3">
-    <div style="font-size: 14px;padding: 0 10px;background: #DEE3F3;">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
     <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
     <station-control-convert ref="stationControlConvert" />
     <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index df74761b7..28c7dd6e1 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -176,7 +176,7 @@
           highlight-current-row
           :row-style="{ background: '#ff0' }"
           height="180"
-          :default-sort="{prop: 'startTime', order: 'descending'}"
+          :default-sort="{prop: 'startTime', order: 'ascending'}"
           border
         >
           <el-table-column width="50" label="序号" align="center">
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index f46f140bb..ff44bda94 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -184,9 +184,9 @@ export default {
                     textStatus.style.top = this.offset - 15 + 'px';
                 }
                 if (this.$route.query.ctc) {
-                	this.offset = 35;
-                	this.offsetBottom = 2;
-				}
+                    this.offset = 65;
+                    this.offsetBottom = 2;
+                }
             });
         },
         // 缩放设置

From 37d984378ce864fd6306efbbe16bac6873310819 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 17 Jun 2022 11:30:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E9=93=81ctc=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/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index 8aec7a23c..e9251e84e 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <div v-if="isCtc" style="font-size: 14px;padding: 0 10px;background: #DEE3F3;line-height: 30px;">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
     <menu-bar v-if="isCtc" ref="menuBar" :date-strin="dateString1" :selected="selected" />
     <div v-if="isCtc" style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">
       <div style="display: flex;">
@@ -91,6 +90,7 @@ import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
 import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
 import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
 import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
+// <div v-if="isCtc" style="font-size: 14px;padding: 0 10px;background: #DEE3F3;line-height: 30px;">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
 
 export default {
     name: 'Menus',