Merge branch 'develop' of http://23.33.3.13:30000/efc/main-web into develop

src/layouts/components/Header.vue

@@ -1,6 +1,6 @@
 /** * Created by HaijunZhang on 2019/12/18. */
 <template>
-  <a-layout-header class="common-header" :style="style">
+  <a-layout-header class="common-header" :style="style" v-if="$route.name !== 'Designer'">
     <div class="header-logo">
       <img :src="pageConfigs.headerLogo" alt="" class="pull-left" />
     </div>
@@ -26,7 +26,7 @@ export default defineComponent({
     RightContent,
     Divider,
     HeaderMenu,
-    HomeOutlined,
+    HomeOutlined
   },
   setup() {
     const store = useStore()
@@ -34,14 +34,14 @@ export default defineComponent({
     const style = computed(() => {
       return {
         backgroundColor: pageConfigs.value.headerBgColour,
-        color: pageConfigs.value.headerFontColour,
+        color: pageConfigs.value.headerFontColour
       }
     })
     return {
       pageConfigs,
-      style,
+      style
+    }
   }
-  },
 })
 </script>
 

src/layouts/components/TagsView/index.vue

@@ -74,7 +74,7 @@ export default {
     }
     // 是否隐藏
     const isShow = () => {
-      return !['/sms-web/resource_dashboard', '/screen/list', '/redirect'].includes(route.path)
+      return !['/sms-web/resource_dashboard', '/screen/list', '/redirect', '/report/designer'].includes(route.path)
     }
     const getFixTags = (routes) => {
       const tags = []