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() - }, + } } 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 @@