1

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

@@ -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,10 @@ 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 index = 0; index < returnData.listValues.length; index++) {
             this.echartsData.list[index] = new Array(
               returnData.listValues[index].t0,
@@ -293,6 +297,7 @@ export default {
          */
         const data = this.tableListcop.map((item, index) => {
           return [
+            item.indexs,
             item.dat,
             item.total,
             item.landing,
@@ -331,6 +336,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

@@ -718,6 +718,12 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"
@@ -797,6 +803,12 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"
@@ -967,6 +979,12 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"
@@ -1053,6 +1071,12 @@
           :summary-method="totalOutPrice"
           :show-summary="tableProps.showSummary"
         >
+          <el-table-column
+            prop="indexs"
+            label="序号"
+            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
+          >
+          </el-table-column>
           <el-table-column
             prop="dat"
             label="日期"

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/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,