修改扫描节点与位置分析

public/config.js

@@ -136,6 +136,9 @@ window.SERVICE_ID = {
   nodeAll: 1804, // 节点统计雷达图-全部
   nodeIn: 1804, // 节点统计雷达图-进港
   nodeOut: 1804, // 节点统计雷达图-离港
+  nodeNewAll: 200316, // 节点统计雷达图-全部-2.0
+  nodeNewIn: 200316, // 节点统计雷达图-进港
+  nodeNewOut: 200316, // 节点统计雷达图-离港
   nodeExportAirline: 1805, // 节点统计导出-航线
   nodeExportAirport: 1805, // 节点统计导出-航站
   nodeAxisDesc: 90, // 节点统计指示器名称解释

public/staticConfig.js

@@ -48,12 +48,20 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+  case 'cabdp.airchina.com.cn':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'https://cabdp.airchina.com.cn:8043',
+      baseURLCA: 'https://cabdp.airchina.com.cn:8043',
+      hasStaticRoutes: true,
+    }
+    break
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,
-      baseNewUrl: 'http://10.211.66.23:8082',
-      baseURLCA: 'http://10.211.66.23:8082',
-      fileUrl: 'http://10.211.66.23:8082',
+      baseNewUrl: 'http://10.211.67.177:8043',
+      baseURLCA: 'http://10.211.67.177:8043',
+      fileUrl: 'http://10.211.67.177:8043',
       expressUrl: 'http://10.211.67.177:8043',
       tempUrl: 'http://10.211.67.163:16300', // 1.0临时地址
       tempToken: 'bb1bcfcb336b40e9b8602e808b053c3b', // 1.0临时token

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -1,68 +1,28 @@
 <template>
   <div class="statstics-wrapper">
-    <div
-      ref="headerWrapper"
-      class="statstics-header"
-    >
-      <StatisticsHeader
-        title="扫描节点与位置分析"
-        :items="formItems"
-        :data="formData"
-        with-setting
-        @getFormData="getFormData"
-        @export="exportHandler"
-        @setting="settingHandler"
-      />
+    <div ref="headerWrapper" class="statstics-header">
+      <StatisticsHeader title="扫描节点与位置分析" :items="formItems" :data="formData" with-setting @getFormData="getFormData" @export="exportHandler" @setting="settingHandler" />
     </div>
     <div class="statstics-content">
-      <div
-        ref="myChart"
-        class="node-statistics-chart"
-        :style="{ height: chartHeight }"
-      />
-      <div
-        v-if="checkedTooltips.length"
-        class="node-tooltip"
-      >
+      <div ref="myChart" class="node-statistics-chart" :style="{ height: chartHeight }" />
+      <div v-if="checkedTooltips.length" class="node-tooltip">
         <div class="node-tooltip-title">节点扫描率</div>
-        <div
-          v-for="tooltip in checkedTooltips"
-          :key="tooltip.label"
-          class="node-tooltip-content"
-        >
+        <div v-for="tooltip in checkedTooltips" :key="tooltip.label" class="node-tooltip-content">
           <span>{{ tooltip.label }}：</span><span>{{ tooltip.ratio }}</span>
         </div>
       </div>
     </div>
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-group"
-    >
+    <Dialog :flag="dialogFlag" class="dialog-check-group">
       <div class="dialog-wrapper">
         <div class="title">列设置</div>
         <div class="content">
           <el-checkbox-group v-model="checkListTemp">
-            <el-checkbox
-              v-for="node in nodeList"
-              :key="node.name"
-              :label="node.name"
-              :disabled="node.disabled"
-            />
+            <el-checkbox v-for="node in nodeList" :key="node.name" :label="node.name" :disabled="node.disabled" />
           </el-checkbox-group>
         </div>
         <div class="foot right t30">
