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

src/jmapNew/theme/xian_02/menus/menuSignal.vue

@@ -225,9 +225,9 @@ export default {
         '$store.state.menuOperation.leftClickCount': function (val) {
             // const control = MenuContextHandler.getStationControl(this.selected);
             // const centralStation = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
-            const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
-            if (this.selected._type === 'Signal' && status) {
-                this.arrangementRoute();
+            if (this.selected._type === 'Signal') {
+                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                status && this.arrangementRoute();
             }
         }
     },

src/views/newMap/display/terminals/index.vue

@@ -164,8 +164,6 @@ export default {
                     this.setCentralizedStationList(map); // 获取集中站列表
                     if (this.$route.query.client) {
                         this.pictureChange(this.$route.query.client);
-                    } else if (!this.$store.state.training.roles) {
-                        this.pictureChange('dispatchWork');
                     }
                 }
             } catch (error) {

src/views/newMap/display/terminals/terminalMenu.vue

@@ -236,6 +236,11 @@ export default {
                 }
             }
         },
+        '$store.state.training.memberList': function (val) {
+            if (!this.$store.state.training.roles) {
+                this.changePictureShow('dispatchWork');
+            }
+        },
         '$store.state.socket.simulationWorkParam': function (val) {
             if (val) {
                 this.itemMap = val.itemMap || {};

src/views/newMap/display/trainingList/trainingMenu.vue

@@ -227,7 +227,7 @@ export default {
 	position: absolute;
 	bottom: 0;
 	left: 15px;
-	z-index: 10;
+	z-index: 40;
 }
 
 .elem-span{

src/views/newMap/display/trainingList/trainingTip.vue

@@ -80,7 +80,7 @@ export default {
 	color: #000;
 	line-height: 180%;
 	// z-index: 1501;
-	z-index: 35;
+	z-index: 39;
 	font-size: 14px;
 }
 </style>