diff --git a/package.json b/package.json
index a15e925..af41e7a 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
},
"dependencies": {
"@ckeditor/ckeditor5-build-decoupled-document": "^23.1.0",
+ "@jiaminghi/data-view": "^2.10.0",
"@smallwei/avue": "^2.8.23",
"axios": "0.18.0",
"chokidar": "^3.5.2",
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/div/widget-border-box.js b/src/views/bigscreenDesigner/designer/tools/configure/div/widget-border-box.js
new file mode 100644
index 0000000..b7bd751
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/tools/configure/div/widget-border-box.js
@@ -0,0 +1,139 @@
+/*
+ * @Descripttion: DIV图层次
+ */
+export const widgetBorderBox = {
+ code: 'widget-border-box',
+ type: 'html',
+ tabName: '图层',
+ label: '边框(一)',
+ icon: 'icontupian1',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '边框',
+ },
+ {
+ type: 'el-select',
+ label: '边框类型',
+ name: 'divType',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ {code: 'dv-border-Box-1', name: '边框1'},
+ {code: 'dv-border-Box-2', name: '边框2'},
+ {code: 'dv-border-Box-3', name: '边框3'},
+ {code: 'dv-border-Box-4', name: '边框4'},
+ {code: 'dv-border-Box-5', name: '边框5'},
+ {code: 'dv-border-Box-6', name: '边框6'},
+ {code: 'dv-border-Box-7', name: '边框7'},
+ {code: 'dv-border-Box-8', name: '边框8'},
+ {code: 'dv-border-Box-9', name: '边框9'},
+ {code: 'dv-border-Box-10', name: '边框10'},
+ {code: 'dv-border-Box-11', name: '边框11'},
+ {code: 'dv-border-Box-12', name: '边框12'},
+ {code: 'dv-border-Box-13', name: '边框13'},
+ ],
+ value: 'dv-border-Box-1'
+ },
+ {
+ type: 'vue-color',
+ label: '颜色(主)',
+ name: 'colorOne',
+ required: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'vue-color',
+ label: '颜色(次)',
+ name: 'colorTwo',
+ required: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'vue-color',
+ label: '背景色',
+ name: 'backgroundColor',
+ required: false,
+ placeholder: '',
+ value: 'rgba(255, 0, 0, 0)',
+ },
+ {
+ type: 'el-input-number',
+ label: '单次动画时间长',
+ name: 'dur',
+ required: false,
+ placeholder: '',
+ value: 3,
+ },
+ {
+ type: 'el-switch',
+ label: '反向',
+ name: 'reverse',
+ require: false,
+ placeholder: '',
+ value: false,
+ },
+ {
+ type: 'el-input-text',
+ label: '标题',
+ name: 'title',
+ require: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'el-input-number',
+ label: '标题宽度',
+ name: 'titleWidth',
+ require: false,
+ placeholder: '',
+ value: 250,
+ }
+ ],
+ // 数据
+ data: [],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 1000,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 600,
+ },
+ ],
+ }
+}
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/div/widget-div.js b/src/views/bigscreenDesigner/designer/tools/configure/div/widget-div.js
index 917ac2d..90ea4c1 100644
--- a/src/views/bigscreenDesigner/designer/tools/configure/div/widget-div.js
+++ b/src/views/bigscreenDesigner/designer/tools/configure/div/widget-div.js
@@ -5,7 +5,7 @@ export const widgetDiv = {
code: 'widget-div',
type: 'html',
tabName: '图层',
- label: '边框',
+ label: '边框(二)',
icon: 'icontupian1',
options: {
// 配置
diff --git a/src/views/bigscreenDesigner/designer/tools/main.js b/src/views/bigscreenDesigner/designer/tools/main.js
index 47a4036..7317fb0 100644
--- a/src/views/bigscreenDesigner/designer/tools/main.js
+++ b/src/views/bigscreenDesigner/designer/tools/main.js
@@ -7,6 +7,7 @@
* @LastEditTime: 2022-11-07 15:34:02
*/
import { widgetDiv } from "./configure/div/widget-div"
+import { widgetBorderBox } from "./configure/div/widget-border-box";
import { widgetImage } from "./configure/div/widget-image"
import { widgetSliders } from "./configure/div/widget-slider"
import { widgetText } from "./configure/texts/widget-text"
@@ -40,9 +41,9 @@ import { widgetHeatmap } from "./configure/heatmap/widget-heatmap";
import { widgetRadar } from "./configure/radarCharts/widget-radar";
import { widgetBarLineStack } from "./configure/barlineCharts/widget-bar-line-stack";
-
export const widgetTool = [
//图层
+ widgetBorderBox,
widgetDiv,
widgetImage,
widgetSliders,
diff --git a/src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue b/src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue
new file mode 100644
index 0000000..ad4528b
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/bigscreenDesigner/designer/widget/div/widgetDiv.vue b/src/views/bigscreenDesigner/designer/widget/div/widgetDiv.vue
index c833713..d971a34 100644
--- a/src/views/bigscreenDesigner/designer/widget/div/widgetDiv.vue
+++ b/src/views/bigscreenDesigner/designer/widget/div/widgetDiv.vue
@@ -20,13 +20,9 @@