menu-bar显示条件调整

src/jmapNew/theme/beijing_01/menus/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
     <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
     <menu-button ref="menuButton" />
     <menu-station-control ref="menuStationControl" :selected="selected" />
@@ -15,7 +14,6 @@
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" />
     <passive-Timeout ref="passiveTimeout" />
-    </template>
   </div>
 </template>
 
@@ -66,13 +64,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode !== 'dp' &&
-                    this.$route.params.mode !== 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

src/jmapNew/theme/chengdu_01/menus/index.vue

@@ -1,10 +1,7 @@
 <template>
   <div class="chengdou-01__menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
+    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-      <template v-show="isShowBar">
-        <menu-bar ref="menuBar" :selected="selected" />
-      </template>
     <menu-request ref="menuRequest" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" />
@@ -16,7 +13,6 @@
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" />
     <passive-Timeout ref="passiveTimeout" />
-    </template>
   </div>
 </template>
 
@@ -65,13 +61,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode !== 'dp' &&
-                    this.$route.params.mode !== 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

src/jmapNew/theme/chengdu_03/menus/index.vue

@@ -1,10 +1,7 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
+    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-      <template v-show="isShowBar">
-        <menu-bar ref="menuBar" :selected="selected" />
-      </template>
     <menu-button ref="menuButton" />
     <menu-station-control ref="menuStationControl" :selected="selected" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
@@ -16,7 +13,6 @@
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" />
     <passive-Timeout ref="passiveTimeout" />
-    </template>
   </div>
 </template>
 
@@ -65,13 +61,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode !== 'dp' &&
-                    this.$route.params.mode !== 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

src/jmapNew/theme/foshan_01/menus/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
     <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
     <menu-button ref="menuButton" />
     <menu-axle-reset ref="menuAxleReset" :selected="selected" />
@@ -17,7 +16,6 @@
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" />
     <passive-Timeout ref="passiveTimeout" />
-    </template>
   </div>
 </template>
 
@@ -72,13 +70,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode !== 'dp' &&
-                    this.$route.params.mode !== 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

src/jmapNew/theme/fuzhou_01/menus/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
     <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" />
@@ -12,7 +11,6 @@
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" />
     <passive-Timeout ref="passiveTimeout" />
-    </template>
   </div>
 </template>
 
@@ -57,13 +55,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode != 'dp' &&
-                    this.$route.params.mode != 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

src/jmapNew/theme/haerbin_01/menus/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
     <menu-bar v-if="isShowBar" ref="menuBar" :selected="selected" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" />
@@ -13,7 +12,6 @@
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" />
     <passive-Timeout ref="passiveTimeout" />
-    </template>
   </div>
 </template>
 
@@ -60,13 +58,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode != 'dp' &&
-                    this.$route.params.mode != 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType === '01';
+            return this.$store.state.training.prdType === '01' && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

src/jmapNew/theme/ningbo_01/menus/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
     <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
     <menu-axle-reset ref="menuAxleReset" :selected="selected" />
     <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" />
@@ -17,7 +16,6 @@
     <!--<passive-alarm ref="passiveAlarm" />-->
     <passive-contorl ref="passiveControl" />
     <!--<passive-Timeout ref="passiveTimeout" />-->
-    </template>
   </div>
 </template>
 
@@ -70,13 +68,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode !== 'dp' &&
-                    this.$route.params.mode !== 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

src/jmapNew/theme/xian_01/menus/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
     <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" />
@@ -13,7 +12,6 @@
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" />
     <passive-Timeout ref="passiveTimeout" />
-    </template>
   </div>
 </template>
 
@@ -60,13 +58,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode != 'dp' &&
-                    this.$route.params.mode != 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {

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

@@ -1,7 +1,6 @@
 <template>
   <div class="xian-02__menus" :style="{width: width + 'px'}">
     <menu-cancel ref="menuCancel" />
-    <template v-show="isShowAll">
     <!-- <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" /> -->
     <menu-axle-reset ref="menuAxleReset" :selected="selected" />
     <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" />
@@ -16,7 +15,6 @@
     <menu-request ref="menuRequest" />
     <menu-station-stand ref="menuStationStand" :selected="selected" @popMenuStationStand="popMenuStationStand" @totalMenuEvent="totalMenuEvent" />
     <pop-station-stand ref="popStationStand" :selected="selected" @closeMenuStationStand="closeMenuStationStand" />
-    </template>
   </div>
 </template>
 
@@ -73,13 +71,8 @@ export default {
         ...mapGetters('config', [
             'width'
         ]),
-        isShowAll() {
-            return this.$route.params.mode !== 'dp' &&
-                    this.$route.params.mode !== 'plan' &&
-                    this.$store.state.training.roles != 'BigScreen';
-        },
         isShowBar() {
-            return this.$store.state.training.prdType;
+            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
         }
     },
     watch: {