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

src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height: 35px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
+  <div id="menuButtons_box" class="menu menuButton" style="height: 35px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button :id="Signal.arrangementRoute.button.domId" class="button_box" @click="buttonDown(Signal.arrangementRoute.button.operation, ['Signal','SignalButton'])">
       <span :style="{ color: operation === Signal.arrangementRoute.button.operation ? '#ccc':'black'}">
         <center><b>进</b><b>路</b></center>
@@ -217,9 +217,6 @@ export default {
         Command() {
             return OperationEvent.Command;
         },
-        isShowBtn() {
-            return this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '10';
-        },
         CMD() {
             return CMD;
         },

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

@@ -137,17 +137,9 @@ export default {
             }
         });
         this.standCode = this.standList[0].code;
+        this.initData(this.group, this.standCode);
     },
     methods: {
-        doShow(selected) {
-            this.dialogShow = true;
-            this.$nextTick(function() {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-            this.standCode = selected.code;
-            this.initData(this.group, selected.code);
-        },
-
         initData(group, standCode) {
             getPslStatus(group, standCode)
                 .then(resp => {