Merge branch 'master' of http://49.232.154.205:10100/DeXun/fad-dashboard

- 恢复文件URL路径前自动添加斜杠的功能
- 临时注释掉大屏设计和运行页面的权限检查逻辑
- 临时注释掉画布背景颜色的动态设置

backend/swiot-admin/src/main/resources/application-dev.yml

@@ -9,9 +9,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://49.232.154.205:13306/dashboard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/dashboard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Root@12345
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

frontend/packages/BigScreenDesign/index.vue

@@ -261,12 +261,12 @@ export default {
     },
     // 判断页面权限
     permission() {
-      this.$dataRoomAxios.get(`/bigScreen/permission/check/${this.pageCode}`).then(res => {
+      // this.$dataRoomAxios.get(`/bigScreen/permission/check/${this.pageCode}`).then(res => {
         this.hasPermission = res
-        if (res) {
+        // if (res) {
           this.init()
-        }
+        // }
-      })
+      // })
     },
     // 添加资源弹窗初始化
     initDialog() {

frontend/packages/BigScreenRun/index.vue

@@ -76,7 +76,7 @@ export default {
     // 画布样式
     canvasStyle() {
       return {
-        backgroundColor: this.fitPageConfig.customTheme === 'light' ? this.fitPageConfig.lightBgColor : this.fitPageConfig.bgColor,
+        // backgroundColor: this.fitPageConfig.customTheme === 'light' ? this.fitPageConfig.lightBgColor : this.fitPageConfig.bgColor,
         transform: `scale(${this.scale}) translate(${this.translateX}px, ${this.translateY}px)`,
         transformOrigin: '0 0'
       };
@@ -279,12 +279,12 @@ export default {
       })
     },
     permission() {
-      this.$dataRoomAxios.get(`/bigScreen/permission/check/${this.pageCode}`).then(res => {
+      // this.$dataRoomAxios.get(`/bigScreen/permission/check/${this.pageCode}`).then(res => {
-        this.hasPermission = res
+        this.hasPermission = true
-        if (res) {
+        // if (res) {
           this.init()
-        }
+        // }
-      })
+      // })
     },
     init() {
       if (!this.pageCode) { return }

frontend/packages/js/utils/file.js

@@ -8,9 +8,9 @@ function getFileUrl(url){
     return url
   }
   // 如果没有以/开头的加上/
-  // if (!/^\//.test(url)) {
+  if (!/^\//.test(url)) {
-  //   url = `/${url}`
+    url = `/${url}`
-  // }
+  }
   // return `${window.BS_CONFIG?.httpConfigs?.fileUrlPrefix}${url}`
   return `http://49.232.154.205:10900${url}`
 }