新增统计

public/baseConfig.js

@@ -8,23 +8,25 @@ const PLATFROM_CONFIG = {
   baggageMessageURL: '/openApi/query',
 }
 const baseNewUrl = window.location.hostname
-switch (baseNewUrl ){
+switch (baseNewUrl) {
   case "10.81.160.49":
-  PLATFROM_CONFIG.baseNewUrl = "http://10.81.160.49:8095/"
-  break;
+    PLATFROM_CONFIG.baseNewUrl = "http://10.81.160.49:8095/"
+    break;
   case "172.29.13.5":
-  PLATFROM_CONFIG.baseNewUrl = "http://172.29.13.5:8095/"
-  break;
+    PLATFROM_CONFIG.baseNewUrl = "http://172.29.13.5:8095/"
+    break;
   case "10.83.36.15":
-  PLATFROM_CONFIG.baseNewUrl = "http://10.83.36.15:8095/"
-  break;
+    PLATFROM_CONFIG.baseNewUrl = "http://10.83.36.15:8095/"
+    break;
   case "10.81.40.201":
-  PLATFROM_CONFIG.baseNewUrl = "http://10.81.40.201:8095/"
-  break;
+  case "10.81.40.202":
+  case "172.23.61.29":
+    PLATFROM_CONFIG.baseNewUrl = "http://10.81.40.201:8095/"
+    break;
   case "120.26.64.82":
   case "localhost":
-  PLATFROM_CONFIG.baseNewUrl = "http://120.26.64.82:8084/"
-  break;
+    PLATFROM_CONFIG.baseNewUrl = "http://120.26.64.82:8083/"
+    break;
   default:
-  PLATFROM_CONFIG.baseNewUrl = "http://172.23.61.1:8095/"
+    PLATFROM_CONFIG.baseNewUrl = "http://172.23.61.1:8095/"
 }

public/config.js

@@ -122,6 +122,11 @@ var NEW_DATACONTENT_ID = [
   52226,
   52227,
   52228,
+  52229,
+  52230,
+  52231,
+  52232,
+  52233,
   51063
 ]
 
@@ -235,7 +240,7 @@ var DATACONTENT_ID = {
   sysServiceJdId: 11, //预警报警-节点查询
   sysServiceWzId: 12, //预警报警-位置查询
   sysServiceCjId: 13, //预警报警-场景维护
-  sysServiceCjIds: 10013, //预警报警-场景维护
+  sysServiceCjIds: 10016, //预警报警-场景维护
   sysServiceClId: 15, //预警报警-策略维护
   sysServiceClIds: 10014,
   sysQueryEditId: 24, //系统设置-查询模板-编辑-根据id获取服务
@@ -449,6 +454,11 @@ var DATACONTENT_ID = {
   waybillGnArrival: 52226, //数据异常统计-运单统计-国内进港
   waybillGjDeparture: 52227, //数据异常统计-运单统计-国际离港
   waybillGjArrival: 52228, //数据异常统计-运单统计-国际进港
+  dimensionGnDeparture: 52229, //数据异常统计-部门维度统计-国内离港
+  dimensionGnArrival: 52230, //数据异常统计-部门维度统计-国内进港
+  dimensionGjDeparture: 52231, //数据异常统计-部门维度统计-国际离港
+  dimensionGjArrival: 52232, //数据异常统计-部门维度统计-国际进港
+  detailNode: 52233, //数据异常统计-节点明细统计
 }
 
 var SERVICE_ID = {

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

@@ -405,11 +405,11 @@
       </template>
       <template v-if="tableList.length && action == 18">
         <el-table :data="tableList" style="width: 100%" :row-style="rowStyle" :header-row-style="rowStyle" :style="dataTableContentStyle" height="calc(100vh - 236px)" max-height="calc(100vh - 236px)" :stripe="tableProps.stripe" :row-key="tableProps.rowKey" :highlight-current-row="tableProps.highlightCurrentRow" :header-cell-class-name="tableProps.headerCellClassName" :tooltip-effect="tableProps.tooltipEffect" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :header-cell-style="{ background: '#F9FAFC' }">
-          <el-table-column prop="flight_date" label="区域" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="typeName" label="区域" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="allflight" label="一级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="department" label="一级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="allflight" label="二级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="department" label="二级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
           <el-table-column label="航班异常" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
             <el-table-column label="航班总数" prop="allflight" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
@@ -432,42 +432,42 @@
             </el-table-column>
           </el-table-column>
           <el-table-column label="运单异常" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
-            <el-table-column label="运单总数" prop="allflight" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+            <el-table-column label="运单总数" prop="allstock" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
             </el-table-column>
             <el-table-column label="数据缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
-              <el-table-column prop="havenot_allnode_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="havenot_allnode_stock" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="havenot_allnode_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
             </el-table-column>
             <el-table-column label="流程节点缺失" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
-              <el-table-column prop="have_part_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="have_part_stock" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="have_part_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
             </el-table-column>
             <el-table-column label="时间倒置" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
-              <el-table-column prop="time_inversion_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="time_inversion_stock" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="time_inversion_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
             </el-table-column>
             <el-table-column label="时间相同" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
-              <el-table-column prop="time_equal_flight" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
+              <el-table-column prop="time_equal_stock" label="运单数" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
               <el-table-column prop="time_equal_lv" label="占比(%)" show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align"></el-table-column>
             </el-table-column>
           </el-table-column>
         </el-table>
       </template>
       <template v-if="tableList.length && action == 19">
-        <el-table :data="tableList" style="width: 100%" :row-style="rowStyle" :header-row-style="rowStyle" :style="dataTableContentStyle" height="calc(100vh - 236px)" max-height="calc(100vh - 236px)" :stripe="tableProps.stripe" :row-key="tableProps.rowKey" :highlight-current-row="tableProps.highlightCurrentRow" :header-cell-class-name="tableProps.headerCellClassName" :tooltip-effect="tableProps.tooltipEffect" :summary-method="totalOutPrice" :show-summary="tableProps.showSummary" :header-cell-style="{ background: '#F9FAFC' }">
-          <el-table-column prop="indexs" label="航班号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+        <el-table :data="tableList" style="width: 100%" :row-style="rowStyle" :header-row-style="rowStyle" :style="dataTableContentStyle" height="calc(100vh - 236px)" max-height="calc(100vh - 236px)" :stripe="tableProps.stripe" :row-key="tableProps.rowKey" :highlight-current-row="tableProps.highlightCurrentRow" :header-cell-class-name="tableProps.headerCellClassName" :tooltip-effect="tableProps.tooltipEffect" :header-cell-style="{ background: '#F9FAFC' }">
+          <el-table-column prop="flight_all_no" label="航班号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="flightDate" label="运单号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="stock_code" label="运单号" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="flightNO" label="指标分类" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="index_class" label="指标分类" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="stockCode" label="节点名称" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="node" label="节点名称" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="weight" label="节点时间" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="execT" label="节点时间" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="stockCode" label="一级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="department" label="一级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
-          <el-table-column prop="weight" label="二级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
+          <el-table-column prop="second_department" label="二级部门" :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip" :align="tableColumnProperty.align">
           </el-table-column>
         </el-table>
       </template>
@@ -786,11 +786,11 @@ export default {
           let [allflightNum, allhavenotNum, allhaveNum, allinversionNum, allequalNum] = [null, null, null, null, null]
           this.tableData.forEach(item => {
             const { allflight, havenot_allnode_flight, have_part_flight, time_inversion_flight, time_equal_flight } = item
-            allflightNum += allflight
-            allhavenotNum += havenot_allnode_flight,
-              allhaveNum += have_part_flight,
-              allinversionNum += time_inversion_flight,
-              allequalNum += time_equal_flight
+            allflightNum += Number(allflight == '/' ? 0 : allflight)
+            allhavenotNum += Number(havenot_allnode_flight == '/' ? 0 : havenot_allnode_flight)
+            allhaveNum += Number(have_part_flight == '/' ? 0 : have_part_flight)
+            allinversionNum += Number(time_inversion_flight == '/' ? 0 : time_inversion_flight)
+            allequalNum += Number(time_equal_flight == '/' ? 0 : time_equal_flight)
           })
           sums[3] = ((allhavenotNum / allflightNum) * 100).toFixed(2) + '%'
           sums[5] = ((allhaveNum / allflightNum) * 100).toFixed(2) + '%'
@@ -800,16 +800,39 @@ export default {
           let [allflightNum, allhavenotNum, allhaveNum, allinversionNum, allequalNum] = [null, null, null, null, null]
           this.tableData.forEach(item => {
             const { allstock, havenot_allnode_stock, have_part_stock, time_inversion_stock, time_equal_stock } = item
-            allflightNum += allstock
-            allhavenotNum += havenot_allnode_stock,
-              allhaveNum += have_part_stock,
-              allinversionNum += time_inversion_stock,
-              allequalNum += time_equal_stock
+            allflightNum += Number(allstock == '/' ? 0 : allstock)
+            allhavenotNum += Number(havenot_allnode_stock == '/' ? 0 : havenot_allnode_stock)
+            allhaveNum += Number(have_part_stock == '/' ? 0 : have_part_stock)
+            allinversionNum += Number(time_inversion_stock == '/' ? 0 : time_inversion_stock)
+            allequalNum += Number(time_equal_stock == '/' ? 0 : time_equal_stock)
           })
           sums[3] = ((allhavenotNum / allflightNum) * 100).toFixed(2) + '%'
           sums[5] = ((allhaveNum / allflightNum) * 100).toFixed(2) + '%'
           sums[7] = ((allinversionNum / allflightNum) * 100).toFixed(2) + '%'
           sums[9] = ((allequalNum / allflightNum) * 100).toFixed(2) + '%'
+        } else if (this.action === 18) {
+          let [allflightNum1, allhavenotNum1, allhaveNum1, allinversionNum1, allequalNum1, allflightNum2, allhavenotNum2, allhaveNum2, allinversionNum2, allequalNum2] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+          this.tableData.forEach(item => {
+            const { allstock, havenot_allnode_stock, have_part_stock, time_inversion_stock, time_equal_stock, allflight, havenot_allnode_flight, have_part_flight, time_inversion_flight, time_equal_flight } = item
+            allflightNum1 += Number(allflight == '/' ? 0 : allflight)
+            allhavenotNum1 += Number(havenot_allnode_flight == '/' ? 0 : havenot_allnode_flight)
+            allhaveNum1 += Number(have_part_flight == '/' ? 0 : have_part_flight)
+            allinversionNum1 += Number(time_inversion_flight == '/' ? 0 : time_inversion_flight)
+            allequalNum1 += Number(time_equal_flight == '/' ? 0 : time_equal_flight)
+            allflightNum2 += Number(allstock == '/' ? 0 : allstock)
+            allhavenotNum2 += Number(havenot_allnode_stock == '/' ? 0 : havenot_allnode_stock)
+            allhaveNum2 += Number(have_part_stock == '/' ? 0 : have_part_stock)
+            allinversionNum2 += Number(time_inversion_stock == '/' ? 0 : time_inversion_stock)
+            allequalNum2 += Number(time_equal_stock == '/' ? 0 : time_equal_stock)
+          })
+          sums[5] = ((allhavenotNum1 / allflightNum1) * 100).toFixed(2) + '%'
+          sums[7] = ((allhaveNum1 / allflightNum1) * 100).toFixed(2) + '%'
+          sums[9] = ((allinversionNum1 / allflightNum1) * 100).toFixed(2) + '%'
+          sums[11] = ((allequalNum1 / allflightNum1) * 100).toFixed(2) + '%'
+          sums[14] = ((allhavenotNum2 / allflightNum2) * 100).toFixed(2) + '%'
+          sums[16] = ((allhaveNum2 / allflightNum2) * 100).toFixed(2) + '%'
+          sums[18] = ((allinversionNum2 / allflightNum2) * 100).toFixed(2) + '%'
+          sums[20] = ((allequalNum2 / allflightNum2) * 100).toFixed(2) + '%'
         }
       });
       return sums;

src/views/statisticalanalysis/dataException/index.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="data-exception">
+  <div style="height: 100%;" class="data-exception">
     <router-view />
   </div>
 </template>
+

src/views/statisticalanalysis/dataException/views/detail.vue

@@ -3,9 +3,12 @@
     <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('table')" @upset="upset" />
     </div>
-    <div class="echart">
+    <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
-      <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
+      <Tableformbrs ref="table" :tableList="tableNewList" :action="action" :set="set" />
+    </div>
+    <div v-if="total > 0" class="pagination">
+      <el-pagination background layout="prev, pager, next" @current-change="currentChange" :total="total" />
     </div>
   </div>
 </template>
@@ -21,6 +24,7 @@ export default {
   name: "ChartsBar",
   data () {
     return {
+      loading: false,
       asShow: false,
       optiondata: [],
       picShow: true, //图片表格切换
@@ -32,8 +36,10 @@ export default {
       isShow: Echarts,
       tableList: [],
       tableListcop: [],
+      tableNewList: [],
       listname: "",
       listHeader: [],
+      total: 0,
       tableData: {
         time: [],
         data1: [],
@@ -42,6 +48,7 @@ export default {
         tyol: "",
       },
       formData: {
+        fttp: "",
         flighttype: "",
         dateTime: "",
       },
@@ -70,46 +77,64 @@ export default {
         {
           prop: "fttp",
           inputType: "select",
-          placeholder: "国内国际",
-          requiredWarning: "请先选择国内国际",
+          placeholder: "指标分类",
           clearable: true,
           options: [
             {
-              value: DATACONTENT_ID.dataGnDeparture,
-              label: "国内出港",
+              value: "数据缺失",
+              label: "数据缺失",
             },
             {
-              value: DATACONTENT_ID.dataGjDeparture,
-              label: "国际出港",
+              value: "流程节点缺失",
+              label: "流程节点缺失",
             },
             {
-              value: DATACONTENT_ID.dataGnArrival,
-              label: "国内进港",
+              value: "时间倒置",
+              label: "时间倒置",
             },
             {
-              value: DATACONTENT_ID.dataGjArrival,
-              label: "国际进港",
+              value: "时间相同",
+              label: "时间相同",
             },
           ],
         },
         {
           prop: "flighttype",
           inputType: "select",
-          placeholder: "客货类型",
-          requiredWarning: "请先选择客货类型",
+          placeholder: "节点名称",
           clearable: true,
           options: [
             {
-              value: "客机",
-              label: "客机",
+              value: "安检",
+              label: "安检",
+            },
+            {
+              value: "货站交接",
+              label: "货站交接",
+            },
+            {
+              value: "交接复核",
+              label: "交接复核",
+            },
+            {
+              value: "库区到达",
+              label: "库区到达",
             },
             {
-              value: "货机",
-              label: "货机",
+              value: "机下交接",
+              label: "机下交接",
             },
             {
-              value: "全部",
-              label: "全部",
+              value: "装机",
+              label: "装机",
+            },
+            {
+              value: "关闭舱门",
+              label: "关闭舱门",
+            },
+            {
+              value: "卸机",
+              label: "卸机",
             },
           ],
         },
@@ -126,6 +151,7 @@ export default {
           }
         },
       ],
+      newObj: {}
     };
   },
   mounted () {
@@ -133,103 +159,95 @@ export default {
   },
   watch: {
     // 监听数据变化，重绘折线图
-    option: {
+    newObj: {
       deep: true,
-      handler (newVal) { },
+      handler (newVal) {
+        const { fttp, flighttype } = newVal
+        if (fttp && !flighttype) {
+          const datas = this.tableList.filter(item => item.index_class == fttp)
+          this.tableListcop = _.chunk(datas, 10)
+          this.tableNewList = this.tableListcop[0]
+          this.total = datas.length
+        } else if (!fttp && flighttype) {
+          const datas = this.tableList.filter(item => item.node == flighttype)
+          this.tableListcop = _.chunk(datas, 10)
+          this.tableNewList = this.tableListcop[0]
+          this.total = datas.length
+        } else if (fttp && flighttype) {
+          const datas = this.tableList.filter(item => item.node == flighttype && item.index_class == fttp)
+          this.tableListcop = _.chunk(datas, 10)
+          this.tableNewList = this.tableListcop[0]
+          this.total = datas.length
+        } else {
+          const datas = this.tableList
+          this.tableListcop = _.chunk(datas, 10)
+          this.tableNewList = this.tableListcop[0]
+          this.total = datas.length
+        }
+      },
     },
   },
   destroyed () { },
   methods: {
     getFormData (data) {
+      this.newObj = data
       this.tableData.time = [];
       this.tableData.data1 = [];
       this.tableData.data2 = [];
-      let option = [
-        {
-          flighttype: data.flighttype,
-          fd1: data.dateTime,
-          fd2: data.dateTime
-        },
-      ];
-      this.getQuery(data.fttp, option, null);
-      let typeName = null
-      switch (data.fttp) {
-        case 52221:
-          typeName = '国内出港'
-          break;
-        case 52222:
-          typeName = '国内进港'
-          break;
-        case 52223:
-          typeName = '国际出港'
-          break;
-        case 52224:
-          typeName = '国际进港'
-          break;
-        default:
-          typeName = '国内出港'
-          break;
-      }
+      let option = [{
+        fd1: data.dateTime,
+        fd2: data.dateTime
+      }]
+      this.getQuery(option, null);
       this.listname =
-        "航班统计" + '-' +
-        typeName + '-' +
+        "节点明细统计" + '-' +
+        data.fttp + '-' +
         data.flighttype + '-' +
         data.dateTime;
       this.listHeader = ["序号", "时间", "航班(班)", "环比(%)"];
     },
     //获取表格数据
-    async getQuery (id, data, dat) {
+    async getQuery (data, dat) {
+      this.loading = true
       try {
         const { code, returnData } = await Query({
-          id: Number(id),
+          id: DATACONTENT_ID.detailNode,
           dataContent: data,
         });
         if (code == 0) {
           this.tableData.time = [];
           this.tableData.data1 = [];
           this.tableData.data2 = [];
+          this.total = returnData.length
           this.tableList = _.cloneDeep(returnData);
-          this.tableListcop = _.cloneDeep(returnData);
-          // returnData.listValues.forEach((element) => {
-          //   this.tableData.data2.push(
-          //     element.flightNum ? element.flightNum : 0
-          //   );
-          //   this.tableData.time.push(element.dat);
-          //   this.tableData.kg = "单位：班";
-          //   this.tableData.data1 = [];
-          // });
-          // this.tableData.data1.push(0);
-          // for (let index = 0; index < this.tableData.data2.length; index++) {
-          //   if (index > 0) {
-          //     const element =
-          //       (this.tableData.data2[index] -
-          //         this.tableData.data2[index - 1]) /
-          //       this.tableData.data2[index - 1];
-          //     this.tableData.data1.push(
-          //       element.toFixed(2) ? element.toFixed(2) : 0
-          //     );
-          //     this.tableData.data1.forEach((element) => {
-          //       element = Number(element);
-          //       if (typeof element !== "number") {
-          //         element = 0;
-          //       }
-          //     });
-          //   }
-          // }
+          this.tableListcop = _.chunk(_.cloneDeep(returnData), 10);
+          this.tableNewList = this.tableListcop[0]
+          this.loading = false
         } else {
+          this.loading = false
           console.log(code)
         }
       } catch (error) {
+        this.loading = false
         this.page--;
       }
     },
     //导出
     tableToExcel (refName) {
-      import("@/utils/Export2Excel").then((excel) => {
-        const table = this.$refs[refName].$el.cloneNode(true);
-        const fileName = `${this.listname}.xlsx`;
-        exportToExcel(table, '航班统计', fileName);
-      });
+      if (this.tableList.length) {
+        import("@/utils/Export2Excel").then((excel) => {
+          const table = this.$refs[refName].$el.cloneNode(true);
+          const fileName = `${this.listname}.xlsx`;
+          exportToExcel(table, '节点明细统计', fileName);
+        });
+      } else {
+        this.$message.error('暂无数据')
+      }
+
+    },
+    //分页
+    currentChange (page) {
+      this.tableNewList = this.tableListcop[page - 1]
     },
     upset (data) {
       this.picShow = data;
@@ -245,6 +263,7 @@ export default {
 <style lang="scss" scoped>
 .airportInfo {
   position: relative;
+  height: 100%;
   .header {
     width: 103%;
     height: 36px;
@@ -287,5 +306,15 @@ export default {
     box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
     border-radius: 4px;
   }
+
+  .pagination {
+    position: absolute;
+    z-index: 10;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
 }
 </style>

src/views/statisticalanalysis/dataException/views/dimension.vue

@@ -3,7 +3,7 @@
     <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('table')" @upset="upset" />
     </div>
-    <div class="echart">
+    <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
       <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
     </div>
@@ -41,6 +41,7 @@ export default {
         kg: "",
         tyol: "",
       },
+      loading: false,
       formData: {
         flighttype: "",
         dateTime: "",
@@ -75,19 +76,19 @@ export default {
           clearable: true,
           options: [
             {
-              value: DATACONTENT_ID.dataGnDeparture,
+              value: DATACONTENT_ID.dimensionGnDeparture,
               label: "国内出港",
             },
             {
-              value: DATACONTENT_ID.dataGjDeparture,
+              value: DATACONTENT_ID.dimensionGjDeparture,
               label: "国际出港",
             },
             {
-              value: DATACONTENT_ID.dataGnArrival,
+              value: DATACONTENT_ID.dimensionGnArrival,
               label: "国内进港",
             },
             {
-              value: DATACONTENT_ID.dataGjArrival,
+              value: DATACONTENT_ID.dimensionGjArrival,
               label: "国际进港",
             },
           ],
@@ -126,6 +127,7 @@ export default {
           }
         },
       ],
+      newObj: {}
     };
   },
   mounted () {
@@ -144,6 +146,7 @@ export default {
       this.tableData.time = [];
       this.tableData.data1 = [];
       this.tableData.data2 = [];
+      this.newObj = _.cloneDeep(data)
       let option = [
         {
           flighttype: data.flighttype,
@@ -154,16 +157,16 @@ export default {
       this.getQuery(data.fttp, option, null);
       let typeName = null
       switch (data.fttp) {
-        case 52221:
+        case 52229:
           typeName = '国内出港'
           break;
-        case 52222:
+        case 52230:
           typeName = '国内进港'
           break;
-        case 52223:
+        case 52231:
           typeName = '国际出港'
           break;
-        case 52224:
+        case 52232:
           typeName = '国际进港'
           break;
         default:
@@ -171,7 +174,7 @@ export default {
           break;
       }
       this.listname =
-        "航班统计" + '-' +
+        "部门维度统计" + '-' +
         typeName + '-' +
         data.flighttype + '-' +
         data.dateTime;
@@ -179,6 +182,7 @@ export default {
     },
     //获取表格数据
     async getQuery (id, data, dat) {
+      this.loading = true
       try {
         const { code, returnData } = await Query({
           id: Number(id),
@@ -188,8 +192,31 @@ export default {
           this.tableData.time = [];
           this.tableData.data1 = [];
           this.tableData.data2 = [];
-          this.tableList = _.cloneDeep(returnData);
-          this.tableListcop = _.cloneDeep(returnData);
+          const copyDatas = _.cloneDeep(returnData);
+          let typeName = null
+          switch (data.fttp) {
+            case 52229:
+              typeName = '国内'
+              break;
+            case 52230:
+              typeName = '国内'
+              break;
+            case 52231:
+              typeName = '国际'
+              break;
+            case 52232:
+              typeName = '国际'
+              break;
+            default:
+              typeName = '国内'
+              break;
+          }
+          copyDatas.forEach(item => {
+            item.typeName = typeName
+          });
+          this.tableList = copyDatas;
+          this.tableListcop = copyDatas;
+          this.loading = false
           // returnData.listValues.forEach((element) => {
           //   this.tableData.data2.push(
           //     element.flightNum ? element.flightNum : 0
@@ -217,9 +244,11 @@ export default {
           //   }
           // }
         } else {
+          this.loading = false
           console.log(code)
         }
       } catch (error) {
+        this.loading = false
         this.page--;
       }
     },
@@ -228,7 +257,7 @@ export default {
       import("@/utils/Export2Excel").then((excel) => {
         const table = this.$refs[refName].$el.cloneNode(true);
         const fileName = `${this.listname}.xlsx`;
-        exportToExcel(table, '航班统计', fileName);
+        exportToExcel(table, '部门维度统计', fileName);
       });
     },
     upset (data) {

src/views/statisticalanalysis/dataException/views/flight.vue

@@ -3,7 +3,7 @@
     <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('table')" @upset="upset" />
     </div>
-    <div class="echart">
+    <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
       <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
     </div>
@@ -21,6 +21,7 @@ export default {
   name: "ChartsBar",
   data () {
     return {
+      loading: false,
       asShow: false,
       optiondata: [],
       picShow: true, //图片表格切换
@@ -180,6 +181,7 @@ export default {
     //获取表格数据
     async getQuery (id, data, dat) {
       try {
+        this.loading = true
         const { code, returnData } = await Query({
           id: Number(id),
           dataContent: data,
@@ -190,6 +192,7 @@ export default {
           this.tableData.data2 = [];
           this.tableList = _.cloneDeep(returnData);
           this.tableListcop = _.cloneDeep(returnData);
+          this.loading = false
           // returnData.listValues.forEach((element) => {
           //   this.tableData.data2.push(
           //     element.flightNum ? element.flightNum : 0
@@ -217,9 +220,11 @@ export default {
           //   }
           // }
         } else {
+          this.loading = false
           console.log(code)
         }
       } catch (error) {
+        this.loading = false
         this.page--;
       }
     },

src/views/statisticalanalysis/dataException/views/waybill.vue

@@ -3,7 +3,7 @@
     <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('table')" @upset="upset" />
     </div>
-    <div class="echart">
+    <div v-loading="loading" element-loading-text="数据加载中..." class="echart">
       <!-- <Echarts :id="dataid" :option="tableData" v-if="picShow == true ? true : false" /> -->
       <Tableformbrs ref="table" :tableList="tableList" :action="action" :set="set" />
     </div>
@@ -21,6 +21,7 @@ export default {
   name: "ChartsBar",
   data () {
     return {
+      loading: false,
       asShow: false,
       optiondata: [],
       picShow: true, //图片表格切换
@@ -180,6 +181,7 @@ export default {
     //获取表格数据
     async getQuery (id, data, dat) {
       try {
+        this.loading = true
         const { code, returnData } = await Query({
           id: Number(id),
           dataContent: data,
@@ -190,6 +192,7 @@ export default {
           this.tableData.data2 = [];
           this.tableList = _.cloneDeep(returnData);
           this.tableListcop = _.cloneDeep(returnData);
+          this.loading = false
           // returnData.listValues.forEach((element) => {
           //   this.tableData.data2.push(
           //     element.flightNum ? element.flightNum : 0
@@ -217,9 +220,11 @@ export default {
           //   }
           // }
         } else {
+          this.loading = false
           console.log(code)
         }
       } catch (error) {
+        this.loading = false
         this.page--;
       }
     },