From 38d01b37fd49144b36c7035608a06efb503bf082 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 12 Aug 2022 11:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A7=E5=8D=8E=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiDvRender.vue                        |  6 +++---
 components/AiMonitor/dhVideo.vue                 | 16 ++++++----------
 components/layout/AiDvWrapper/AiDvWrapper.vue    |  5 ++---
 .../bigscreen/designer/components/preview.vue    |  4 +++-
 packages/bigscreen/viewer/AppGigscreenViewer.vue |  2 ++
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index b07307e8..a3a95906 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -37,9 +37,9 @@ import {mapState} from 'vuex'
 import AiSwiper from './AiSwiper.vue'
 import chartList from './AiEchart/echartTpls'
 import AiMonitor from "./AiMonitor/AiMonitor";
-import AiDvPanel from "../layout/AiDvPanel/AiDvPanel";
-import AiDvDisplay from "../layout/AiDvDisplay/AiDvDisplay";
-import AiDvSummary from "../layout/AiDvSummary/AiDvSummary";
+import AiDvPanel from "./layout/AiDvPanel/AiDvPanel";
+import AiDvDisplay from "./layout/AiDvDisplay/AiDvDisplay";
+import AiDvSummary from "./layout/AiDvSummary/AiDvSummary";
 import AiSprite from "./AiSprite";
 
 
diff --git a/components/AiMonitor/dhVideo.vue b/components/AiMonitor/dhVideo.vue
index 26a287c2..fe17500b 100644
--- a/components/AiMonitor/dhVideo.vue
+++ b/components/AiMonitor/dhVideo.vue
@@ -21,13 +21,12 @@ export default {
       const promise = url => new Promise(resolve => this.$injectLib(url, () => resolve())),
           promiseCss = url => new Promise(resolve => this.$injectCss(url, () => resolve()))
       return Promise.all([
-        promiseCss("//cdn.cunwuyun.cn/videojs/video-js.min.css"),
-        promise("//cdn.cunwuyun.cn/videojs/video.min.js"),
-        promise("//cdn.cunwuyun.cn/videojs/videojs-contrib-hls.js"),
-      ])
+        promiseCss("https://cdn.cunwuyun.cn/videojs/video-js.min.css"),
+        promise("https://cdn.cunwuyun.cn/videojs/video.min.js"),
+      ]).then(() => promise("https://cdn.cunwuyun.cn/videojs/videojs-contrib-hls.js"))
     },
     initVideoJs(count = 0) {
-      if (!!videojs) {
+      if (!!window.videojs) {
         videojs(this.id, {
           autoplay: true
         }, function () {
@@ -42,16 +41,13 @@ export default {
     src: {
       handler(val) {
         if (val) {
-          this.initVideoJs()
+          this.loadLib().then(() => this.initVideoJs())
         }
       },
       immediate: true,
       deep: true
     }
-  },
-  created() {
-    this.loadLib()
-  },
+  }
 }
 </script>
 
diff --git a/components/layout/AiDvWrapper/AiDvWrapper.vue b/components/layout/AiDvWrapper/AiDvWrapper.vue
index ecba7876..3472d520 100644
--- a/components/layout/AiDvWrapper/AiDvWrapper.vue
+++ b/components/layout/AiDvWrapper/AiDvWrapper.vue
@@ -57,7 +57,7 @@
 import {fullScreenContainer} from '@jiaminghi/data-view'
 import Vue from "vue";
 import RightTopBorder from "./rightTopBorder";
-import AiSprite from "../../components/AiSprite";
+import AiSprite from "../../AiSprite";
 
 Vue.use(fullScreenContainer)
 
@@ -182,8 +182,7 @@ export default {
   font-family: DIN;
   src: url("assets/D-DINExp.otf");
 }
-
-@import url('../../lib/animation.scss');
+@import "components/animation";
 .AiDvWrapper {
   .viewPanel {
     display: flex;
diff --git a/packages/bigscreen/designer/components/preview.vue b/packages/bigscreen/designer/components/preview.vue
index 83547203..94c3504a 100644
--- a/packages/bigscreen/designer/components/preview.vue
+++ b/packages/bigscreen/designer/components/preview.vue
@@ -13,10 +13,12 @@
 
 <script>
 import AppGigscreenViewer from "../../viewer/AppGigscreenViewer";
+import AiDvWrapper from "../../../../components/layout/AiDvWrapper/AiDvWrapper";
+import AiDvBackground from "../../../../components/layout/AiDvBackground";
 
 export default {
   name: "preview",
-  components: {AppGigscreenViewer},
+  components: {AiDvBackground, AiDvWrapper, AppGigscreenViewer},
   props: {
     instance: Function,
     dict: Object,
diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index 48e0d151..c6c26f5a 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -23,8 +23,10 @@
 
 <script>
 
+import AiDvRender from "../../../components/AiDvRender";
 export default {
   name: 'AppGigscreenViewer',
+  components: {AiDvRender},
   label: '大屏预览',
   props: {
     instance: Function,