Merge remote-tracking branch 'origin/master'

data-room-ui/packages/BigScreenDesign/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="!pageLoading"
+    v-if="(!pageLoading) && hasPermission"
     class="bs-page-design-wrap"
   >
     <PageTopSetting
@@ -103,6 +103,7 @@
       />
     </div>
   </div>
+  <NotPermission v-else-if="!hasPermission" />
 </template>
 <script>
 import SourceDialog from './SourceDialog/index.vue'
@@ -128,6 +129,7 @@ import { randomString } from '../js/utils'
 import { isFirefox } from 'packages/js/utils/userAgent'
 import { handleResData } from 'packages/js/store/actions.js'
 import { EventBus } from 'packages/js/utils/eventBus'
+import NotPermission from 'packages/NotPermission'
 export default {
   name: 'BigScreenDesign',
   components: {
@@ -139,7 +141,8 @@ export default {
     SettingPanel,
     SourceDialog,
     ComponentDialog,
-    iframeDialog
+    iframeDialog,
+    NotPermission
   },
   mixins: [multipleSelectMixin],
   props: {
@@ -158,6 +161,7 @@ export default {
   },
   data () {
     return {
+      hasPermission: true,
       rightVisiable: false,
       pageInfoVisiable: false,
       ruleStartX: 100,
@@ -215,22 +219,22 @@ export default {
       }
     }
   },
-  beforeRouteEnter (to, from, next) {
+  // beforeRouteEnter (to, from, next) {
-    // 判断进入设计页面前是否有访问权限
+  //   // 判断进入设计页面前是否有访问权限
-    const code = to.query.code
+  //   const code = to.query.code
-    get(`/bigScreen/permission/check/${code}`).then((res) => {
+  //   get(`/bigScreen/permission/check/${code}`).then((res) => {
-      if (res) {
+  //     if (res) {
-        next((vm) => {
+  //       next((vm) => {
-          // 重置大屏的vuex store
+  //         // 重置大屏的vuex store
-          vm.$store.commit('bigScreen/resetStoreData')
+  //         vm.$store.commit('bigScreen/resetStoreData')
-        })
+  //       })
-      } else {
+  //     } else {
-        next('/notPermission')
+  //       next('/notPermission')
-      }
+  //     }
-    })
+  //   })
-  },
+  // },
   created () {
-    this.init()
+    this.permission()
     /**
        * 以下是为了解决在火狐浏览器上推拽时弹出tab页到搜索问题
        * @param event
@@ -265,6 +269,15 @@ export default {
       'saveTimeLine',
       'changeIframeDialog'
     ]),
+    // 判断页面权限
+    permission () {
+      get(`/bigScreen/permission/check/${this.$route.query.code}`).then(res => {
+        this.hasPermission = !res
+        if (res) {
+          this.init()
+        }
+      })
+    },
     // 添加资源弹窗初始化
     initDialog () {
       this.$refs.SourceDialog.init()
@@ -482,13 +495,13 @@ export default {
             margin-right: 16px;
           }
 
-        ::v-deep .el-select {
+          /deep/ .el-select {
             width: 150px !important;
           }
         }
       }
 
-    ::v-deep .el-loading-mask {
+      /deep/ .el-loading-mask {
         background-color: transparent !important;
       }
     }

data-room-ui/packages/BigScreenRun/index.vue

@@ -5,6 +5,7 @@
     :style="previewWrapStyle"
   >
     <div
+      v-if="hasPermission"
       class="bs-render-wrap render-theme-wrap"
       :style="renderStyle"
     >
@@ -27,6 +28,7 @@
         />
       </div>
     </div>
+    <NotPermission v-else />
   </div>
 </template>
 <script>
@@ -36,10 +38,12 @@ import { mapActions, mapMutations, mapState } from 'vuex'
 import { getThemeConfig } from 'packages/js/api/bigScreenApi'
 import { compile } from 'tiny-sass-compiler/dist/tiny-sass-compiler.esm-browser.prod.js'
 import { G2 } from '@antv/g2plot'
+import NotPermission from 'packages/NotPermission'
 export default {
   name: 'BigScreenRun',
   components: {
-    RenderCard
+    RenderCard,
+    NotPermission
   },
   props: {
     config: {
@@ -55,7 +59,8 @@ export default {
     return {
       innerHeight: window.innerHeight,
       innerWidth: window.innerWidth,
-      timer: null
+      timer: null,
+      hasPermission: true
     }
   },
   computed: {
@@ -136,27 +141,27 @@ export default {
       }
     }
   },
-  beforeRouteEnter (to, from, next) {
+  // beforeRouteEnter (to, from, next) {
-    // 判断进入预览页面前是否有访问权限
+  //   // 判断进入预览页面前是否有访问权限
-    const code = to.query.code
+  //   const code = to.query.code
-    get(`/bigScreen/permission/check/${code}`).then(res => {
+  //   get(`/bigScreen/permission/check/${code}`).then(res => {
-      if (res) {
+  //     if (res) {
-        next(vm => {
+  //       next(vm => {
-          // 重置大屏的vuex store
+  //         // 重置大屏的vuex store
-          vm.$store.commit('bigScreen/resetStoreData')
+  //         vm.$store.commit('bigScreen/resetStoreData')
-        })
+  //       })
-      } else {
+  //     } else {
-        next('/notPermission')
+  //       next('/notPermission')
-      }
+  //     }
-    })
+  //   })
-  },
+  // },
   beforeRouteLeave (to, from, next) {
     // 离开的时候 重置大屏的vuex store
     this.$store.commit('bigScreen/resetStoreData')
     next()
   },
   created () {
-    this.init()
+    this.permission()
     this.getParentWH()
     this.windowSize()
   },
@@ -178,6 +183,14 @@ export default {
       'changePageConfig',
       'changeChartConfig'
     ]),
+    permission () {
+      get(`/bigScreen/permission/check/${this.pageCode}`).then(res => {
+        this.hasPermission = res
+        if (res) {
+          this.init()
+        }
+      })
+    },
     init () {
       if (!this.pageCode) { return }
       this.changePageLoading(true)