diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index 1b8ed3a4..9e74020c 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -37,7 +37,11 @@ 当超链接和视频链接无效的时候,请尝试使用内联框架 ### 表格 -**存在问题,还在开发中** + +表格字段对应的数据只选择“文本数字”。 + +**注意:** 多个字段的时候,需要在“配置-新增”添加你选择数据集所对应的字段,类似于映射关系。 +**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues) ** ### 柱状图 柱状图数据集对应字典值需要选择一个“X轴”、“柱状”,只需要2个字段 diff --git a/doc/docs/guide/question.md b/doc/docs/guide/question.md index fc1ebdd1..ed248ab6 100644 --- a/doc/docs/guide/question.md +++ b/doc/docs/guide/question.md @@ -17,18 +17,18 @@ - 部署完进入系统,点击预览大屏,大屏提示:“执行sql失败“  - 请先重置mysql数据源,修改mysql数据源的账号密码。 + 请先重置mysql数据源,将mysql数据源的账号密码修改为你当前系统的账号密码。 - flyway执行报错1.0.10sql失败 错误提示:Caused by: org.flywaydb.core.api.FlywayException: Validate failed: Detected failed migration to version 1.0.10 (create report share) - 请参考此Issue解决此问题:https://gitee.com/anji-plus/report/issues/I47JNE + 请参考此 [Issue](https://gitee.com/anji-plus/report/issues/I47JNE) 解决此问题 - 禁用flyway及切换底层数据库方案 - https://my.oschina.net/u/4517014/blog/5269319 + [链接](https://my.oschina.net/u/4517014/blog/5269319) - 数据源数据集用法总结 - https://my.oschina.net/u/4517014/blog/5270828 + [链接](https://my.oschina.net/u/4517014/blog/5270828) **注**:http数据源未来会挪到数据集那边 ### 执行源码编译脚本(build.sh)报错 diff --git a/doc/docs/guide/quicklyDistribution.md b/doc/docs/guide/quicklyDistribution.md index 81d3c2dd..798bc917 100644 --- a/doc/docs/guide/quicklyDistribution.md +++ b/doc/docs/guide/quicklyDistribution.md @@ -47,7 +47,7 @@ http://localhost:9095 ## 重置mysql连接 登陆进来后请修改mysql数据源 -数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码 +数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码(改成你自己系统mysql的用户名密码)   diff --git a/doc/docs/guide/quicklySource.md b/doc/docs/guide/quicklySource.md index 00b0c9ed..8a0da0cf 100644 --- a/doc/docs/guide/quicklySource.md +++ b/doc/docs/guide/quicklySource.md @@ -68,7 +68,7 @@ http://serverip:9095 ## 重置mysql连接 登陆进来后请修改mysql数据源 -数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码 +数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码(改成你自己系统mysql的用户名密码)   diff --git a/doc/docs/picture/dashboard/img.png b/doc/docs/picture/dashboard/img.png new file mode 100644 index 00000000..c4c2f227 Binary files /dev/null and b/doc/docs/picture/dashboard/img.png differ diff --git a/doc/docs/picture/dashboard/img_14.png b/doc/docs/picture/dashboard/img_14.png new file mode 100644 index 00000000..649d4cf1 Binary files /dev/null and b/doc/docs/picture/dashboard/img_14.png differ diff --git a/report-ui/src/mixins/queryform.js b/report-ui/src/mixins/queryform.js index 4107c1f8..62d8273d 100644 --- a/report-ui/src/mixins/queryform.js +++ b/report-ui/src/mixins/queryform.js @@ -129,7 +129,7 @@ export default { return data } }, - // 柱状图、折线图、折柱图 + // 柱状图、折线图、柱线图 barOrLineChartFn(chartProperties, data) { const ananysicData = {}; const xAxisList = []; diff --git a/report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicAddTable.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicAddTable.vue index e63116c3..b7353627 100644 --- a/report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicAddTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicAddTable.vue @@ -6,11 +6,12 @@ icon="el-icon-plus" plain @click="handleAddClick" - >新增新增 - - + + + @@ -18,13 +19,13 @@ @click="handleEditorClick(scope.$index, scope.row)" type="text" size="small" - >编辑编辑 删除删除 @@ -54,11 +55,19 @@ > + + + + 取 消 确 定确 定 diff --git a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barlinechart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barlinechart.js index 1e8ec2db..b2f5a922 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barlinechart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barlinechart.js @@ -1,5 +1,5 @@ /* - * @Descripttion: 主线图 + * @Descripttion: 柱线图 * @version: * @Author: qianlishi * @Date: 2021-08-29 07:26:48 @@ -590,12 +590,12 @@ export const widgetBarlinechart = { }, ], }, - { + /*{ name: '图例操作', list: [ { type: 'el-switch', - label: '图例', + label: '显示', name: 'isShowLegend', required: false, placeholder: '', @@ -610,7 +610,7 @@ export const widgetBarlinechart = { value: '#fff', }, { - type: 'el-input-text', + type: 'el-input-number', label: '字体大小', name: 'lengedFontSize', required: false, @@ -632,10 +632,11 @@ export const widgetBarlinechart = { required: false, placeholder: '', selectOptions: [ + {code: 'center', name: '居中'}, {code: 'left', name: '左对齐'}, {code: 'right', name: '右对齐'}, ], - value: '' + value: 'center' }, { type: 'el-select', @@ -647,7 +648,7 @@ export const widgetBarlinechart = { {code: 'top', name: '顶部'}, {code: 'bottom', name: '底部'}, ], - value: '' + value: 'top' }, { type: 'el-select', @@ -659,10 +660,10 @@ export const widgetBarlinechart = { {code: 'vertical', name: '竖排'}, {code: 'horizontal', name: '横排'}, ], - value: '' + value: 'horizontal' }, ], - }, + },*/ { name: '自定义配色', list: [ 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 a63c6c5f..e1b690af 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 @@ -50,6 +50,14 @@ export const widgetTable = { placeholder: '', value: '5' }, + { + type: 'el-input-number', + label: '行高', + name: 'rowHeight', + required: false, + placeholder: '', + value: '50' + }, { type: 'el-switch', label: '开启滚动', @@ -172,10 +180,10 @@ export const widgetTable = { name: 'dynamicAddTable', required: false, placeholder: '', - value: [{name: '日期', key: 'date', width: 200}, {name: '姓名', key: 'name', width: 200}, { - name: '地址', - key: 'address', - width: '200' + value: [ + {name: '日期', key: 'date', width: '50%'}, + {name: '姓名', key: 'name', width: '50%'}, + {name: '地址', key: 'address', width: '200%', }] } ], @@ -216,13 +224,13 @@ export const widgetTable = { 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 弄'}, + {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0001'}, + {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0002'}, + {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0003'}, + {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0004'}, + {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0005'}, + {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0006'}, + {date: '2016-05-02', name: '王小虎', address: '上海市普陀区金沙江路 1518 弄0007'}, ], }, { diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue index a45bb19a..2102e0ba 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue @@ -31,7 +31,6 @@ export default { textStyle: { color: "#fff" }, - data: ["货运量", "货运总量"] }, xAxis: [ { @@ -139,7 +138,7 @@ export default { this.setOptionsTooltip(); this.setOptionsData(); this.setOptionsMargin(); - this.setOptionsLegend(); + //this.setOptionsLegend(); this.setOptionsColor(); }, // 标题修改 @@ -341,23 +340,23 @@ export default { }; this.options.grid = grid; }, - // 图例操作 legend +/* // 图例操作 legend setOptionsLegend() { const optionsCollapse = this.optionsSetup; const legend = this.options.legend; legend.show = optionsCollapse.isShowLegend; - legend.left = optionsCollapse.lateralPosition == "left" ? 0 : "auto"; - legend.right = optionsCollapse.lateralPosition == "right" ? 0 : "auto"; + legend.left = optionsCollapse.lateralPosition; legend.top = optionsCollapse.longitudinalPosition == "top" ? 0 : "auto"; legend.bottom = optionsCollapse.longitudinalPosition == "bottom" ? 0 : "auto"; legend.orient = optionsCollapse.layoutFront; legend.textStyle = { color: optionsCollapse.lengedColor, - fontSize: optionsCollapse.fontSize + fontSize: optionsCollapse.lengedFontSize }; legend.itemWidth = optionsCollapse.lengedWidth; - }, + console.log(legend); + },*/ // 图例颜色修改 setOptionsColor() { const optionsCollapse = this.optionsSetup; @@ -373,7 +372,6 @@ export default { // 数据处理 setOptionsData() { const optionsData = this.optionsData; // 数据类型 静态 or 动态 - console.log(optionsData); optionsData.dataType == "staticData" ? this.staticDataFn(optionsData.staticData) : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime); 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 d5760790..f61607e1 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -5,7 +5,7 @@ {{ item.name }} @@ -14,11 +14,11 @@ - + {{ item[itemChild.key] }} @@ -48,7 +48,8 @@ export default { autoPage: true, //effect: "top", autoPlay: true, - vis: 5 + vis: 5, + rowHeight:'50px' }, header: [], list: [], @@ -172,15 +173,32 @@ export default { }, // 计算 奇偶背景色 bodyTable(index) { + var styleJson = {}; if (index % 2) { - return { - "background-color": this.optionsSetUp.eventColor - }; + styleJson["background-color"] = this.optionsSetUp.eventColor } else { - return { - "background-color": this.optionsSetUp.oldColor - }; + styleJson["background-color"] = this.optionsSetUp.oldColor } + return styleJson; + }, + tableRowHeight(){ + var styleJson = {}; + if(this.optionsSetUp.rowHeight){ + styleJson['height'] = this.optionsSetUp.rowHeight+'px'; + styleJson['line-height'] = this.optionsSetUp.rowHeight+'px'; + }else{ + styleJson['height'] =this.options.rowHeight + styleJson['line-height'] = this.optionsSetUp.rowHeight+'px'; + } + return styleJson; + }, + tableFiledWidth(index){ + var styleJson = {}; + debugger + if(this.optionsSetUp.dynamicAddTable[index].width ){ + styleJson["width"] = this.optionsSetUp.dynamicAddTable[index].width + } + return styleJson } } };