From 1d2619cd284be3c5205586b4fea2d186a07ad353 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 10 Jun 2020 17:58:20 +0800
Subject: [PATCH] =?UTF-8?q?menu-bar=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/theme/beijing_01/menus/index.vue | 35 +++++++-----------
src/jmapNew/theme/chengdu_01/menus/index.vue | 35 +++++++-----------
src/jmapNew/theme/chengdu_03/menus/index.vue | 35 +++++++-----------
src/jmapNew/theme/foshan_01/menus/index.vue | 39 ++++++++------------
src/jmapNew/theme/fuzhou_01/menus/index.vue | 29 ++++++---------
src/jmapNew/theme/haerbin_01/menus/index.vue | 31 ++++++----------
src/jmapNew/theme/ningbo_01/menus/index.vue | 39 ++++++++------------
src/jmapNew/theme/xian_01/menus/index.vue | 31 ++++++----------
src/jmapNew/theme/xian_02/menus/index.vue | 37 ++++++++-----------
9 files changed, 122 insertions(+), 189 deletions(-)
diff --git a/src/jmapNew/theme/beijing_01/menus/index.vue b/src/jmapNew/theme/beijing_01/menus/index.vue
index 8a313e111..6b234ebdc 100644
--- a/src/jmapNew/theme/beijing_01/menus/index.vue
+++ b/src/jmapNew/theme/beijing_01/menus/index.vue
@@ -1,21 +1,19 @@
@@ -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: {
diff --git a/src/jmapNew/theme/chengdu_01/menus/index.vue b/src/jmapNew/theme/chengdu_01/menus/index.vue
index 117cb64f3..fbc39598b 100644
--- a/src/jmapNew/theme/chengdu_01/menus/index.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/index.vue
@@ -1,22 +1,18 @@
@@ -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: {
diff --git a/src/jmapNew/theme/chengdu_03/menus/index.vue b/src/jmapNew/theme/chengdu_03/menus/index.vue
index 6c8937b5d..a8d3e5806 100644
--- a/src/jmapNew/theme/chengdu_03/menus/index.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/index.vue
@@ -1,22 +1,18 @@
@@ -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: {
diff --git a/src/jmapNew/theme/foshan_01/menus/index.vue b/src/jmapNew/theme/foshan_01/menus/index.vue
index 3b3967036..06478c1af 100644
--- a/src/jmapNew/theme/foshan_01/menus/index.vue
+++ b/src/jmapNew/theme/foshan_01/menus/index.vue
@@ -1,23 +1,21 @@
@@ -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: {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/index.vue b/src/jmapNew/theme/fuzhou_01/menus/index.vue
index 0dfd8757e..c10277c9d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/index.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/index.vue
@@ -1,18 +1,16 @@
@@ -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: {
diff --git a/src/jmapNew/theme/haerbin_01/menus/index.vue b/src/jmapNew/theme/haerbin_01/menus/index.vue
index 3d3b07418..102cc6635 100644
--- a/src/jmapNew/theme/haerbin_01/menus/index.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/index.vue
@@ -1,19 +1,17 @@
@@ -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: {
diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue
index ab18734c5..3c4435b52 100644
--- a/src/jmapNew/theme/ningbo_01/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/index.vue
@@ -1,23 +1,21 @@
@@ -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: {
diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue
index cf4f9b0cc..552409d38 100644
--- a/src/jmapNew/theme/xian_01/menus/index.vue
+++ b/src/jmapNew/theme/xian_01/menus/index.vue
@@ -1,19 +1,17 @@
@@ -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: {
diff --git a/src/jmapNew/theme/xian_02/menus/index.vue b/src/jmapNew/theme/xian_02/menus/index.vue
index 2eb3607ae..73a00571a 100644
--- a/src/jmapNew/theme/xian_02/menus/index.vue
+++ b/src/jmapNew/theme/xian_02/menus/index.vue
@@ -1,22 +1,20 @@
@@ -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: {