Merge branch 'shenzhen-dev' into dev-cjw

src/components/header.vue

@@ -77,7 +77,7 @@
         企业大屏
       </p>
       <!-- 横琴大屏使用龙光大屏样式 -->
-      <p v-show="$route.path.indexOf('firm/') != -1" class="header-btn" @click="toOverview4()">
+      <p v-show="$route.path.indexOf('firm/') != -1 && $store.state.userInfo.companyBigScreen == 0" class="header-btn" @click="toOverview4()">
         <img src="@/assets/images/icon-bigData.png" alt srcset />
         综合监管大屏
       </p>