From a13b2f240b874d8717f15ef12d35b761e9c939cd Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Tue, 6 Jul 2021 17:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/package.json | 3 +- report-ui/src/main.js | 3 + .../designer/form/dynamicAddTable.vue | 205 +++++++++++++++++- .../views/report/bigscreen/designer/tools.js | 201 ++++++++++++++++- .../bigscreen/designer/widget/widgetTable.vue | 194 +++++++++++++++-- 5 files changed, 587 insertions(+), 19 deletions(-) diff --git a/report-ui/package.json b/report-ui/package.json index bfcea186..0651496d 100644 --- a/report-ui/package.json +++ b/report-ui/package.json @@ -37,6 +37,7 @@ "vue-json-editor": "^1.4.3", "vue-router": "3.0.1", "vue-ruler-tool": "^1.2.4", + "vue-superslide": "^0.1.1", "vuedraggable": "^2.24.1", "vuex": "3.0.1" }, @@ -96,4 +97,4 @@ "last 2 versions", "not ie <= 8" ] -} \ No newline at end of file +} diff --git a/report-ui/src/main.js b/report-ui/src/main.js index 2f43b247..c6e3c915 100644 --- a/report-ui/src/main.js +++ b/report-ui/src/main.js @@ -31,6 +31,9 @@ import Avue from '@smallwei/avue'; import '@smallwei/avue/lib/index.css'; Vue.use(Avue); +import VueSuperSlide from 'vue-superslide' +Vue.use(VueSuperSlide) + // enable element zh-cn Vue.use(ElementUI, { zhLocale }) diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue index 27ecf881..992852de 100644 --- a/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue @@ -1,7 +1,206 @@ - + diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 9e913e55..a8e602ca 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -894,11 +894,210 @@ const widgetTools = [ placeholder: '', value: '表格', }, + { + type: 'el-select', + label: '字体位置', + name: 'textAlign', + required: false, + placeholder: '', + selectOptions: [ + { code: 'center', name: '居中' }, + { code: 'left', name: '左对齐' }, + { code: 'right', name: '右对齐' }, + ], + value: 'center' + }, + { + type: 'el-input-number', + label: '字体大小', + name: 'fontSize', + required: false, + placeholder: '', + value: '16' + }, + { + type: 'el-switch', + label: '开启滚动', + name: 'isRoll', + required: false, + placeholder: '', + value: true + }, + { + type: 'el-input-number', + label: '滚动时间(毫秒)', + name: 'rollTime', + required: false, + placeholder: '', + value: 1000 + }, + { + type: 'el-input-number', + label: '滚动个数', + name: 'rollNumber', + required: false, + placeholder: '', + value: 1 + }, + { + type: 'el-switch', + label: '线条', + name: 'isLine', + required: false, + placeholder: '', + value: false + }, + { + type: 'el-input-number', + label: '边框宽度', + name: 'borderWidth', + required: false, + placeholder: '', + value: 1 + }, + { + type: 'vue-color', + label: '边框颜色', + name: 'borderColor', + required: false, + placeholder: '', + value: '#fff' + }, + [ + { + name: '表头设置', + list: [ + { + type: 'el-switch', + label: '表头显隐', + name: 'isHeader', + required: false, + placeholder: '', + value: true, + }, + { + type: 'vue-color', + label: '表头颜色', + name: 'headColor', + require: false, + placeholder: '', + value: '#fff', + }, + { + type: 'vue-color', + label: '表头背景', + name: 'headBackColor', + require: false, + placeholder: '', + value: '#0a73ff', + }, + ], + }, + { + name: '表体设置', + list: [ + { + type: 'vue-color', + label: '文字颜色', + name: 'bodyColor', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'vue-color', + label: '表格背景', + name: 'tableBgColor', + require: false, + placeholder: '', + value: '', + }, + { + type: 'vue-color', + label: '奇行颜色', + name: 'oldColor', + require: false, + placeholder: '', + value: '#0a2732', + }, + { + type: 'vue-color', + label: '偶行颜色', + name: 'eventColor', + required: false, + placeholder: '', + value: '#003b51' + } + ], + }, + ], { type: 'dynamic-add-table', + label: '', + name: 'dynamicAddTable', + required: false, + placeholder: '', + value: [{name: '日期', key: 'date', width: 200},{name: '姓名', key: 'name', width: 200}, {name: '地址', key: 'address', width: '200'}] } ], - data: [], + data: [ + { + type: 'el-radio-group', + label: '数据类型', + name: 'dataType', + require: false, + placeholder: '', + selectValue: true, + selectOptions: [ + { + code: 'staticData', + name: '静态数据', + }, + { + code: 'dynamicData', + name: '动态数据', + }, + ], + value: 'staticData', + }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, + { + type: 'el-button', + label: '静态数据', + name: 'staticData', + required: false, + placeholder: 'px', + relactiveDom: 'dataType', + relactiveDomValue: 'staticData', + value: [ + {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}, + {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}, + {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}, + {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}, + {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}, + {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}, + {date: '2016-05-02',name: '王小虎',address: '上海市普陀区金沙江路 1518 弄'}, + ], + }, + { + type: 'dycustComponents', + label: '', + name: 'dynamicData', + required: false, + placeholder: 'px', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + chartType: 'widget-barchart', + value: '', + }, + ], position: [ { type: 'el-input-number', 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 410d3db2..523616aa 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -1,26 +1,192 @@ - +