Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

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>
@@ -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';
@@ -370,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(() => {

src/views/newMap/jointTrainingNew/menuSchema.vue

@@ -253,7 +253,7 @@ export default {
 </script>
 <style>
     .schema {
-        z-index: 8;
+        z-index: 18;
         display: inline;
         position: absolute;
         right: 5px;