From 3f7d5da3b12a0c1e1af89bd62465346a1651fbeb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 16 Dec 2020 09:40:37 +0800
Subject: [PATCH 1/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

---
 src/views/newMap/jointTrainingNew/menuSchema.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index e6fa48239..2dd393a14 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -244,7 +244,7 @@ export default {
 </script>
 <style>
     .schema {
-        z-index: 8;
+        z-index: 18;
         display: inline;
         position: absolute;
         right: 5px;

From 0a5eb83904dc649af95a48ac23965f2847af5a0d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 16 Dec 2020 09:41:53 +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

---
 src/views/newMap/displayNew/practiceDisplay.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue
index 6352155f6..5e0d45ae8 100644
--- a/src/views/newMap/displayNew/practiceDisplay.vue
+++ b/src/views/newMap/displayNew/practiceDisplay.vue
@@ -178,6 +178,7 @@ export default {
         },
         '$store.state.socket.standPfiNum':function(val) {
             if (val) {
+                console.log(val, 'standPfiNum');
                 const stationNumList = val;
                 stationNumList.forEach(stationNum=>{
                     stationNum.deviceType = 'STAND';
@@ -188,6 +189,7 @@ export default {
         },
         '$store.state.socket.trainPfiNum':function(val) {
             if (val) {
+                console.log(val, 'trainPfiNum');
                 const trainNumList = this.$store.state.socket.trainPfiNum;
                 trainNumList.forEach(stationNum=>{
                     stationNum.deviceType = 'TRAIN';

From 1715dcad32e3e26b3bcba121263d35e6583d4451 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 16 Dec 2020 10:18:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E5=A4=A7=20=E5=AE=A2?=
 =?UTF-8?q?=E6=B5=81=E6=95=B0=E6=8D=AE=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/views/newMap/displayNew/practiceDisplay.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue
index 4a0cfcb0f..1ee2bc248 100644
--- a/src/views/newMap/displayNew/practiceDisplay.vue
+++ b/src/views/newMap/displayNew/practiceDisplay.vue
@@ -62,7 +62,7 @@
     <el-dialog
       title="切换客流数据"
       :visible.sync="flowDataShow"
-      top="50px"
+      top="150px"
       width="400px"
       :before-do-close="flowDataClose"
       :close-on-click-modal="false"
@@ -75,7 +75,7 @@
               <el-option
                 v-for="item in flowDataList"
                 :key="item.id"
-                :label="item.name"
+                :label="item.name==currentFlowDataName?item.name+' [运行中]':item.name"
                 :value="item.id"
               />
             </el-select>
@@ -372,6 +372,8 @@ export default {
         },
         changeFlowData() {
             this.flowDataShow = true;
+            const currentFlowData = this.flowDataList.find(each=>{ return each.name == this.currentFlowDataName; });
+            if (currentFlowData) { this.currentFlowDataId = currentFlowData.id; }
         },
         end() {
             exitRunPlan(this.group).then(() => {