Merge branch 'hotfix/bugs4' of duanxiaoduan/tmr-group-admin into develop

src/views/dashboard/index.vue

@@ -126,7 +126,7 @@
                 <el-table-column label="下四分位数" min-width="80px" align="center" prop="sprinkle_time_down_middle_value" />
                 <el-table-column label="最小值" min-width="80px" align="center" prop="sprinkle_time_min_value" />
               </el-table-column>
-            </el-table>
+            </el-table>
           </div>
         </div>
       </el-col>
@@ -534,15 +534,24 @@
           ]
           json2excel(excelDatasTabChart1, '准确性分析', true, 'xlsx')
         }else if(item == 'time'){
-          var excelDatasTabChart2 = [
-            {
-              tHeader: titles,
-              filterVal: values,
-              tableDatas: list1,
-              sheetName: '混料准确率'
-            }
-          ]
-          json2excel(excelDatasTabChart1, '准确性分析', true, 'xlsx')
+          import('@/vendor/Export5Excel').then(excel => {
+            const multiHeader = [
+              [
+                '类型', '加料时间(分钟)', '', '', '', '', '撒料时间(分钟)', '', '', '', ''
+              ]
+            ]
+            const multiHeader2 = [
+              [
+                '牧场', '最大值', '上四分位数', '中位数', '下四分位数', '最小值', '最大值', '上四分位数', '中位数', '下四分位数', '最小值'
+              ]
+            ]
+            const filterVal = [
+              'title','add_feed_time_max_value','add_feed_time_up_middle_value','add_feed_time_middle_value','add_feed_time_down_middle_value','add_feed_time_min_value','sprinkle_time_max_value','sprinkle_time_up_middle_value','sprinkle_time_middle_value','sprinkle_time_down_middle_value','sprinkle_time_min_value'
+            ]
+            const data = this.time.chart1.tableDataList1.map((v) => filterVal.map((j) => v[j]))
+            const merges = ['A1', 'B1:F1', 'G1:K1']
+            excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: '执行时间', merges })
+          })
         }else if(item == 'abnormal'){
           var excelDatasTabChart3 = [
             {