diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index 9e74020c..9fceb004 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -37,9 +37,9 @@ 当超链接和视频链接无效的时候,请尝试使用内联框架
### 表格 -![img](../picture/dashboard/img.png)
+![img](../picture/dashboard/img_22.png)
表格字段对应的数据只选择“文本数字”。
-![img14](../picture/dashboard/img_14.png)
+![img14](../picture/dashboard/img_23.png)
**注意:** 多个字段的时候,需要在“配置-新增”添加你选择数据集所对应的字段,类似于映射关系。
**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** diff --git a/doc/docs/picture/dashboard/img_22.png b/doc/docs/picture/dashboard/img_22.png new file mode 100644 index 00000000..781be645 Binary files /dev/null and b/doc/docs/picture/dashboard/img_22.png differ diff --git a/doc/docs/picture/dashboard/img_23.png b/doc/docs/picture/dashboard/img_23.png new file mode 100644 index 00000000..12455032 Binary files /dev/null and b/doc/docs/picture/dashboard/img_23.png differ diff --git a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-table.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-table.js index e1b690af..ee0cb1a7 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-table.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-table.js @@ -66,18 +66,38 @@ export const widgetTable = { placeholder: '', value: true }, + { + type: 'el-select', + label: '动画效果', + name: 'effect', + required: false, + placeholder: '', + selectOptions: [ + {code: 'top', name: '上滚动'}, + {code: 'topLoop', name: '上循环滚动'}, + ], + value: 'topLoop' + }, + { + type: 'el-input-number', + label: '滚动间隔(毫秒)', + name: 'interTime', + required: false, + placeholder: '', + value: 2500 + }, { type: 'el-input-number', - label: '滚动时间(毫秒)', - name: 'rollTime', + label: '动效时间(毫秒)', + name: 'delayTime', required: false, placeholder: '', - value: 1000 + value: 500 }, { type: 'el-input-number', label: '滚动个数', - name: 'rollNumber', + name: 'scroll', required: false, placeholder: '', value: 1 @@ -213,7 +233,7 @@ export const widgetTable = { name: 'refreshTime', relactiveDom: 'dataType', relactiveDomValue: 'dynamicData', - value: 5000 + value: 30000 }, { type: 'el-button', 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 f61607e1..0cdcda66 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -128,8 +128,10 @@ export default { const options = this.options; const rollSet = this.optionsSetUp; options.autoPlay = rollSet.isRoll; - options.delayTime = rollSet.rollTime; - options.scroll = rollSet.rollNumber; + options.effect = rollSet.effect; + options.interTime = rollSet.interTime; + options.delayTime = rollSet.delayTime; + options.scroll = rollSet.scroll; this.options = options; this.hackResetFun(); },