行李全流程服务水平百分比修改

public/config.js

@@ -171,6 +171,7 @@ window.SERVICE_ID = {
   baggageServicePercentage: 1853, // 行李全流程服务水平百分比
   workerqueryAll: 200502,//工作者查询
   workloadTableID: 200501,//工作量统计
+  precentTableID: 200503,//行李全流程服务水平百分比
 
   /***-----速运行李------***/
   expressTransportationUpload: 20034, // 速运行李数据上传

src/views/statisticsCharts/components/tableformbrs.vue

@@ -730,7 +730,7 @@ export default {
     async getQuery () {
       try {
         this.loading = true
-        if (this.upid === '9') {
+        if (this.upid === '9' || this.upid === '8') {
           const { code, returnData } = await TempQuery({
             serviceId: Number(this.dataId),
             dataContent: this.dataContent,
@@ -740,6 +740,12 @@ export default {
             this.tableCols = returnData.columnSet
             this.serviceId = returnData.submitID
             this.loading = false
+            if (this.upid == 8) {
+              this.tableData.forEach(element => {
+                element.lv = element.lv.toFixed(2)
+                element.time = this.dataContent['fd1'] + '至' + this.dataContent['fd2']
+              })
+            }
           }
         } else {
           const { code, returnData } = await TempQuery({
@@ -878,11 +884,6 @@ export default {
 
 
 
-              });
-            } else if (this.upid == 8) {
-              this.tableData.forEach(element => {
-                element.lv = element.lv.toFixed(2)
-                element.time = this.dataContent[0] + '至' + this.dataContent[1]
               });
             }
             // setTimeout(() => {

src/views/statisticsCharts/views/report/Percentageofbaggage.vue

@@ -10,7 +10,7 @@
       width="800px"
       tableHeight="750"
     /> -->
-    <Tableformbrs :data-id="dataId" upid="8" :textShow="textShow" :isloadings="isloadings" :data-content="dataContent" :rows="12" label-width="140px" :min-height="70" width="800px" tableHeight="750"/>
+    <Tableformbrs :data-id="dataId" upid="8" :textShow="textShow" :isloadings="isloadings" :data-content="dataContent" :rows="12" label-width="140px" :min-height="70" width="800px" tableHeight="750" />
   </div>
 </template>
 <script>
@@ -18,7 +18,7 @@ import StatisticsHeader from '../../components/statisticsHeader.vue'
 // import Tableformcp from "../../components/tableformcp";
 import Tableformbrs from '../../components/tableformbrs'
 import TableDialog from '../../components/TableDialog.vue'
-import { Format } from '@/utils/validate'
+import { parseTime } from '@/utils/index'
 export default {
   name: 'ReportStatistics',
   data () {
@@ -30,10 +30,11 @@ export default {
         company: '',
         timedim: '',
         trd: [],
+        di_type: ''
       },
       isloadings: 1,
       dataContent: [],
-      dataId: SERVICE_ID.baggageServicePercentage,
+      dataId: SERVICE_ID.precentTableID,
       formItems: [
         {
           prop: 'dateTime',
@@ -42,6 +43,27 @@ export default {
           width: '240px',
           options: [],
         },
+        {
+          prop: 'di_type',
+          inputType: 'select',
+          placeholder: '国内国际',
+          requiredWarning: '请先选择国内国际',
+          clearable: true,
+          options: [
+            {
+              value: '全部',
+              label: '全部',
+            },
+            {
+              value: '国内',
+              label: '国内',
+            },
+            {
+              value: '国际',
+              label: '国际',
+            },
+          ],
+        },
       ],
       dialogFlag: false,
       dialogTitle: '',
@@ -55,18 +77,25 @@ export default {
     TableDialog,
   },
   mounted () {
-    this.dataContent = [
-      this.formData.dateTime[0] || Format('yyyy-MM-dd', new Date()),
-      this.formData.dateTime[1] || Format('yyyy-MM-dd', new Date()),
-    ]
+    const defaultTime = new Date().getTime() - 24 * 60 * 60 * 1000
+    const defaultTimeFormat = parseTime(defaultTime, '{y}-{m}-{d}')
+    this.formData.dateTime[0] = defaultTimeFormat
+    this.formData.dateTime[1] = parseTime(new Date(), '{y}-{m}-{d}')
+    this.formData.di_type = '全部'
+    this.dataContent = {
+      fd1: this.formData.dateTime[0] || defaultTimeFormat,
+      fd2: this.formData.dateTime[1] || parseTime(new Date(), '{y}-{m}-{d}'),
+      di_type: this.formData.di_type || '全部'
+    }
   },
   methods: {
     getFormData (data) {
       this.textShow = data.trd
-      this.dataContent = [
-        data.dateTime[0],
-        data.dateTime[1]
-      ]
+      this.dataContent = {
+        fd1: data.dateTime[0],
+        fd2: data.dateTime[1],
+        di_type: data.di_type
+      }
     },
     exportup () {
       this.isloadings = this.isloadings += 1
@@ -79,8 +108,8 @@ export default {
       ) {
         const queryParams = [
           this.formData.airport || 'PEK',
-          row.fd || Format('yyyy-MM-dd', new Date()),
-          row.fd || Format('yyyy-MM-dd', new Date()),
+          row.fd || parseTime(new Date(), '{y}-{m}-{d'),
+          row.fd || parseTime(new Date(), '{y}-{m}-{d'),
           ...Array(4).fill(this.formData.company?.join(',') || '国航'),
         ]
         const flow = column.property