!26 update 0.9.4.2

Merge pull request !26 from Foming/dev

doc/docs/guide/dashboard.md

@@ -37,7 +37,11 @@
 当超链接和视频链接无效的时候，请尝试使用内联框架<br>
 
 ### 表格
-**存在问题，还在开发中**<br>
+![img](../picture/dashboard/img.png) <br>
+表格字段对应的数据只选择“文本数字”。<br>
+![img14](../picture/dashboard/img_14.png) <br>
+**注意：** 多个字段的时候，需要在“配置-新增”添加你选择数据集所对应的字段，类似于映射关系。 <br>
+**如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues) <br>**
 
 ### 柱状图
 柱状图数据集对应字典值需要选择一个“X轴”、“柱状”，只需要2个字段 <br>

doc/docs/guide/question.md

@@ -17,18 +17,18 @@
 
 - 部署完进入系统，点击预览大屏，大屏提示：“执行sql失败“ <br>
   ![img](../picture/qusetion/img_3.png) <br>
-  请先重置mysql数据源，修改mysql数据源的账号密码。<br>
+  请先重置mysql数据源，将mysql数据源的账号密码修改为你当前系统的账号密码。<br>
 
 - flyway执行报错1.0.10sql失败 <br>
   错误提示：Caused by: org.flywaydb.core.api.FlywayException: Validate failed: Detected failed <br>
   migration to version 1.0.10 (create report share) <br>
-  请参考此Issue解决此问题：https://gitee.com/anji-plus/report/issues/I47JNE <br>
+  请参考此 [Issue](https://gitee.com/anji-plus/report/issues/I47JNE) 解决此问题 <br>
 
 - 禁用flyway及切换底层数据库方案 <br>
-  https://my.oschina.net/u/4517014/blog/5269319 <br>
+  [链接](https://my.oschina.net/u/4517014/blog/5269319) <br>
 
 - 数据源数据集用法总结 <br>
-  https://my.oschina.net/u/4517014/blog/5270828 <br>
+  [链接](https://my.oschina.net/u/4517014/blog/5270828) <br>
   **注**：http数据源未来会挪到数据集那边 <br>
 
 ### 执行源码编译脚本（build.sh）报错

doc/docs/guide/quicklyDistribution.md

@@ -47,7 +47,7 @@ http://localhost:9095 <br>
 ## 重置mysql连接
 
 登陆进来后请修改mysql数据源 <br>
-数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码 <br>
+数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码（改成你自己系统mysql的用户名密码） <br>
 ![img](../picture/quickly/img_14.png) <br>
 ![img_6.png](../picture/quickly/img_6.png) <br>
 

doc/docs/guide/quicklySource.md

@@ -68,7 +68,7 @@ http://serverip:9095 <br>
 ## 重置mysql连接
 
 登陆进来后请修改mysql数据源 <br>
-数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码 <br>
+数据源 --> mysql数据源 --> 编辑 --> 修改用户名密码（改成你自己系统mysql的用户名密码） <br>
 ![img](../picture/quickly/img_14.png) <br>
 ![img_6.png](../picture/quickly/img_6.png) <br>
 

report-ui/src/mixins/queryform.js

@@ -129,7 +129,7 @@ export default {
         return data
       }
     },
-    // 柱状图、折线图、折柱图
+    // 柱状图、折线图、柱线图
     barOrLineChartFn(chartProperties, data) {
       const ananysicData = {};
       const xAxisList = [];

report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicAddTable.vue

@@ -9,8 +9,9 @@
     >新增</el-button
     >
     <el-table :data="formData" style="width: 100%">
-      <el-table-column prop="name" label="名称" width="80" />
-      <el-table-column prop="key" label="key值" width="80" />
+      <el-table-column prop="name" label="名称" width="60" />
+      <el-table-column prop="key" label="key值" width="70" />
+      <el-table-column prop="width" label="宽度" width="50" />
       <el-table-column label="操作" width="100">
         <template slot-scope="scope">
           <div class="button-group">
@@ -54,6 +55,14 @@
           >
           </el-input>
         </el-form-item>
+        <el-form-item label="宽度:">
+          <el-input
+            v-model.trim="rowFormData['width']"
+            placeholder="请输入宽度"
+            size="mini"
+          >
+          </el-input>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>

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: [

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'},
           ],
         },
         {

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);

report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue

@@ -5,7 +5,7 @@
       <div class="title">
         <div
           v-for="(item, index) in header"
-          :style="headerTableStlye"
+          :style="[headerTableStlye,tableFiledWidth(index),tableRowHeight()]"
           :key="index"
         >
           {{ item.name }}
@@ -14,11 +14,11 @@
       <!--数据-->
       <div class="bd">
         <ul class="infoList">
-          <li v-for="(item, index) in list" :key="index">
+          <li v-for="(item, index) in list" :key="index" :style="tableRowHeight()" >
             <div
               v-for="(itemChild, idx) in header"
               :key="idx"
-              :style="[bodyTableStyle, bodyTable(index)]"
+              :style="[bodyTableStyle, bodyTable(index),tableFiledWidth(idx),tableRowHeight()]"
             >
               {{ item[itemChild.key] }}
             </div>
@@ -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
     }
   }
 };