Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

src/router/routes/routes-file-seven.ts

@@ -10,7 +10,7 @@ const HomeRoutes = {
     title: "统计分析",
     elSvgIcon: "analyseIcon",
     breadcrumb: false,
-    // roles: ["statistical_analysis_page"],
+    roles: ["statistical_analysis_page"],
   },
   children: [
     {
@@ -71,38 +71,38 @@ const HomeRoutes = {
       path: "/statisticalanalysis/domesticdeparture",
       name: "Domesticdeparture",
       meta: {
-        title: "航班统计国内出港",
+        title: "航班统计",
       },
       component: () =>
         import("@/views/statisticalanalysis/domesticdeparture/index.vue"),
     },
-    {
-      path: "/statisticalanalysis/domesticentry",
-      name: "Domesticentry",
-      meta: {
-        title: "航班统计国内进港",
-      },
-      component: () =>
-        import("@/views/statisticalanalysis/domesticentry/index.vue"),
-    },
-    {
-      path: "/statisticalanalysis/Internationalexport",
-      name: "Internationalexport",
-      meta: {
-        title: "航班统计国际出港",
-      },
-      component: () =>
-        import("@/views/statisticalanalysis/Internationalexport/index.vue"),
-    },
-    {
-      path: "/statisticalanalysis/Internationaladvance",
-      name: "Internationaladvance",
-      meta: {
-        title: "航班统计国际进港",
-      },
-      component: () =>
-        import("@/views/statisticalanalysis/Internationaladvance/index.vue"),
-    },
+    // {
+    //   path: "/statisticalanalysis/domesticentry",
+    //   name: "Domesticentry",
+    //   meta: {
+    //     title: "航班统计国内进港",
+    //   },
+    //   component: () =>
+    //     import("@/views/statisticalanalysis/domesticentry/index.vue"),
+    // },
+    // {
+    //   path: "/statisticalanalysis/Internationalexport",
+    //   name: "Internationalexport",
+    //   meta: {
+    //     title: "航班统计国际出港",
+    //   },
+    //   component: () =>
+    //     import("@/views/statisticalanalysis/Internationalexport/index.vue"),
+    // },
+    // {
+    //   path: "/statisticalanalysis/Internationaladvance",
+    //   name: "Internationaladvance",
+    //   meta: {
+    //     title: "航班统计国际进港",
+    //   },
+    //   component: () =>
+    //     import("@/views/statisticalanalysis/Internationaladvance/index.vue"),
+    // },
     {
       path: "/statisticalanalysis/cargoflight",
       name: "Cargoflight",

src/views/statisticalanalysis/cargoflight/index.vue

@@ -102,7 +102,7 @@ export default {
       formItems: [
         {
           prop: "dateTime",
-          inputType: "datetimerange",
+          inputType: "datePicker",
           clearable: true,
           width: "240px",
           options: [],
@@ -128,8 +128,8 @@ export default {
       this.tableData.data2 = [];
       let option = [
         {
-          fd1: data.dateTime[0],
-          fd2: data.dateTime[1],
+          fd1: data.dateTime[0] + " 00:00:00",
+          fd2: data.dateTime[1] + " 23:59:59",
         },
       ];
       this.getQuery(option, null);
@@ -137,6 +137,7 @@ export default {
       this.listname =
         "货机航班综合查询" + data.dateTime[0] + "--" + data.dateTime[1];
       this.listHeader = [
+        "序号",
         "日期",
         "汇总",
         "进港",
@@ -280,6 +281,7 @@ export default {
          */
         const data = this.tableListcop.map((item, index) => {
           return [
+            item.indexs,
             item.dat,
             item.total,
             item.landing,

src/views/statisticalanalysis/cargoperiod/index.vue

@@ -99,7 +99,7 @@ export default {
         ],
         list: [],
       },
-      titleTop: "货机航班综合查询",
+      titleTop: "货机航班时段查询",
       formItems: [
         {
           prop: "dateTime",
@@ -135,7 +135,7 @@ export default {
               "yyyy-MM-dd",
               new Date(new Date(data.dateTime).getTime() - 24 * 60 * 60 * 1000)
             ) + " 00:00:00",
-          fd2: data.dateTime + " 23:00:00",
+          fd2: data.dateTime + " 23:59:59",
         },
       ];
       this.optiontime = [
@@ -164,6 +164,7 @@ export default {
       this.listnames =
         "货机航班计划统计表-小时" + data.dateTime[0] + "--" + data.dateTime[1];
       this.listHeaders = [
+        "序号",
         "日期",
         "t0",
         "t1",
@@ -244,7 +245,37 @@ export default {
           dataContent: data,
         });
         if (code == 0) {
-          this.tableLister = returnData.listValues.filter((i) => i.dat === dat);
+          this.tableLister = returnData.listValues;
+          this.tableLister.forEach((item, index) => {
+            item.indexs = index + 1;
+          });
+          for (let i = 0; i < this.tableLister.length; i++) {
+            this.tableLister[i].alltxt =
+              this.tableLister[i].t0 +
+              this.tableLister[i].t1 +
+              this.tableLister[i].t2 +
+              this.tableLister[i].t3 +
+              this.tableLister[i].t4 +
+              this.tableLister[i].t5 +
+              this.tableLister[i].t6 +
+              this.tableLister[i].t7 +
+              this.tableLister[i].t8 +
+              this.tableLister[i].t9 +
+              this.tableLister[i].t10 +
+              this.tableLister[i].t11 +
+              this.tableLister[i].t12 +
+              this.tableLister[i].t13 +
+              this.tableLister[i].t14 +
+              this.tableLister[i].t15 +
+              this.tableLister[i].t16 +
+              this.tableLister[i].t17 +
+              this.tableLister[i].t18 +
+              this.tableLister[i].t19 +
+              this.tableLister[i].t20 +
+              this.tableLister[i].t21 +
+              this.tableLister[i].t22 +
+              this.tableLister[i].t23;
+          }
           for (let index = 0; index < returnData.listValues.length; index++) {
             this.echartsData.list[index] = new Array(
               returnData.listValues[index].t0,
@@ -293,6 +324,7 @@ export default {
          */
         const data = this.tableListcop.map((item, index) => {
           return [
+            item.indexs,
             item.dat,
             item.total,
             item.landing,
@@ -331,6 +363,7 @@ export default {
          */
         const data = this.tableLister.map((item, index) => {
           return [
+            item.indexs,
             item.dat,
             item.t0,
             item.t1,

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

@@ -26,16 +26,19 @@
             prop="indexs"
             label="序号"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="dat"
             label="时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
             prop="weight"
             label="重量(吨)"
           >
@@ -62,16 +65,19 @@
             prop="indexs"
             label="序号"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="dat"
             label="时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
             prop="flightNum"
             label="重量(吨)"
           >
@@ -98,22 +104,26 @@
             prop="indexs"
             label="序号"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="dat"
             label="时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
             prop="flightNum"
             label="运单数(单)"
           >
           </el-table-column>
           <el-table-column
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
             prop="weight"
             label="重量(吨)"
           >
@@ -140,16 +150,19 @@
             prop="indexs"
             label="序号"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="fdt"
             label="时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
             prop="weight"
             label="重量(吨)"
           >
@@ -177,42 +190,49 @@
             prop="indexs"
             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>
           <el-table-column
             prop="flightNo"
             label="航班号"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="line"
             label="航线"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="stand"
             label="机位"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="totalWeight"
             label="货物总重 (KG)"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="pullWeight"
             label="拉货 (KG)"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <!-- <el-table-column
@@ -255,66 +275,77 @@
             prop="indexs"
             label="序号"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="IATACode"
             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>
           <el-table-column
             prop="flightDate"
             label="执飞日期"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="planLandingTime"
             label="计划降落时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="acLandingTime"
             label="实际降落时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="target"
             label="航程"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="unLoadTime"
             label="卸机时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="planeDownTime_IN"
             label="库区到达时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="depotJoinTime_IN"
             label="货站交接时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="tallyTime_in"
             label="理货时间"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -340,84 +371,98 @@
             prop="indexs"
             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>
           <el-table-column
             prop="planFlightNum"
             label="计划航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="finishFlightNum"
             label="已完成航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="ygmNum"
             label="一个码航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="speNum"
             label="特货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="receiveSureNum"
             label="收运核单航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="securityNum"
             label="安检放行航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="addCargoNum"
             label="加货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="stowageNum"
             label="预配载航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="depotJoinNum"
             label="交接复核航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="planeDownNum"
             label="机下交接航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="pullNum"
             label="拉下航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="pullSureNum"
             label="拉回确认航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -443,60 +488,70 @@
             prop="indexs"
             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>
           <el-table-column
             prop="planFlightNum"
             label="计划航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="finishFlightNum"
             label="已完成航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="speNum"
             label="特货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="unLoadNum"
             label="卸机航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="arriveNum"
             label="库区到达航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="depotJoinNum"
             label="货站交接航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="tallyNum"
             label="理货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="outWarehouseNum"
             label="出库航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -522,96 +577,112 @@
             prop="indexs"
             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>
           <el-table-column
             prop="planFlightNum"
             label="计划航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="finishFlightNum"
             label="已完成航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="speNum"
             label="特货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="enterParkNum"
             label="入园航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="enterCustomsNum"
             label="海关放行航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="toStationNum"
             label="运抵货站航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="securityNum"
             label="安检放行航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="receiveSureNum"
             label="收运核单航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="tallyNum"
             label="理货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="requestDepotJoinNum"
             label="发起货站交接航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="resureNum"
             label="交接复核航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="planeDownNum"
             label="机下交接航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="pullregisterNum"
             label="拉下登记航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="stowageNum"
             label="实配航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -637,66 +708,77 @@
             prop="indexs"
             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>
           <el-table-column
             prop="planFlightNum"
             label="计划航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="finishFlightNum"
             label="已完成航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="speNum"
             label="特货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="unloadNum"
             label="卸机航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="planeDownTimeNum"
             label="机下交接航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="depotJoinNum"
             label="货站交接航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="tallyNum"
             label="理货航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="passCustomsNum"
             label="海关放行航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="outWarehouseNum"
             label="出库航班数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -718,64 +800,81 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="total"
             label="汇总"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="landing"
             label="进港"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="departure"
             label="出港"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="d"
             label="国内"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="i"
             label="国际及地区"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="departure_d"
             label="国内出港"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="landing_d"
             label="国内进港"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="departure_i"
             label="国际及地区出港"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="landing_i"
             label="国际及地区进港"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -797,155 +896,194 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"
             width="100"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="alltxt"
+            label="总和"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t0"
             label="t0"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t1"
             label="t1"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t2"
             label="t2"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t3"
             label="t3"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t4"
             label="t4"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t5"
             label="t5"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t6"
             label="t6"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t7"
             label="t7"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t8"
             label="t8"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t9"
             label="t9"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t10"
             label="t10"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t11"
             label="t11"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t12"
             label="t12"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t13"
             label="t13"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t14"
             label="t14"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t15"
             label="t15"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t16"
             label="t16"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t17"
             label="t17"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t18"
             label="t18"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t19"
             label="t19"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t20"
             label="t20"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t21"
             label="t21"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t22"
             label="t22"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="t23"
             label="t23"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -967,71 +1105,89 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"
             width="100"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="ChannelId"
             label="通道"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="codeNum"
             label="绑图前条码数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="reCodeNum"
             label="绑图前重复条码数据"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="accNum"
             label="加货条码数量"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="reAccNum"
             label="加货重复条码数量"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="pcs"
             label="加货记录的该通道运单件数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="piclvs"
             label="绑图前重码率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="acclvs"
             label="加货重码率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="readlvs"
             label="识读率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="oklvs"
             label="加货准确率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>
@@ -1053,77 +1209,96 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"
             width="100"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="cargoCompany"
             label="代理人"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="ChannelId"
             label="通道"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="codeNum"
             label="绑图前条码数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="reCodeNum"
             label="绑图前重复条码数据"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="accNum"
             label="加货条码数量"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="reAccNum"
             label="加货重复条码数量"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="pcs"
             label="加货记录的该通道运单件数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="piclvs"
             label="绑图前重码率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="acclvs"
             label="加货重码率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="readlvs"
             label="识读率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="oklvs"
             label="加货准确率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+            :align="tableColumnProperty.align"
           >
           </el-table-column>
         </el-table>

src/views/statisticalanalysis/domesticdeparture/index.vue

@@ -38,7 +38,12 @@ export default {
       picShow: true, //图片表格切换
       action: 6,
       dataid: "collection_ecahrt0",
-      listqueryTemplateID: DATACONTENT_ID.modeDomesticexportTable,
+      listqueryTemplateID: [
+        DATACONTENT_ID.modeDomesticexportTable,
+        DATACONTENT_ID.modeDomesticentryTable,
+        DATACONTENT_ID.modeInternationalexportTable,
+        DATACONTENT_ID.modeInternationaladvanceTable,
+      ],
       eledata: null,
       set: "",
       isShow: Echarts,
@@ -57,11 +62,36 @@ export default {
         airport: "",
         dateTime: "",
       },
-      titleTop: "航班统计国内出港",
+      titleTop: "航班统计",
       formItems: [
+        {
+          prop: "fttp",
+          inputType: "select",
+          placeholder: "国内国际",
+          requiredWarning: "",
+          clearable: true,
+          options: [
+            {
+              value: 0,
+              label: "国内出港",
+            },
+            {
+              value: 1,
+              label: "国内进港",
+            },
+            {
+              value: 2,
+              label: "国际出港",
+            },
+            {
+              value: 3,
+              label: "国际进港",
+            },
+          ],
+        },
         {
           prop: "dateTime",
-          inputType: "datetimerange",
+          inputType: "datePicker",
           clearable: true,
           width: "240px",
           options: [],
@@ -85,13 +115,22 @@ export default {
       this.tableData.time = [];
       this.tableData.data1 = [];
       this.tableData.data2 = [];
+      if (data.fttp === 0) {
+        this.action = 6;
+      } else if (data.fttp === 1) {
+        this.action = 7;
+      } else if (data.fttp === 2) {
+        this.action = 8;
+      } else if (data.fttp === 3) {
+        this.action = 9;
+      }
       let option = [
         {
-          fd1: data.dateTime[0],
-          fd2: data.dateTime[1],
+          fd1: data.dateTime[0] + " 00:00:00",
+          fd2: data.dateTime[1] + " 23:59:59",
         },
       ];
-      this.getQuery(option, null);
+      this.getQuery(option, data.fttp);
       this.listname =
         "航班统计国内出港" + data.dateTime[0] + "--" + data.dateTime[1];
       this.listHeader = [
@@ -115,7 +154,7 @@ export default {
     async getQuery(data, dat) {
       try {
         const { code, returnData } = await Query({
-          id: this.listqueryTemplateID,
+          id: this.listqueryTemplateID[dat],
           dataContent: data,
         });
         if (code == 0) {

src/views/statisticalanalysis/domesticinbound/index.vue

@@ -61,7 +61,7 @@ export default {
       formItems: [
         {
           prop: "dateTime",
-          inputType: "datetimerange",
+          inputType: "datePicker",
           clearable: true,
           width: "240px",
           options: [],
@@ -87,8 +87,8 @@ export default {
       this.tableData.data2 = [];
       let option = [
         {
-          fd1: data.dateTime[0],
-          fd2: data.dateTime[1],
+          fd1: data.dateTime[0] + " 00:00:00",
+          fd2: data.dateTime[1] + " 23:59:59",
         },
       ];
       this.getQuery(option, null);

src/views/statisticalanalysis/gantryframe/index.vue

@@ -134,6 +134,7 @@ export default {
       if (data.pps === 1) {
         (this.listqueryTemplateID = DATACONTENT_ID.modeChannelbased),
           (this.listHeader = [
+            "序号",
             "日期",
             "通道",
             "绑图前条码数",
@@ -150,6 +151,7 @@ export default {
       } else if (data.pps === 2) {
         (this.listqueryTemplateID = DATACONTENT_ID.modeAgentbased),
           (this.listHeader = [
+            "序号",
             "日期",
             "代理人",
             "通道",
@@ -325,6 +327,7 @@ export default {
         const data = this.tableListcop.map((item, index) => {
           if (this.uppps === 1) {
             return [
+              item.indexs,
               item.dat,
               item.ChannelId,
               item.codeNum,
@@ -339,6 +342,7 @@ export default {
             ];
           } else if (this.uppps === 2) {
             return [
+              item.indexs,
               item.dat,
               item.cargoCompany,
               item.ChannelId,