chenrui  před 1 rokem
rodič
revize
d2e2082e67

+ 2 - 1
public/staticConfig.js

@@ -9,7 +9,8 @@ window.PLATFROM_CONFIG = {
   editRule: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[`!@#$%^&*()_+{}":?><`,./';=-])[\da-zA-Z`!@#$%^&*()_+{}":?><`,./';=-]{8,}$/
 }
 
-const baseNewUrl = window.location.hostname
+// const baseNewUrl = window.location.hostname
+const baseNewUrl = '10.211.67.177'
 switch (baseNewUrl) {
   case '10.211.66.23':
     PLATFROM_CONFIG = {

+ 142 - 29
src/views/statisticsCharts/components/tableformbrs.vue

@@ -177,75 +177,135 @@
           :show-summary="true"
         >
           <el-table-column
-            prop="a1"
+            prop="fd"
             label="日期"
           >
           </el-table-column>
           <el-table-column label="中转行李流向">
-            <el-table-column label="D-D">
+            <el-table-column label="D-D" v-if="DD">
               <el-table-column
-                prop="a2"
-                label="转出"
+                prop="need_trans_flight_dd"
+                label="进港中转航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a3"
-                label="未转出"
+                prop="finish_trans_flight_dd"
+                label="中转出航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a4"
+                prop="need_trans_bag_dd"
+                label="须中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="finish_trans_bag_dd"
+                label="完成中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="not_trans_bag_dd"
+                label="未中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="Transferout_dd"
                 label="转出成功率"
               >
               </el-table-column>
             </el-table-column>
-            <el-table-column label="D-I">
+            <el-table-column label="D-I"  v-if="DI">
               <el-table-column
-                prop="a5"
-                label="转出"
+                prop="need_trans_flight_di"
+                label="进港中转航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a6"
-                label="未转出"
+                prop="finish_trans_flight_di"
+                label="中转出航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a7"
+                prop="need_trans_bag_di"
+                label="须中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="finish_trans_bag_di"
+                label="完成中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="not_trans_bag_di"
+                label="未中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="Transferout_di"
                 label="转出成功率"
               >
               </el-table-column>
             </el-table-column>
-            <el-table-column label="I-I">
+            <el-table-column label="I-I"  v-if="II">
               <el-table-column
-                prop="a8"
-                label="转出"
+                prop="need_trans_flight_ii"
+                label="进港中转航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a9"
-                label="未转出"
+                prop="finish_trans_flight_ii"
+                label="中转出航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a10"
+                prop="need_trans_bag_ii"
+                label="须中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="finish_trans_bag_ii"
+                label="完成中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="not_trans_bag_ii"
+                label="未中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="Transferout_ii"
                 label="转出成功率"
               >
               </el-table-column>
             </el-table-column>
-            <el-table-column label="I-D">
+            <el-table-column label="I-D"  v-if="ID">
               <el-table-column
-                prop="a11"
-                label="转出"
+                prop="need_trans_flight_id"
+                label="进港中转航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a12"
-                label="未转出"
+                prop="finish_trans_flight_id"
+                label="中转出航班数"
               >
               </el-table-column>
               <el-table-column
-                prop="a13"
+                prop="need_trans_bag_id"
+                label="须中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="finish_trans_bag_id"
+                label="完成中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="not_trans_bag_id"
+                label="未中转行李数"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="Transferout_id"
                 label="转出成功率"
               >
               </el-table-column>
@@ -253,21 +313,26 @@
           </el-table-column>
           <el-table-column
             prop="a14"
-            label="进港中转航班数"
+            label="中转航班数总数"
           >
           </el-table-column>
           <el-table-column
             prop="a15"
-            label="中转总数"
+            label="中转出航班数总数"
           >
           </el-table-column>
           <el-table-column
             prop="a16"
-            label="未转出总件数"
+            label="须中转行李数总数"
           >
           </el-table-column>
           <el-table-column
             prop="a17"
+            label="完成中转行李数总数"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="a18"
             label="转出成功率"
           >
           </el-table-column>
@@ -968,6 +1033,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    textShow: {
+      type: Array,
+      default: () => [],
+    }
   },
   data() {
     return {
@@ -987,6 +1056,10 @@ export default {
         //   cp: "96.56%",
         // },
       ],
+      DD: true,
+      DI: true,
+      II: true,
+      ID: true,    
     }
   },
   components: {
@@ -1006,6 +1079,32 @@ export default {
         this.downFile()
       },
     },
+    textShow: {
+      handler(val) {
+        if (val.length === 0) {
+          this.DD = true
+          this.DI = true
+          this.II = true
+          this.ID = true
+        } else {
+          this.DD = false
+          this.DI = false
+          this.II = false
+          this.ID = false
+          val.forEach(element => {
+            if (element === 'D-D') {
+              this.DD = true
+            } else if (element === 'D-I') {
+              this.DI = true
+            } else if (element === 'I-I') {
+              this.II = true
+            } else if (element === 'I-D') {
+              this.ID = true
+            }
+          });
+        }
+      },
+    },
   },
   computed: {
     dataTableContentStyle() {
@@ -1028,7 +1127,7 @@ export default {
       try {
         this.loading = true
         const { code, returnData } = await TempQuery({
-          id: this.dataId,
+          id: Number(this.dataId),
           dataContent: this.dataContent,
         })
         if (code == 0) {
@@ -1094,6 +1193,20 @@ export default {
           this.tableCols = returnData.columnSet
           this.serviceId = returnData.submitID
           this.loading = false
+          if(this.upid == 4){
+            this.tableData.forEach(element => {
+              element.Transferout_dd = (element.finish_trans_bag_dd * 100 / element.need_trans_bag_dd).toFixed(2) + '%'
+              element.Transferout_di = (element.finish_trans_bag_di * 100 / element.need_trans_bag_di).toFixed(2) + '%'
+              element.Transferout_ii = (element.finish_trans_bag_ii * 100 / element.need_trans_bag_ii).toFixed(2) + '%'
+              element.Transferout_id = (element.finish_trans_bag_id * 100 / element.need_trans_bag_id).toFixed(2) + '%'
+              element.a14 = element.need_trans_flight_dd + element.need_trans_flight_di + element.need_trans_flight_ii + element.need_trans_flight_id
+              element.a15 =  element.finish_trans_flight_dd + element.finish_trans_flight_di + element.finish_trans_flight_ii + element.finish_trans_flight_id
+              element.a16 =  element.need_trans_bag_dd + element.need_trans_bag_di + element.need_trans_bag_ii + element.need_trans_bag_id
+              element.a17 =  element.finish_trans_bag_dd + element.finish_trans_bag_di + element.finish_trans_bag_ii + element.finish_trans_bag_id
+              element.a18 = (element.a17 * 100 / element.a16).toFixed(2) + '%'
+            });
+          }
+          console.log()
           // setTimeout(() => {
           //   this.initTableData();
           //   this.loading = false;

+ 59 - 13
src/views/statisticsCharts/views/report/transferDirectionTable.vue

@@ -40,14 +40,65 @@ export default {
   name: 'ReportStatistics',
   data() {
     return {
+      textShow: '全部',
       formData: {
         airport: '',
         dateTime: '',
       },
       isloadings: 1,
       dataContent: [],
-      dataId: '1840',
+      dataId: '1846',
       formItems: [
+        {
+          prop: 'td',
+          inputType: 'select',
+          placeholder: '全部',
+          requiredWarning: '',
+          clearable: true,
+          options: [
+            {
+              value: 'D-D',
+              label: 'D-D',
+            },
+            {
+              value: 'D-I',
+              label: 'D-I',
+            },
+            {
+              value: 'I-I',
+              label: 'I-I',
+            },
+            {
+              value: 'I-D',
+              label: 'I-D',
+            },
+          ],
+        },
+        {
+          prop: 'ts',
+          inputType: 'select',
+          placeholder: '全部',
+          requiredWarning: '',
+          clearable: true,
+          options: [
+            {
+              value: 'T2-T2',
+              label: 'T2-T2',
+            },
+            {
+              value: 'T2-T3',
+              label: 'T2-T3',
+            },
+            {
+              value: 'T3-T3',
+              label: 'T3-T3',
+            },
+            {
+              value: 'T3-T2',
+              label: 'T3-T2',
+            },
+          ],
+        },
         {
           prop: 'airport',
           inputType: 'select',
@@ -126,16 +177,13 @@ export default {
       '日',
       '日',
       '日',
+      'PEK',
+      Format('yyyy-MM-dd', new Date()),
+      Format('yyyy-MM-dd', new Date()),
       '国航',
       '国航',
       '国航',
       '国航',
-      Format('yyyy-MM-dd', new Date()),
-      Format('yyyy-MM-dd', new Date()),
-      'PEK',
-      Format('yyyy-MM-dd', new Date()),
-      Format('yyyy-MM-dd', new Date()),
-      'PEK',
     ]
   },
   methods: {
@@ -144,17 +192,15 @@ export default {
         data.timedim,
         data.timedim,
         data.timedim,
+        'PEK',
+        data.dateTime[0],
+        data.dateTime[1],
         data.company,
         data.company,
         data.company,
         data.company,
-        data.dateTime[0],
-        data.dateTime[1],
-        'PEK',
-        data.dateTime[0],
-        data.dateTime[1],
-        'PEK',
       ]
+      this.textShow = data.t
     },
     exportup() {
       this.isloadings = this.isloadings += 1

+ 37 - 14
src/views/statisticsCharts/views/report/transitTables.vue

@@ -21,6 +21,7 @@
     <Tableformbrs
       :data-id="dataId"
       upid="4"
+      :textShow = 'textShow'
       :isloadings="isloadings"
       :data-content="dataContent"
       :rows="12"
@@ -40,14 +41,42 @@ export default {
   name: 'ReportStatistics',
   data() {
     return {
+      textShow: null,
       formData: {
         airport: '',
         dateTime: '',
+        trd: []
       },
       isloadings: 1,
       dataContent: [],
-      dataId: '1841',
+      dataId: '1845',
       formItems: [
+        {
+          prop: 'trd',
+          inputType: 'select',
+          placeholder: '',
+          requiredWarning: '',
+          clearable: true,
+          multiple:true,
+          options: [
+            {
+              value: 'D-D',
+              label: 'D-D',
+            },
+            {
+              value: 'D-I',
+              label: 'D-I',
+            },
+            {
+              value: 'I-I',
+              label: 'I-I',
+            },
+            {
+              value: 'I-D',
+              label: 'I-D',
+            },
+          ],
+        },
         {
           prop: 'airport',
           inputType: 'select',
@@ -126,35 +155,29 @@ export default {
       '日',
       '日',
       '日',
+      'PEK',
+      Format('yyyy-MM-dd', new Date()),
+      Format('yyyy-MM-dd', new Date()),
       '国航',
       '国航',
       '国航',
       '国航',
-      Format('yyyy-MM-dd', new Date()),
-      Format('yyyy-MM-dd', new Date()),
-      'PEK',
-      Format('yyyy-MM-dd', new Date()),
-      Format('yyyy-MM-dd', new Date()),
-      'PEK',
     ]
   },
   methods: {
     getFormData(data) {
-      debugger
+      this.textShow = data.trd
       this.dataContent = [
         data.timedim,
         data.timedim,
         data.timedim,
+        data.airport ? data.airport : 'PEK',
+        data.dateTime[0],
+        data.dateTime[1],
         data.company,
         data.company,
         data.company,
         data.company,
-        data.dateTime[0],
-        data.dateTime[1],
-        data.airport ? data.airport : 'PEK',
-        data.dateTime[0],
-        data.dateTime[1],
-        data.airport ? data.airport : 'PEK',
       ]
     },
     exportup() {