From ebd90d24859c53b860eb52f2a77be979512549e3 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 1 Apr 2020 15:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=A1=B9=E7=9B=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4&elementUI=E5=8D=87=E7=89=88=E6=9C=AC=E8=87=B32.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 public/index.html                             |  6 ++--
 src/jmapNew/config/skinCode/chengdu_03.js     |  4 +--
 .../chengdu_03/menus/dialog/routeDetail.vue   | 35 ++++++++++---------
 .../theme/chengdu_03/planSchedule/index.vue   |  1 +
 src/views/newMap/displayNew/menuTrainList.vue |  7 ++--
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index fae095787..9d86044e8 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "axios": "0.18.0",
     "echarts": "^4.7.0",
-    "element-ui": "^2.7.2",
+    "element-ui": "^2.12.0",
     "file-saver": "^1.3.3",
     "js-cookie": "2.2.0",
     "js-md5": "^0.7.3",
diff --git a/public/index.html b/public/index.html
index 032c92604..2f384b84c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -18,9 +18,9 @@
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/vuex/3.1.0/vuex.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.1.2/vue-router.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.js"></script>
-	  <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/index.js"></script>
-	  <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/locale/en.min.js"></script>
-	  <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/locale/zh-CN.min.js"></script>
+	  <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/index.js"></script>
+	  <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/en.min.js"></script>
+	  <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/zh-CN.min.js"></script>
 	  <% } %>
     <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.4.0/sockjs.min.js"></script>-->
   </head>
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 64d5aefae..c1bec15a9 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -240,8 +240,8 @@ class SkinCode extends defaultStyle {
                 fontWeight: 'normal'
             },
             stopTime: { 									// 停站时间
-                offset: {x: -8, y: -4}, 					// 运行时间偏移量
-                textColor: '#C0C0C0', 						// 停站时间字体颜色
+                offset: {x: -50, y: 10}, 					// 运行时间偏移量
+                textColor: '#FFFFFF', 						// 停站时间字体颜色
                 textFontSize: 10
             },
             jump: {
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
index 89a553807..0d2540d23 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
@@ -32,32 +32,32 @@
           :height="140"
         >
 
-            <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
+          <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
             <template slot-scope="scope">
-                    <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                        {{ handleRouteName(scope.row.name) }}
-                    </div>
+              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
+                {{ handleRouteName(scope.row.name) }}
+              </div>
             </template>
           </el-table-column>
-            <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
+          <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
             <template slot-scope="scope">
-                    <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                        {{ handleDirection(scope.row.startSignalCode) }}
-                    </div>
+              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
+                {{ handleDirection(scope.row.startSignalCode) }}
+              </div>
             </template>
           </el-table-column>
-            <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
+          <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
             <template slot-scope="scope">
-                    <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                        {{ scope.row.turnBack ? '折返': '直通' }}
-                    </div>
+              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
+                {{ scope.row.turnBack ? '折返': '直通' }}
+              </div>
             </template>
           </el-table-column>
-            <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
+          <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
             <template slot-scope="scope">
-                    <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                        {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-                    </div>
+              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
+                {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -93,7 +93,8 @@ export default {
             selected: null,
             tempData: [],
             stationName: '',
-            signalName: ''
+            signalName: '',
+            domIdChoose: ''
         };
     },
     computed: {
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue b/src/jmapNew/theme/chengdu_03/planSchedule/index.vue
index 696eed1e0..83cd8f1e3 100644
--- a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue
+++ b/src/jmapNew/theme/chengdu_03/planSchedule/index.vue
@@ -51,6 +51,7 @@ export default {
     },
     data() {
         return {
+            lineCode: ''
         };
     },
     computed: {
diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue
index 54c282ba1..30c5769a9 100644
--- a/src/views/newMap/displayNew/menuTrainList.vue
+++ b/src/views/newMap/displayNew/menuTrainList.vue
@@ -12,11 +12,10 @@
         />
       </div>
     </div>
-    <el-drawer
+    <div
       v-show="drawer"
-      direction="rtl"
       :show-close="false"
-      size="50%"
+      style="height: 100%;"
     >
       <div class="menuTrainList">
         <el-table :data="trainList" height="100%" :highlight-current-row="true" @row-click="selectTrain">
@@ -26,7 +25,7 @@
           <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
         </el-table>
       </div>
-    </el-drawer>
+    </div>
   </div>
 </template>
 <script>