-          <el-button
-            size="medium"
-            class="r24"
-            type="primary"
-            @click="onCheck"
-            >确定</el-button
-          >
-          <el-button
-            size="medium"
-            @click="hide"
-            >取消</el-button
-          >
+          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -77,11 +37,12 @@ import { mapGetters } from 'vuex'
 import * as XLSX from 'xlsx'
 import XLSX_STYLE from 'xlsx-style'
 import FileSaver from 'file-saver'
+import _ from 'lodash'
 
 export default {
   name: 'FlightStatisticsCharts',
   components: { StatisticsHeader, Dialog },
-  data() {
+  data () {
     const that = this
     return {
       formData: {
@@ -99,7 +60,7 @@ export default {
           options: [],
           queryId: SERVICE_ID.nodeRange,
           setKey: 'a1',
-          changeHandler(value) {
+          changeHandler (value) {
             that.setInOrOutOptions(value)
             const rangeMap = {
               航线: 'airline',
@@ -162,40 +123,49 @@ export default {
           name: '行李总件数',
           label: '',
           disabled: true,
+          key: 'allBags'
         },
         {
           name: '值机件数',
           label: '值机',
+          key: 'checkIn'
         },
         {
           name: '安检件数',
           label: '安检',
+          key: 'security'
         },
         {
           name: '分拣件数',
           label: '分拣',
+          key: 'sort'
         },
         {
           name: '装车件数',
           label: '装车',
+          key: 'loadCar'
         },
         {
           name: '装机件数',
           label: '装机',
+          key: ''
           // disabled: true
         },
         {
           name: '卸机件数',
           label: '卸机',
           disabled: true,
+          key: ''
         },
         {
           name: '中转件数',
           label: '中转',
+          key: 'transferOut'
         },
         {
           name: '到达件数',
           label: '到达',
+          key: 'arrive'
         },
       ],
       checkList: [],
@@ -248,16 +218,18 @@ export default {
       seriesData: [],
       tooltips: [],
       descriptions: {},
+      msgDatas: [],
+      msgObj: {}
     }
   },
   computed: {
     ...mapGetters(['sidebar']),
-    checkedTooltips() {
+    checkedTooltips () {
       return this.tooltips.filter(tooltip =>
         this.checkList.includes(tooltip.name)
       )
     },
-    checkedSeriesData() {
+    checkedSeriesData () {
       return this.seriesData.reduce((pre, curr) => {
         if (this.checkList.includes(curr.name)) {
           return [...pre, curr.value]
@@ -266,19 +238,19 @@ export default {
         }
       }, [])
     },
-    checkedIndicator() {
+    checkedIndicator () {
       return this.indicator.filter(node => this.checkList.includes(node.name))
     },
   },
   watch: {
     checkedIndicator: {
-      handler(arr) {
+      handler (arr) {
         this.echartsOptions.radar.indicator = arr
       },
       deep: true,
     },
     checkedSeriesData: {
-      handler(arr) {
+      handler (arr) {
         this.echartsOptions.series[0].data = [
           {
             name: this.queryData[2],
@@ -290,17 +262,17 @@ export default {
     },
     // 监听数据变化 重绘图形
     echartsOptions: {
-      handler(obj) {
+      handler (obj) {
         this.myChart && this.myChart.setOption(obj)
         this.resizeHandler()
       },
       deep: true,
     },
-    'sidebar.expand'() {
+    'sidebar.expand' () {
       this.setChartHeight()
     },
   },
-  created() {
+  created () {
     this.getTips()
 
     this.tooltips = this.nodeList.reduce((pre, curr) => {
@@ -311,6 +283,7 @@ export default {
             name: curr.name,
             label: curr.label,
             ratio: '0%',
+            key: curr.key
           },
         ]
       } else {
@@ -321,6 +294,7 @@ export default {
     this.indicator = this.nodeList.map(node => ({
       name: node.name,
       max: 10000,
+      key: node.key
     }))
 
     this.checkList = this.nodeList.reduce((pre, curr) => {
@@ -336,7 +310,7 @@ export default {
       }
     }, [])
   },
-  mounted() {
+  mounted () {
     const that = this
 
     this.setChartHeight()
@@ -358,7 +332,7 @@ export default {
       setTimeout(that.changeTips.bind(that, params), 0)
     })
   },
-  beforeDestroy() {
+  beforeDestroy () {
     // 销毁实例和移除监听
     window.removeEventListener('resize', this.debouncedChartHeightSetter)
     if (this.myChart) {
@@ -367,21 +341,21 @@ export default {
     }
   },
   methods: {
-    hideTips(params) {
+    hideTips (params) {
       if (params.componentType === 'radar') {
         this.myChart._dom.children[1].style.opacity = 0
       }
     },
-    changeTips(params) {
+    changeTips (params) {
       const tip = this.myChart._dom.children[1]
       if (params.componentType === 'radar' && this.descriptions[params.name]) {
         tip.innerHTML = tip.textContent = this.descriptions[params.name]
       }
     },
-    getFormData(data) {
+    getFormData (data) {
       this.queryChartsData(data)
     },
-    setInOrOutOptions(range) {
+    setInOrOutOptions (range) {
       const theInOrOutItem = this.formItems.find(
         item => item.prop === 'inOrOut'
       )
@@ -419,7 +393,7 @@ export default {
           break
       }
     },
-    async getTips() {
+    async getTips () {
       try {
         const {
           code,
@@ -438,7 +412,7 @@ export default {
         this.$message.error('失败')
       }
     },
-    async queryChartsData(data) {
+    async queryChartsData (data) {
       const params = []
       let queryId
       if (data.range === '') {
@@ -455,13 +429,13 @@ export default {
       }
       switch (data.inOrOut) {
         case '全部':
-          queryId = SERVICE_ID.nodeAll
+          queryId = SERVICE_ID.nodeNewAll
           break
         case '进港':
-          queryId = SERVICE_ID.nodeIn
+          queryId = SERVICE_ID.nodeNewIn
           break
         case '离港':
-          queryId = SERVICE_ID.nodeOut
+          queryId = SERVICE_ID.nodeNewOut
           break
         default:
           this.$message.warning('请先选择进离港')
@@ -479,8 +453,20 @@ export default {
       } else {
         params.splice(1, 0, '全部')
       }
+      const paramsObj = {}
+      if (data.range === '航线') {
+        paramsObj['dim'] = data.range
+        paramsObj['location'] = data.airline
+      } else if (data.range === '航站') {
+        paramsObj['dim'] = data.range + data.inOrOut
+        paramsObj['location'] = data.airport
+      }
+
+      paramsObj['fd1'] = data.dateTime[0]
+      paramsObj['fd2'] = data.dateTime[1]
 
       this.queryData = params
+      this.msgObj = paramsObj
 
       try {
         this.echartsOptions.series[0].data = []
@@ -488,19 +474,20 @@ export default {
         this.hasChartData = false
 
         const res = await TempQuery({
-          id: queryId,
-          dataContent: params,
+          serviceId: queryId,
+          dataContent: paramsObj,
+          event: '0'
         })
         if (Number(res.code) === 0) {
-          if (res.returnData.listValues.length) {
-            const list = Object.entries(res.returnData.listValues[0])
+          if (res.returnData.length) {
+            const list = Object.entries(res.returnData[0])
             const max = Math.max(...list.map(element => element[1]))
             this.indicator.forEach(node => {
               node.max = max
             })
             list.forEach(([name, value]) => {
               const tooltip = this.tooltips.find(
-                tooltip => tooltip.name === name
+                tooltip => tooltip.key === name
               )
               if (tooltip && value) {
                 tooltip.ratio = ((value / max) * 100).toFixed(2) + '%'
@@ -510,13 +497,15 @@ export default {
               const result = {
                 name: node.name,
                 value: 0,
+                key: node.key
               }
-              const data = list.find(([key, value]) => key === node.name)
+              const data = list.find(([key, value]) => key === node.key)
               if (data) {
                 result.value = data[1]
               }
               return result
             })
+            this.msgDatas = _.cloneDeep(this.seriesData)
             this.hasChartData = true
           }
         } else {
@@ -526,29 +515,28 @@ export default {
         this.$message.error('失败')
       }
     },
-    setChartHeight() {
+    setChartHeight () {
       const topBarHeight = 80
       const headerBlankHeight = 24
       const tabsWrapperHeight = 62
       const headerHeight = this.$refs['headerWrapper'].offsetHeight
       const footerBlankHeight = 24
-      this.chartHeight = `calc(100vh - ${
-        topBarHeight +
+      this.chartHeight = `calc(100vh - ${topBarHeight +
         headerBlankHeight +
         tabsWrapperHeight +
         headerHeight +
         footerBlankHeight
-      }px)`
+        }px)`
       this.$nextTick(() => {
         this.resizeHandler()
       })
     },
-    resizeHandler() {
+    resizeHandler () {
       if (this.myChart) {
         this.myChart.resize()
       }
     },
-    exportHandler() {
+    exportHandler () {
       if (!this.hasChartData) {
         this.$message.warning('请查询后再进行导出')
         return
@@ -561,7 +549,7 @@ export default {
       // $a.setAttribute('download', '扫描节点与位置分析统计.png')
       // $a.click()
     },
-    async queryExportData(queryData) {
+    async queryExportData (queryData) {
       let queryId
       switch (queryData[0]) {
         case '航站':
@@ -575,160 +563,156 @@ export default {
           return
       }
       try {
-        const res = await TempQuery({
-          id: queryId,
-          dataContent: queryData,
-        })
-        if (Number(res.code) === 0) {
-          const { listValues } = res.returnData
-          if (listValues.length) {
-            // 生成表格数据
-            const xlsxDatas = [[]]
-            const listArray = listValues.map(record =>
-              Object.entries(record).filter(
-                ([key, value]) => key === 'a4' || this.checkList.includes(key)
-              )
+        const listValues = this.msgDatas
+        if (listValues.length) {
+          // 生成表格数据
+          const xlsxDatas = [[]]
+          const listArray = [[]]
+          listValues.map(item => {
+            if (item.key) {
+              delete item.key
+            }
+            listArray[0].push(Object.values(item))
+          })
+          listArray[0].unshift(['a4', this.msgObj.fd1])
+          xlsxDatas[0].push(...listArray[0].map(([key, value]) => key))
+          xlsxDatas.push(
+            ...listArray.map(record =>
+              record.map(([key, value]) => value || 0)
             )
-            xlsxDatas[0].push(...listArray[0].map(([key, value]) => key))
-            xlsxDatas.push(
-              ...listArray.map(record =>
-                record.map(([key, value]) => value || 0)
+          )
+          xlsxDatas[0][0] = '日期'
+          // 添加合计行
+          if (xlsxDatas.length > 2) {
+            const summaryRow = ['合计']
+            const colNum = xlsxDatas[0].length
+            for (let columnIndex = 1; columnIndex < colNum; columnIndex++) {
+              summaryRow[columnIndex] = xlsxDatas.reduce(
+                (pre, currentRow, currentRowIndex) => {
+                  if (currentRowIndex === 0) {
+                    return pre
+                  } else {
+                    return pre + currentRow[columnIndex]
+                  }
+                },
+                0
               )
-            )
-            xlsxDatas[0][0] = '日期'
-            // 添加合计行
-            if (xlsxDatas.length > 2) {
-              const summaryRow = ['合计']
-              const colNum = xlsxDatas[0].length
-              for (let columnIndex = 1; columnIndex < colNum; columnIndex++) {
-                summaryRow[columnIndex] = xlsxDatas.reduce(
-                  (pre, currentRow, currentRowIndex) => {
-                    if (currentRowIndex === 0) {
-                      return pre
-                    } else {
-                      return pre + currentRow[columnIndex]
-                    }
-                  },
-                  0
-                )
-              }
-              xlsxDatas.push(summaryRow)
             }
-            // 添加节点扫描率列，计算列宽
-            const columnWidths = []
-            xlsxDatas.forEach((row, rowIndex) => {
-              // 从行李总件数后一列开始遍历，添加节点扫描率数据
-              for (
-                let columnIndex = 2;
-                columnIndex < row.length;
-                columnIndex += 2
+            xlsxDatas.push(summaryRow)
+          }
+          // 添加节点扫描率列，计算列宽
+          const columnWidths = []
+          xlsxDatas.forEach((row, rowIndex) => {
+            // 从行李总件数后一列开始遍历，添加节点扫描率数据
+            for (
+              let columnIndex = 2;
+              columnIndex < row.length;
+              columnIndex += 2
+            ) {
+              const totalcell = row[1]
+              const cell = row[columnIndex]
+              const newCell =
+                rowIndex === 0
+                  ? `${cell.slice(0, 2)}扫描率`
+                  : `${cell ? ((cell / totalcell) * 100).toFixed(2) : 0}%`
+              row.splice(columnIndex + 1, 0, newCell)
+            }
+            // 计算每一列宽度，考虑换行
+            row.forEach((cell, columnIndex) => {
+              const cellWidth = Math.max(
+                ...String(cell)
+                  .split('\n')
+                  .map(cellRow =>
+                    cellRow.split('').reduce((pre, curr) => {
+                      const letterSize = curr.charCodeAt(0) > 255 ? 2 : 1
+                      return pre + letterSize
+                    }, 0)
+                  )
+              )
+              if (
+                (!columnWidths[columnIndex] && cellWidth > 0) ||
+                cellWidth > columnWidths[columnIndex]
               ) {
-                const totalcell = row[1]
-                const cell = row[columnIndex]
-                const newCell =
-                  rowIndex === 0
-                    ? `${cell.slice(0, 2)}扫描率`
-                    : `${cell ? ((cell / totalcell) * 100).toFixed(2) : 0}%`
-                row.splice(columnIndex + 1, 0, newCell)
+                columnWidths[columnIndex] = cellWidth
               }
-              // 计算每一列宽度，考虑换行
-              row.forEach((cell, columnIndex) => {
-                const cellWidth = Math.max(
-                  ...String(cell)
-                    .split('\n')
-                    .map(cellRow =>
-                      cellRow.split('').reduce((pre, curr) => {
-                        const letterSize = curr.charCodeAt(0) > 255 ? 2 : 1
-                        return pre + letterSize
-                      }, 0)
-                    )
-                )
-                if (
-                  (!columnWidths[columnIndex] && cellWidth > 0) ||
-                  cellWidth > columnWidths[columnIndex]
-                ) {
-                  columnWidths[columnIndex] = cellWidth
-                }
-              })
             })
-            // 生成表格
-            const sheet = XLSX.utils.aoa_to_sheet(xlsxDatas)
-            // 添加列宽度
-            sheet['!cols'] = columnWidths.map(width => ({
-              wch: width + 2,
-            }))
-            const borderStyle = {
-              style: 'medium',
-              color: {
-                rgb: 'FFFFFF',
-              },
-            }
-            const reg = /^[A-Z]+([\d]+$)/
-            for (const key in sheet) {
-              const match = reg.test(key)
-              if (match) {
-                const rowIndex = reg.exec(key)[1]
-                let cellStyle = {
-                  alignment: {
-                    horizontal: 'center',
-                    vertical: 'center',
-                    wrapText: true,
+          })
+          // 生成表格
+          const sheet = XLSX.utils.aoa_to_sheet(xlsxDatas)
+          // 添加列宽度
+          sheet['!cols'] = columnWidths.map(width => ({
+            wch: width + 2,
+          }))
+          const borderStyle = {
+            style: 'medium',
+            color: {
+              rgb: 'FFFFFF',
+            },
+          }
+          const reg = /^[A-Z]+([\d]+$)/
+          for (const key in sheet) {
+            const match = reg.test(key)
+            if (match) {
+              const rowIndex = reg.exec(key)[1]
+              let cellStyle = {
+                alignment: {
+                  horizontal: 'center',
+                  vertical: 'center',
+                  wrapText: true,
+                },
+              }
+              if (Number(rowIndex) === 1) {
+                cellStyle = {
+                  ...cellStyle,
+                  border: {
+                    top: borderStyle,
+                    right: borderStyle,
+                    bottom: borderStyle,
+                    left: borderStyle,
                   },
-                }
-                if (Number(rowIndex) === 1) {
-                  cellStyle = {
-                    ...cellStyle,
-                    border: {
-                      top: borderStyle,
-                      right: borderStyle,
-                      bottom: borderStyle,
-                      left: borderStyle,
+                  font: {
+                    color: {
+                      rgb: 'FFFFFF',
                     },
-                    font: {
-                      color: {
-                        rgb: 'FFFFFF',
-                      },
-                    },
-                    fill: {
-                      fgColor: {
-                        rgb: '3366FF',
-                      },
+                  },
+                  fill: {
+                    fgColor: {
+                      rgb: '3366FF',
                     },
-                  }
-                } else {
-                  cellStyle.alignment.horizontal = 'left'
+                  },
                 }
-                sheet[key].s = cellStyle
+              } else {
+                cellStyle.alignment.horizontal = 'left'
               }
+              sheet[key].s = cellStyle
             }
-            // 表格数据转换
-            const workBook = XLSX.utils.book_new()
-            XLSX.utils.book_append_sheet(workBook, sheet, '扫描节点与位置分析')
-            const tableWrite = XLSX_STYLE.write(workBook, {
-              bookType: 'xlsx',
-              bookSST: true,
-              type: 'buffer',
-              cellStyles: true,
-            })
-            // 下载表格
-            const fileName = `扫描节点与位置分析-${queryData.join('-')}.xlsx`
-            FileSaver.saveAs(
-              new Blob([tableWrite], { type: 'application/octet-stream' }),
-              fileName
-            )
           }
-        } else {
-          this.$message.error(res.message || '失败')
+          // 表格数据转换
+          const workBook = XLSX.utils.book_new()
+          XLSX.utils.book_append_sheet(workBook, sheet, '扫描节点与位置分析')
+          const tableWrite = XLSX_STYLE.write(workBook, {
+            bookType: 'xlsx',
+            bookSST: true,
+            type: 'buffer',
+            cellStyles: true,
+          })
+          // 下载表格
+          const fileName = `扫描节点与位置分析-${queryData.join('-')}.xlsx`
+          FileSaver.saveAs(
+            new Blob([tableWrite], { type: 'application/octet-stream' }),
+            fileName
+          )
         }
       } catch (error) {
+        console.log(error)
         this.$message.error('失败')
       }
     },
-    settingHandler() {
+    settingHandler () {
       this.dialogFlag = true
       this.checkListTemp = [...this.checkList]
     },
-    onCheck() {
+    onCheck () {
       if (this.dialogFlag === false) {
         return
       }
@@ -739,7 +723,7 @@ export default {
       this.checkList = [...this.checkListTemp]
       this.dialogFlag = false
     },
-    hide() {
+    hide () {
       this.dialogFlag = false
     },
   },
@@ -758,7 +742,7 @@ export default {
       left: 64px;
       z-index: 100;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       color: #303133;
       .node-tooltip-title {
         line-height: 14px;