diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue
new file mode 100644
index 00000000..27ecf881
--- /dev/null
+++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue
@@ -0,0 +1,7 @@
+
+ 表格
+
+
+
diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
index 0a194698..6adb843c 100644
--- a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
+++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
@@ -10,7 +10,11 @@
+
@@ -274,13 +283,15 @@ import "codemirror/mode/sql/sql.js";
import "codemirror/mode/shell/shell.js";
import dynamicComponents from "./dynamicComponents.vue";
import customColorComponents from "./customColorComponents";
+import dynamicAddTable from "./dynamicAddTable.vue";
export default {
name: "DynamicForm",
components: {
ColorPicker,
vueJsonEditor,
dynamicComponents,
- customColorComponents
+ customColorComponents,
+ dynamicAddTable
},
model: {
prop: "value",
diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index 72c8df6c..750d745b 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -869,9 +869,54 @@ const widgetTools = [
label: '表格',
icon: 'iconbiaoge',
options: {
- setup: [],
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '表格',
+ },
+ {
+ type: 'dynamic-add-table',
+ }
+ ],
data: [],
- position: []
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: 'px',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: 'px',
+ value: 0,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 600,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 300,
+ },
+ ]
}
},
{
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/temp.vue b/report-ui/src/views/report/bigscreen/designer/widget/temp.vue
index bbbe067a..9972661c 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/temp.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/temp.vue
@@ -29,6 +29,7 @@ import WidgetFunnel from "./widgetFunnel.vue";
import WidgetGauge from "./widgetGauge.vue";
import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRoseArea";
import widgetTable from "./widgetTable.vue";
+import widgetMap from "./widgetMap.vue";
export default {
name: "WidgetTemp",
components: {
@@ -49,7 +50,8 @@ export default {
WidgetFunnel,
WidgetGauge,
WidgetPieNightingaleRoseArea,
- widgetTable
+ widgetTable,
+ widgetMap
},
model: {
prop: "value",
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue
index af263be2..de40c554 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue
@@ -1,3 +1,20 @@
- 表格
+
+
+
diff --git a/report-ui/static/Crane.png b/report-ui/static/Crane.png
deleted file mode 100644
index 93608590..00000000
Binary files a/report-ui/static/Crane.png and /dev/null differ
diff --git a/report-ui/static/bg_01.jpg b/report-ui/static/bg_01.jpg
deleted file mode 100644
index 979f6b1d..00000000
Binary files a/report-ui/static/bg_01.jpg and /dev/null differ
diff --git a/report-ui/static/bianzu.png b/report-ui/static/bianzu.png
deleted file mode 100644
index f050534e..00000000
Binary files a/report-ui/static/bianzu.png and /dev/null differ
diff --git a/report-ui/static/daiqueren.png b/report-ui/static/daiqueren.png
deleted file mode 100644
index b427be22..00000000
Binary files a/report-ui/static/daiqueren.png and /dev/null differ
diff --git a/report-ui/static/difengxian.png b/report-ui/static/difengxian.png
deleted file mode 100644
index aabfc0ca..00000000
Binary files a/report-ui/static/difengxian.png and /dev/null differ
diff --git a/report-ui/static/fanghuoqiang.png b/report-ui/static/fanghuoqiang.png
deleted file mode 100644
index 2b791016..00000000
Binary files a/report-ui/static/fanghuoqiang.png and /dev/null differ
diff --git a/report-ui/static/gaofengxian.png b/report-ui/static/gaofengxian.png
deleted file mode 100644
index d28b4981..00000000
Binary files a/report-ui/static/gaofengxian.png and /dev/null differ
diff --git a/report-ui/static/header.png b/report-ui/static/header.png
deleted file mode 100644
index d2d94f1a..00000000
Binary files a/report-ui/static/header.png and /dev/null differ
diff --git a/report-ui/static/header01.jpg b/report-ui/static/header01.jpg
deleted file mode 100644
index b237744a..00000000
Binary files a/report-ui/static/header01.jpg and /dev/null differ
diff --git a/report-ui/static/iconsheji-.png b/report-ui/static/iconsheji-.png
deleted file mode 100644
index a6fc49c4..00000000
Binary files a/report-ui/static/iconsheji-.png and /dev/null differ
diff --git a/report-ui/static/iconsheji-2.png b/report-ui/static/iconsheji-2.png
deleted file mode 100644
index 914a455f..00000000
Binary files a/report-ui/static/iconsheji-2.png and /dev/null differ
diff --git a/report-ui/static/jiaohuanji.png b/report-ui/static/jiaohuanji.png
deleted file mode 100644
index b229c51e..00000000
Binary files a/report-ui/static/jiaohuanji.png and /dev/null differ
diff --git a/report-ui/static/login_box.png b/report-ui/static/login_box.png
deleted file mode 100644
index 313d45ed..00000000
Binary files a/report-ui/static/login_box.png and /dev/null differ
diff --git a/report-ui/static/luyouqi.png b/report-ui/static/luyouqi.png
deleted file mode 100644
index 93c8b069..00000000
Binary files a/report-ui/static/luyouqi.png and /dev/null differ
diff --git a/report-ui/static/no.png b/report-ui/static/no.png
deleted file mode 100644
index db01abc8..00000000
Binary files a/report-ui/static/no.png and /dev/null differ
diff --git a/report-ui/static/ocean.png b/report-ui/static/ocean.png
deleted file mode 100644
index 22a92d63..00000000
Binary files a/report-ui/static/ocean.png and /dev/null differ
diff --git a/report-ui/static/right.png b/report-ui/static/right.png
deleted file mode 100644
index 35921224..00000000
Binary files a/report-ui/static/right.png and /dev/null differ
diff --git a/report-ui/static/shebei.png b/report-ui/static/shebei.png
deleted file mode 100644
index 9595424a..00000000
Binary files a/report-ui/static/shebei.png and /dev/null differ
diff --git a/report-ui/static/shijianxuanze.png b/report-ui/static/shijianxuanze.png
deleted file mode 100644
index 773a4b58..00000000
Binary files a/report-ui/static/shijianxuanze.png and /dev/null differ
diff --git a/report-ui/static/ship.png b/report-ui/static/ship.png
deleted file mode 100644
index 591c9ea0..00000000
Binary files a/report-ui/static/ship.png and /dev/null differ
diff --git a/report-ui/static/timg.jpg b/report-ui/static/timg.jpg
deleted file mode 100644
index c530bf5a..00000000
Binary files a/report-ui/static/timg.jpg and /dev/null differ
diff --git a/report-ui/static/title.png b/report-ui/static/title.png
deleted file mode 100644
index fd118d01..00000000
Binary files a/report-ui/static/title.png and /dev/null differ
diff --git a/report-ui/static/wuxian.png b/report-ui/static/wuxian.png
deleted file mode 100644
index 3e75753a..00000000
Binary files a/report-ui/static/wuxian.png and /dev/null differ
diff --git a/report-ui/static/youyi.png b/report-ui/static/youyi.png
deleted file mode 100644
index 66e8aafd..00000000
Binary files a/report-ui/static/youyi.png and /dev/null differ
diff --git a/report-ui/static/zhexian.png b/report-ui/static/zhexian.png
deleted file mode 100644
index 8b8fa9ae..00000000
Binary files a/report-ui/static/zhexian.png and /dev/null differ
diff --git a/report-ui/static/zhongfengxian.png b/report-ui/static/zhongfengxian.png
deleted file mode 100644
index 9ddb954b..00000000
Binary files a/report-ui/static/zhongfengxian.png and /dev/null differ