大屏接口修改、工作量统计接口对接

public/config.js

@@ -29,6 +29,11 @@ window.SERVICE_ID = {
   dashboardMap: 200248, // 首页-行李分布
   dashboardCompanyData: 200249, // 首页-航司行李量排行
   warningInfo: 10201, // 预警报警信息
+  dashboardDateFlightData: 200301, // 首页-当日进出港航班数
+  dashboardDateBaggageData: 200302, // 首页-当日行李量
+  dashboardHourBaggageIn: 200303, // 首页-每日小时行李量-进港
+  dashboardHourBaggageOut: 200304, // 首页-每日小时行李量-离港
+  dashboardHourBaggageTrans: 200305, // 首页-每日小时行李量-中转
 
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
@@ -157,6 +162,8 @@ window.SERVICE_ID = {
   LuggagecId: 12002, // 航司行李量数量 && // 航线行李量数量
   LuggageHourId: 200246, // 行李小时量
   LuggageNodeId: 200245, // 节点位置
+  workload: 200306, // 工作量
+  agentCode: 200307, // 操作者下拉
 }
 
 window.AIRPORT_ID = {

public/staticConfig.js

@@ -51,8 +51,8 @@ switch (baseNewUrl) {
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,
-      baseNewUrl: 'http://10.211.66.23:8082',
-      baseURLCA: 'http://10.211.66.23:8082',
+      baseNewUrl: 'http://120.26.64.82:8765',
+      baseURLCA: 'http://120.26.64.82:8765',
       fileUrl: 'http://10.211.66.23:8082',
       expressUrl: 'http://10.211.67.177:8043',
       tempUrl: 'http://10.211.67.163:16300', // 1.0临时地址

src/views/dashboard/index.vue

@@ -153,6 +153,7 @@ import { parseTime } from '@/utils'
 import { getAuthData } from '@/utils/validate'
 
 const defaultDate = parseTime(new Date(), '{y}-{m}-{d}')
+// const defaultDate = '2023-06-19'
 const barOption = {
   tooltip: {
     trigger: 'axis',
@@ -386,7 +387,11 @@ export default {
             serviceId: this.queryId,
           }
         }
-        const { code, returnData: listValues, message } = await Query(params)
+        const {
+          code,
+          returnData: { listValues },
+          message,
+        } = await Query(params)
         if (String(code) !== '0') {
           throw new Error(message || '失败')
         }
@@ -400,21 +405,20 @@ export default {
       }
       this.loading = false
     },
-    // 当日航班和行李数量
-    async getDateData(io_type) {
+    // 当日数量和小时数量
+    async getDateData(serviceId) {
       try {
         const {
           code,
           returnData: listValues,
           message,
         } = await Query({
-          serviceId: SERVICE_ID.dashboardDateData,
+          serviceId,
           dataContent: [
             {
               fd1: defaultDate,
               fd2: defaultDate,
               airport: this.currentAirport,
-              io_type,
             },
           ],
           pageSize: 9999,
@@ -453,8 +457,8 @@ export default {
         const max = Math.max(...listValues.map(item => Number(item.bags)))
         this.companyData = listValues.map(item => ({
           name: item.iata_code,
-          count: item.bags,
-          percentage: (item.bags / max).toFixed(2) * 100,
+          count: Number(item.bags),
+          percentage: max ? (Number(item.bags) / max).toFixed(2) * 100 : 0,
         }))
       } catch (error) {
         console.error(error)
@@ -493,73 +497,83 @@ export default {
         console.error(error)
       }
     },
-    // 小时行李处理量
-    async getHourData(io_type) {
-      try {
-        const {
-          code,
-          returnData: listValues,
-          message,
-        } = await Query({
-          serviceId: SERVICE_ID.dashboardHourData,
-          dataContent: [
-            {
-              airport: this.currentAirport,
-              fd1: defaultDate,
-              fd2: defaultDate,
-              io_type,
-            },
-          ],
-          pageSize: 9999,
-        })
-        if (String(code) !== '0') {
-          throw new Error(message || '失败')
-        }
-        return listValues
-      } catch (error) {
-        console.error(error)
-        return []
-      }
-    },
     async getAllData() {
       this.loading = true
       try {
-        const io_types = ['离港', '进港', '中转']
+        const serviceIdList = [
+          SERVICE_ID.dashboardDateFlightData,
+          SERVICE_ID.dashboardDateBaggageData,
+          SERVICE_ID.dashboardHourBaggageIn,
+          SERVICE_ID.dashboardHourBaggageOut,
+          SERVICE_ID.dashboardHourBaggageTrans,
+        ]
         const [
-          [outDateData],
-          [inDateData],
-          [transDateData],
-          outHourData,
+          [dateFlightData],
+          [dateBaggageData],
           inHourData,
+          outHourData,
           transHourData,
         ] = await Promise.all([
-          ...io_types.map(io_type => this.getDateData(io_type)),
-          ...io_types.map(io_type => this.getHourData(io_type)),
+          ...serviceIdList.map(id => this.getDateData(id)),
           this.getCompanyData(),
           this.getMap(),
         ])
-        this.arrivalFlightCount = Number(inDateData.flights)
-        this.departureFlightCount = Number(outDateData.flights)
-        this.baggageCountItems[0].num =
-          Number(inDateData.bags) + Number(outDateData.bags)
-        this.baggageCountItems[1].num = Number(inDateData.bags)
-        this.baggageCountItems[2].num = Number(outDateData.bags)
-        this.baggageCountItems[3].num = Number(transDateData.bags)
-        this.inHourDataOption.xAxis.data = inHourData.map(
-          item => `${item.dat}${item.dat <= 12 ? 'am' : 'pm'}`
-        )
-        this.inHourDataOption.series[0].data = inHourData.map(item => item.bags)
-        this.outHourDataOption.xAxis.data = outHourData.map(
-          item => `${item.dat}${item.dat <= 12 ? 'am' : 'pm'}`
+        this.arrivalFlightCount = Number(dateFlightData.flights_in)
+        this.departureFlightCount = Number(dateFlightData.flights_out)
+        this.baggageCountItems[0].num = Number(dateBaggageData.bags)
+        this.baggageCountItems[1].num = Number(dateBaggageData.bags_in)
+        this.baggageCountItems[2].num = Number(dateBaggageData.bags_out)
+        this.baggageCountItems[3].num = Number(dateBaggageData.transfer_bags)
+        const sortedInHoutData = this._.sortBy(inHourData, 'dat')
+        const sortedOutHoutData = this._.sortBy(outHourData, 'dat')
+        const sortedTransHoutData = this._.sortBy(transHourData, 'dat')
+        this.inHourDataOption.xAxis.data = sortedInHoutData.reduce((prev, curr) => {
+          if ((curr.dat ?? '') !== '') {
+            prev.push(`${curr.dat}${curr.dat <= 12 ? 'am' : 'pm'}`)
+          }
+          return prev
+        }, [])
+        this.inHourDataOption.series[0].data = sortedInHoutData.reduce(
+          (prev, curr) => {
+            if ((curr.dat ?? '') !== '') {
+              prev.push(Number(curr.bags))
+            }
+            return prev
+          },
+          []
         )
-        this.outHourDataOption.series[0].data = outHourData.map(
-          item => item.bags
+        this.outHourDataOption.xAxis.data = sortedOutHoutData.reduce((prev, curr) => {
+          if ((curr.dat ?? '') !== '') {
+            prev.push(`${curr.dat}${curr.dat <= 12 ? 'am' : 'pm'}`)
+          }
+          return prev
+        }, [])
+        this.outHourDataOption.series[0].data = sortedOutHoutData.reduce(
+          (prev, curr) => {
+            if ((curr.dat ?? '') !== '') {
+              prev.push(Number(curr.bags))
+            }
+            return prev
+          },
+          []
         )
-        this.transHourDataOption.xAxis.data = transHourData.map(
-          item => `${item.dat}${item.dat <= 12 ? 'am' : 'pm'}`
+        this.transHourDataOption.xAxis.data = sortedTransHoutData.reduce(
+          (prev, curr) => {
+            if ((curr.dat ?? '') !== '') {
+              prev.push(`${curr.dat}${curr.dat <= 12 ? 'am' : 'pm'}`)
+            }
+            return prev
+          },
+          []
         )
-        this.transHourDataOption.series[0].data = transHourData.map(
-          item => item.bags
+        this.transHourDataOption.series[0].data = sortedTransHoutData.reduce(
+          (prev, curr) => {
+            if ((curr.dat ?? '') !== '') {
+              prev.push(Number(curr.bags))
+            }
+            return prev
+          },
+          []
         )
       } catch (error) {
         console.error(error)

src/views/newQuery/components/search.vue

@@ -105,10 +105,10 @@ const comparisonOperatorOptions = [
     label: '不为空',
     value: 'is not Null',
   },
-  {
-    label: '包含',
-    value: 'like',
-  },
+  // {
+  //   label: '包含',
+  //   value: 'like',
+  // },
 ]
 
 export default {

src/views/newRole/css/index.scss

@@ -154,7 +154,9 @@
           margin-right: 16px;
         }
         .contents2{
+          width: 0;
           .newRole-content-left-bottom{
+            width: 100%;
             padding: 0 24px;
             ::v-deep .multipleTable {
               .DisabledSelection .cell {

src/views/newScene/components/advanceQuery.vue

@@ -108,10 +108,10 @@ const comparisonOperatorOptions = [
     label: '不为空',
     value: 'is not Null'
   },
-  {
-    label: '包含',
-    value: 'like'
-  }
+  // {
+  //   label: '包含',
+  //   value: 'like'
+  // }
 ]
 
 export default {

src/views/newScene/index.vue

@@ -14,8 +14,9 @@
         </el-table-column>
         <el-table-column label="操作" width="300px">
           <template slot-scope="scope">
-            <el-button plain type="primary" @click="handleEdit(scope.row)" size="small">编辑</el-button>
-            <el-button plain type="danger" @click="handleRemove(scope.row)" size="small">删除</el-button>
+            <el-button type="primary" plain @click="handleEdit(scope.row)" size="small">编辑规则</el-button>
+            <el-button type="primary" plain @click="handleEditCj(scope.row)" size="small">编辑策略</el-button>
+            <el-button type="danger" plain @click="handleRemove(scope.row)" size="small">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +159,14 @@ export default {
       this.remObj = row
       this.tableMix = JSON.parse(row.alarmscenerule)
     },
+    handleEditCj (row) {
+      this.$router.push({
+        path: 'alarmstrategySetting',
+        query: {
+          alarmsceneID: row.alarmsceneID
+        }
+      })
+    },
     //删除
     handleRemove (row) {
       this.rmFlag = true

src/views/statisticsCharts/components/commonBarStatisticsCharts.vue

@@ -48,6 +48,7 @@ export default {
       chartHeight: '70vh',
       hasChartData: false,
       seriesKey: 'seriesData',
+      xAxisKey: 'flight_date',
       filters: [],
       tableData: [],
       params: [],
@@ -222,10 +223,13 @@ export default {
       this.setChartHeight()
     },
     querySettings: {
-      handler ({ seriesKey, filters }) {
+      handler ({ seriesKey, filters, xAxisKey }) {
         if (seriesKey) {
           this.seriesKey = seriesKey
         }
+        if (xAxisKey) {
+          this.xAxisKey = xAxisKey
+        }
         if (filters?.length) {
           this.filters = filters
         }
@@ -263,7 +267,6 @@ export default {
     getFormData (formData) {
       this.resetDatas()
 
-      let id
       let params = {}
       params = JSON.parse(JSON.stringify(formData));
       params.fd1 = formData.dateTime[0]
@@ -372,7 +375,7 @@ export default {
         this.seriesKey = 'exception_num'
       }
       for (let i = 0; i < filteredList.length; i++) {
-        xAxisData.push(filteredList[i].flight_date)
+        xAxisData.push(filteredList[i][this.xAxisKey])
         seriesDatas.push(filteredList[i][this.seriesKey])
         if (i > 0) {
           if (filteredList[i - 1][this.seriesKey] > 0) {

src/views/statisticsCharts/components/statisticsHeader.vue

@@ -14,7 +14,7 @@
         :prop="item.prop"
         :label="item.label"
         :style="{
-          width: item.width || '120px'
+          width: item.width || '120px',
         }"
       >
         <template v-if="item.inputType === 'input'">
@@ -104,32 +104,32 @@ export default {
   props: {
     title: {
       type: String,
-      default: ''
+      default: '',
     },
     items: {
       type: Array,
-      default: undefined
+      default: undefined,
     },
     customItems: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     data: {
       type: Object,
-      default: undefined
+      default: undefined,
     },
     buttonText: {
       type: String,
-      default: '查询'
+      default: '查询',
     },
     withExport: {
       type: Boolean,
-      default: true
+      default: true,
     },
     withSetting: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
@@ -155,24 +155,24 @@ export default {
           options: [
             {
               value: '全部',
-              label: '全部'
+              label: '全部',
             },
             {
               value: '航线',
-              label: '航线'
+              label: '航线',
             },
             {
               value: '基地分公司',
-              label: '基地分公司'
+              label: '基地分公司',
             },
             {
               value: '航站',
-              label: '航站'
+              label: '航站',
             },
             {
               value: '航站楼',
-              label: '航站楼'
-            }
+              label: '航站楼',
+            },
           ],
           changeHandler(value) {
             this.setInOrOutOptions(value)
@@ -180,7 +180,7 @@ export default {
               航线: 'airline',
               基地分公司: 'area',
               航站: 'airport',
-              航站楼: 'terminal'
+              航站楼: 'terminal',
             }
             Object.entries(rangeMap).forEach(([k, v]) => {
               const theItem = this.formItems.find(item => item.prop === v)
@@ -191,7 +191,7 @@ export default {
                 theItem && (theItem.disabled = true)
               }
             })
-          }
+          },
         },
         {
           prop: 'inOrOut',
@@ -199,7 +199,7 @@ export default {
           placeholder: '进离港',
           requiredWarning: '请先选择进离港',
           clearable: true,
-          options: []
+          options: [],
         },
         {
           prop: 'interval',
@@ -210,28 +210,28 @@ export default {
           options: [
             {
               value: '日',
-              label: '按日统计'
+              label: '按日统计',
             },
             {
               value: '月',
-              label: '按月统计'
+              label: '按月统计',
             },
             {
               value: '季',
-              label: '按季统计'
+              label: '按季统计',
             },
             {
               value: '年',
-              label: '按年统计'
-            }
-          ]
+              label: '按年统计',
+            },
+          ],
         },
         {
           prop: 'dateTime',
           inputType: 'datePicker',
           clearable: true,
           width: '240px',
-          requiredWarning: '请先选择统计时间范围'
+          requiredWarning: '请先选择统计时间范围',
         },
         {
           prop: 'airline',
@@ -244,7 +244,7 @@ export default {
           disabled: true,
           queryId: SERVICE_ID.airlineOptions,
           setKey: 'a2',
-          options: []
+          options: [],
         },
         {
           prop: 'area',
@@ -255,7 +255,7 @@ export default {
           disabled: true,
           queryId: SERVICE_ID.areaOptions,
           setKey: 'a5',
-          options: []
+          options: [],
         },
         {
           prop: 'airport',
@@ -268,7 +268,7 @@ export default {
           disabled: true,
           queryId: SERVICE_ID.AirportId,
           setKey: 'a2',
-          options: []
+          options: [],
         },
         {
           prop: 'terminal',
@@ -279,16 +279,16 @@ export default {
           disabled: true,
           queryId: SERVICE_ID.TerminalId,
           setKey: 'a2',
-          options: []
-        }
-      ]
+          options: [],
+        },
+      ],
     }
   },
   computed: {
     ...mapGetters(['savedFormDataMap']),
     formDataObj() {
       return JSON.parse(JSON.stringify(this.formData))
-    }
+    },
   },
   watch: {
     items: {
@@ -296,25 +296,28 @@ export default {
         val && (this.formItems = val)
       },
       deep: true,
-      immediate: true
+      immediate: true,
     },
     data: {
       handler(val) {
         val && (this.formData = val)
       },
       deep: true,
-      immediate: true
+      immediate: true,
     },
     formDataObj: {
       handler(val, oldVal) {
         this.formItems.forEach(item => {
-          if (item.changeHandler && String(val[item.prop]) !== String(oldVal[item.prop])) {
+          if (
+            item.changeHandler &&
+            String(val[item.prop]) !== String(oldVal[item.prop])
+          ) {
             item.changeHandler.call(this, val[item.prop])
           }
         })
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   created() {
     this.customItems.forEach(item => {
@@ -331,7 +334,12 @@ export default {
     const savedFormData = this.savedFormDataMap[this.$route.name]
     this.formItems.forEach(item => {
       if (item.queryId && item.setKey) {
-        this.getOptions(item.queryId, item.setKey, item.prop)
+        this.getOptions(
+          item.prop,
+          item.queryId,
+          item.setKey,
+          item.setLabel ?? item.setKey
+        )
       }
       if (savedFormData?.[item.prop]) {
         this.formData[item.prop] = savedFormData[item.prop]
@@ -345,7 +353,10 @@ export default {
     getData() {
       try {
         this.formItems.forEach(item => {
-          if (item.requiredWarning && (!this.formData[item.prop] || this.formData[item.prop].length === 0)) {
+          if (
+            item.requiredWarning &&
+            (!this.formData[item.prop] || this.formData[item.prop].length === 0)
+          ) {
             throw new Error(item.requiredWarning)
           }
         })
@@ -365,7 +376,7 @@ export default {
       }
       this.$emit('getFormData', this.formData)
       this.$store.dispatch('savedSettings/saveFormData', {
-        formData: this.formData
+        formData: this.formData,
       })
     },
     exportClickHandler() {
@@ -375,7 +386,9 @@ export default {
       this.$emit('setting')
     },
     setInOrOutOptions(range) {
-      const theInOrOutItem = this.formItems.find(item => item.prop === 'inOrOut')
+      const theInOrOutItem = this.formItems.find(
+        item => item.prop === 'inOrOut'
+      )
       switch (range) {
         case '全部':
         case '航线':
@@ -383,8 +396,8 @@ export default {
             theInOrOutItem.options = [
               {
                 label: '全部',
-                value: '全部'
-              }
+                value: '全部',
+              },
             ]
             theInOrOutItem.disabled = true
           }
@@ -397,16 +410,16 @@ export default {
             theInOrOutItem.options = [
               {
                 value: '全部',
-                label: '全部'
+                label: '全部',
               },
               {
                 value: '进港',
-                label: '进港'
+                label: '进港',
               },
               {
                 value: '离港',
-                label: '离港'
-              }
+                label: '离港',
+              },
             ]
             theInOrOutItem.disabled = false
           }
@@ -419,16 +432,18 @@ export default {
           break
       }
     },
-    async getOptions(queryId, setKey, prop) {
+    async getOptions(prop, queryId, setKey, setLabel) {
       try {
         const { code, returnData, message } = await TempQuery({
           serviceId: queryId,
-          dataContent: []
+          dataContent: [],
+          pageSize: 9999
         })
-        if (Number(code) === 0) {
-          const arr = returnData.listValues.map(element => ({
-            label: element[setKey],
-            value: element[setKey]
+        if (String(code) === '0') {
+          const listValues = returnData.listValues || returnData
+          const arr = listValues.map(element => ({
+            label: element[setLabel],
+            value: element[setKey],
           }))
           const theItem = this.formItems.find(item => item.prop === prop)
           theItem.options = arr
@@ -438,15 +453,12 @@ export default {
       } catch (error) {
         this.$message.error('失败')
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
-<style
-  lang="scss"
-  scoped
->
+<style lang="scss" scoped>
 .flight-statistics-header {
   padding-top: 24px;
   min-height: 80px;

src/views/statisticsCharts/views/airlineCompany/capPassengerStatisticsCharts.vue

@@ -1,60 +1,108 @@
 <template>
-  <CommonBarStatisticsCharts charts-title="工作量" :query-settings="querySettings" :formData="formData" :formItems="formItems" />
+  <CommonBarStatisticsCharts
+    charts-title="工作量"
+    :query-settings="querySettings"
+    :formData="formData"
+    :formItems="formItems"
+  />
 </template>
 
 <script>
 import CommonBarStatisticsCharts from '../../components/commonBarStatisticsCharts.vue'
+import { Query } from '@/api/webApi'
+
 export default {
   name: 'BaggagePassengerStatisticsCharts',
   components: { CommonBarStatisticsCharts },
-  data () {
+  data() {
+    const that = this
     return {
-      // querySettings: {
-      //   serviceId: SERVICE_ID.LuggagecId
-      // },
+      querySettings: {
+        serviceId: SERVICE_ID.workload,
+        seriesKey: 'workload',
+        xAxisKey: 'fd',
+      },
       formData: {
+        td: '',
+        agent_number: '',
         airport: '',
         dateTime: [],
-        io_type: '',
       },
       formItems: [
         {
-          prop: 'airline',
+          prop: 'td',
+          inputType: 'select',
+          placeholder: '时间维度',
+          requiredWarning: '请先选择统计时间维度',
+          options: [
+            {
+              value: '日',
+              label: '按日统计',
+            },
+            {
+              value: '月',
+              label: '按月统计',
+            },
+            {
+              value: '年',
+              label: '按年统计',
+            },
+          ],
+        },
+        {
+          prop: 'airport',
           inputType: 'select',
           placeholder: '航站',
           filterable: true,
-          clearable: true,
-          width: '180px',
           queryId: SERVICE_ID.AirportIds,
           setKey: 'code3',
-          options: []
+          requiredWarning: '请先选择航站',
+          options: [],
+          changeHandler(value) {
+            that.agent_number = ''
+            that.getAgentOptions(value)
+          },
         },
         {
-          prop: 'timedim',
+          prop: 'agent_number',
           inputType: 'select',
           placeholder: '操作人',
           requiredWarning: '请先选择操作人',
-          clearable: true,
-          options: [
-            {
-              value: '测试1',
-              label: '测试1',
-            },
-            {
-              value: '测试2',
-              label: '测试2',
-            },
-          ],
+          options: [],
         },
         {
           prop: 'dateTime',
           inputType: 'datePicker',
-          clearable: true,
           width: '240px',
-          options: [],
+          requiredWarning: '请先选择时间范围',
         },
       ],
     }
-  }
+  },
+  methods: {
+    async getAgentOptions(airport) {
+      try {
+        const { code, returnData, message } = await Query({
+          serviceId: SERVICE_ID.agentCode,
+          dataContent: [
+            {
+              airport,
+            },
+          ],
+        })
+        if (String(code) === '0') {
+          const listValues = returnData.listValues || returnData
+          this.formItems[2].options = listValues.map(element => ({
+            label: element.agent_number,
+            value: element.agent_number,
+          }))
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        this.$message.error('失败')
+      }
+    },
+  },
 }
 </script>

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -109,7 +109,7 @@ export default {
           // multiple: true,
           // disabled: true,
           queryId: SERVICE_ID.AirportIds,
-          setKey: 'code3',
+          setKey: 'planDepartureApt',
           options: [],
         },
         {
@@ -372,7 +372,6 @@ export default {
       this.queryChartsData(data)
     },
     setInOrOutOptions (range) {
-      console.log(range)
       const theInOrOutItem = this.formItems.find(
         item => item.prop === 'inOrOut'
       )
@@ -380,7 +379,6 @@ export default {
         case 'airline':
           this.formItems[2].disabled = true
           this.formItems[3].disabled = true
-          console.log(this.formItems)
           break
         case 'airport':
           this.formItems[3].disabled = false