From a0c2bf8f67ba3f4918abc48310ef4b9257528298 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 5 May 2022 18:00:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../bigscreen/designer/components/Add.vue | 13 ++++ .../bigscreen/designer/components/Layout.vue | 8 +- .../bigscreen/viewer/AppGigscreenViewer.vue | 3 +- project/dvui/layout/AiDvPanel/AiDvPanel.vue | 3 +- project/dvui/layout/AiDvPanel/asset/dq.svg | 1 + project/dvui/layout/AiDvPanel/asset/gz.svg | 1 + .../dvui/layout/AiDvPanel/borders/border5.vue | 78 +++++++++++++++++++ 8 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 project/dvui/layout/AiDvPanel/asset/dq.svg create mode 100644 project/dvui/layout/AiDvPanel/asset/gz.svg create mode 100644 project/dvui/layout/AiDvPanel/borders/border5.vue diff --git a/package.json b/package.json index 161087b4..3ebb719c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "bin-code-editor": "^0.9.0", "dayjs": "^1.8.35", "dvcp-dv": "^1.0.0", - "dvcp-dv-ui": "^2.0.1", + "dvcp-dv-ui": "file:project/dvui", "dvcp-ui": "^1.42.2", "echarts": "^5.1.2", "mp4box": "^0.4.1", diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue index 9a267dd3..8816e424 100644 --- a/packages/bigscreen/designer/components/Add.vue +++ b/packages/bigscreen/designer/components/Add.vue @@ -64,6 +64,11 @@ @close="isShowLayout = false"> + + @@ -137,6 +142,9 @@ export default { rules: { dv: [{required: true, message: "请选择 定制大屏"}], title: [{required: true, message: "请输入 大屏标题"}], + }, + config: { + backgroundImage: [] } } }, @@ -193,6 +201,11 @@ export default { }, toViewer(id) { + this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => { + if (res.data) { + this.config = JSON.parse(res.data.config).dashboard + } + }) this.screenId = id }, diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue index 03ddd261..f7df281b 100644 --- a/packages/bigscreen/designer/components/Layout.vue +++ b/packages/bigscreen/designer/components/Layout.vue @@ -64,8 +64,8 @@
+ v-if="dashboard.backgroundImage.length || dashboard.theme === '1'" + :src="dashboard.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : dashboard.backgroundImage[0].url"> -1) { - this.$refs[`chart${index}`][0].watchResize() + // this.$refs[`chart${index}`][0].watchResize() } }, diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue index 6e26e49e..dc0f1c35 100644 --- a/packages/bigscreen/viewer/AppGigscreenViewer.vue +++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue @@ -14,7 +14,7 @@ }" v-for="(item, index) in componentList" :key="index"> - +
@@ -56,6 +56,7 @@ export default { width: 1920, height: 1080, backgroundColor: '', + theme: '0', backgroundImage: [] }, componentList: [], diff --git a/project/dvui/layout/AiDvPanel/AiDvPanel.vue b/project/dvui/layout/AiDvPanel/AiDvPanel.vue index 77386e08..ec9f3eac 100644 --- a/project/dvui/layout/AiDvPanel/AiDvPanel.vue +++ b/project/dvui/layout/AiDvPanel/AiDvPanel.vue @@ -16,10 +16,11 @@ import Border0 from "./borders/border0"; import Border2 from "./borders/border2"; import Border3 from "./borders/border3"; import Border4 from "./borders/border4"; +import Border5 from "./borders/border5"; export default { name: "AiDvPanel", - components: { Border0, Border1, Border2, Border3, Border4 }, + components: { Border0, Border1, Border2, Border3, Border4, Border5 }, props: { title: {default: "请传入标题"}, border: {default: "border0"} diff --git a/project/dvui/layout/AiDvPanel/asset/dq.svg b/project/dvui/layout/AiDvPanel/asset/dq.svg new file mode 100644 index 00000000..e99ced04 --- /dev/null +++ b/project/dvui/layout/AiDvPanel/asset/dq.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/project/dvui/layout/AiDvPanel/asset/gz.svg b/project/dvui/layout/AiDvPanel/asset/gz.svg new file mode 100644 index 00000000..2ad812db --- /dev/null +++ b/project/dvui/layout/AiDvPanel/asset/gz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/project/dvui/layout/AiDvPanel/borders/border5.vue b/project/dvui/layout/AiDvPanel/borders/border5.vue new file mode 100644 index 00000000..6bdfeea1 --- /dev/null +++ b/project/dvui/layout/AiDvPanel/borders/border5.vue @@ -0,0 +1,78 @@ + + + + +