修改

src/utils/axiosReq.ts

@@ -147,7 +147,7 @@ export function axiosReq({
     isAlertErrorMsg: isAlertErrorMsg,
     // baseURL: baseURL ?? import.meta.env.VITE_APP_BASE_URL,
     baseURL: baseURL ?? PLATFROM_CONFIG.baseNewUrl,
-    timeout: timeout ?? 15000,
+    timeout: timeout ?? 60000,
   })
 }
 

src/views/statisticalanalysis/components/echart/index.vue

@@ -1,9 +1,5 @@
 <template>
-  <div
-    style="height: 100%; width: 100%; position: absolute; left: 0; top: 0"
-    class="ChartsBar"
-    :id="id"
-  ></div>
+  <div style="height: 100%; width: 100%; position: absolute; left: 0; top: 0" class="ChartsBar" :id="id"></div>
 </template>
 
 <script>
@@ -22,15 +18,15 @@ export default {
     // 柱状图额外的数据
     option: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
   },
-  data() {
+  data () {
     return {
       myChart: null, //柱状图实例
     };
   },
-  mounted() {
+  mounted () {
     // 柱状图dom
     const chartDom = document.getElementById(this.id);
     // 柱状图初始化
@@ -50,15 +46,14 @@ export default {
     // 监听数据变化，重绘折线图
     option: {
       deep: true,
-      handler(newVal) {
+      handler (newVal) {
         const chartDom = document.getElementById(this.id);
         // 先移除之前的实例，保证重绘的流畅性
-        // console.log(newVal, "11111");
         chartDom.removeAttribute("_echarts_instance_");
         this.myChart = markRaw(echarts.init(chartDom));
         collectionStatistics.xAxis.data = newVal.time;
-        collectionStatistics.series[0].data = newVal.data1;
-        collectionStatistics.series[1].data = newVal.data2;
+        collectionStatistics.series[0].data = this.formatData(newVal.data1);
+        collectionStatistics.series[1].data = this.formatData(newVal.data2);
         // collectionStatistics.series[1].name = newVal.kg;
         // collectionStatistics.legend.data[1] = newVal.kg;
         collectionStatistics.yAxis[0].name = newVal.kg;
@@ -66,7 +61,7 @@ export default {
       },
     },
   },
-  destroyed() {
+  destroyed () {
     // 销毁实例和移除监听
     this.myChart.dispose();
     window.removeEventListener("resize", this.handle);
@@ -77,9 +72,21 @@ export default {
      * @param {*}
      * @return {*}
      */
-    handle() {
+    handle () {
       this.myChart.resize();
     },
+    formatData (arr) {
+      const [narr, ndata] = [[...arr], []]
+      for (let i = 0; i < narr.length; i++) {
+        const element = Number(narr[i]);
+        if (element == Infinity || element == undefined || element == null || element == NaN) {
+          ndata.push(0)
+        } else {
+          ndata.push(element)
+        }
+      }
+      return ndata
+    }
   },
 };
 </script>

src/views/statisticalanalysis/pickingstatistics/index.vue

@@ -1,35 +1,11 @@
 <template>
   <div class="airportInfo">
     <div class="variable">
-      <StatisticsHeader
-        :title="titleTop"
-        :items="formItems"
-        :data="formData"
-        :eledata="eledata"
-        with-setting
-        :withSetting="false"
-        :withExport="true"
-        :set="set"
-        :action="action"
-        :asShow="asShow"
-        @getFormData="getFormData"
-        @export="tableToExcel"
-        @upset="upset"
-      />
+      <StatisticsHeader :title="titleTop" :items="formItems" :data="formData" :eledata="eledata" with-setting :withSetting="false" :withExport="true" :set="set" :action="action" :asShow="asShow" @getFormData="getFormData" @export="tableToExcel" @upset="upset" />
     </div>
     <div class="echart">
-      <Echarts
-        :id="dataid"
-        :option="tableData"
-        v-if="picShow == true ? true : false"
-      />
-      <Tableformbrs
-        v-if="!picShow"
-        :tableList="tableList"
-        :action="action"
-        :set="set"
-        :listall="listall"
-      />
+      <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" />
+      <Tableformbrs v-if="!picShow" :tableList="tableList" :action="action" :set="set" :listall="listall" />
     </div>
   </div>
 </template>
@@ -42,7 +18,7 @@ import { export_json_to_excel } from "@/utils/Export2Excel";
 import { Query } from "@/api/webApi";
 export default {
   name: "ChartsBar",
-  data() {
+  data () {
     return {
       asShow: true,
       optiondata: [],
@@ -160,19 +136,19 @@ export default {
       ],
     };
   },
-  mounted() {
+  mounted () {
     // this.getQuery([]);
   },
   watch: {
     // 监听数据变化，重绘折线图
     option: {
       deep: true,
-      handler(newVal) {},
+      handler (newVal) { },
     },
   },
-  destroyed() {},
+  destroyed () { },
   methods: {
-    getFormData(data) {
+    getFormData (data) {
       this.tableData.time = [];
       this.tableData.data1 = [];
       this.tableData.data2 = [];
@@ -216,7 +192,7 @@ export default {
       ];
     },
     //获取表格数据
-    async getQuery(data, dat) {
+    async getQuery (data, dat) {
       try {
         const { code, returnData } = await Query({
           id: this.listqueryTemplateID,
@@ -295,7 +271,7 @@ export default {
       }
     },
     //导出
-    tableToExcel() {
+    tableToExcel () {
       import("../../../utils/Export2Excel").then((excel) => {
         // 设置导出表格的头部
         const tHeader = this.listHeader;
@@ -306,22 +282,22 @@ export default {
         const data = this.tableListcop.map((item, index) => {
           return this.picShow
             ? [
-                item.indexs,
-                item.dat,
-                item.pullFlightNum,
-                item.flightChain,
-                item.pullWeight,
-                item.weightChain,
-              ]
+              item.indexs,
+              item.dat,
+              item.pullFlightNum,
+              item.flightChain,
+              item.pullWeight,
+              item.weightChain,
+            ]
             : [
-                item.indexs,
-                item.flightdate,
-                item.flightNo,
-                item.line,
-                item.stand,
-                item.totalWeight,
-                item.pullWeight,
-              ]
+              item.indexs,
+              item.flightdate,
+              item.flightNo,
+              item.line,
+              item.stand,
+              item.totalWeight,
+              item.pullWeight,
+            ]
         });
         if (!this.picShow) {
           data[data.length - 1][2] = data.length - 1
@@ -341,7 +317,7 @@ export default {
         });
       });
     },
-    upset(data) {
+    upset (data) {
       this.picShow = data;
       if (this.picShow == false) {
         this.tableData.time = [];