From 0ecf7b3bc6d6a008a804d55c859833bf2cf6473a Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期三, 22 十一月 2023 10:06:29 +0800
Subject: [PATCH] 1.增加了有效率异常展示页面 2.风险模型的所属场景和运维商的详细信息,以及1个跳转页面链接 3.飞行巡检页面增加增加地址和运维商的筛选条件 4.飞行巡检页面是最新当日日期时,每类异常右上角增加一个“辅助审核” 5.历史数据管理增加 站点总数

---
 src/views/exception/FlightInspection.vue | 1273 ++++++++++++++++++---------------------------------------
 1 files changed, 405 insertions(+), 868 deletions(-)

diff --git a/src/views/exception/FlightInspection.vue b/src/views/exception/FlightInspection.vue
index 8ea6552..52d9f51 100644
--- a/src/views/exception/FlightInspection.vue
+++ b/src/views/exception/FlightInspection.vue
@@ -11,14 +11,21 @@
 import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import AnalysisCard from './components/AnalysisCard.vue'
-
+import DutyCompany from '@/sfc/DutyCompany.vue'
+import StreetInfo from '@/sfc/StreetInfo.vue'
+import historyApi from '@/api/historyApi.js'
+import time from '@/utils/time.js'
+import lineChart from '@/utils/chartFunction/lineChart.js'
+import exceptionOption from '@/utils/chartFunction/exceptionOption.js'
 export default {
   components: {
     TimeShortCuts,
     DustLineChart,
     ButtonClick,
     AreaAndmonitorType,
-    AnalysisCard
+    AnalysisCard,
+    DutyCompany,
+    StreetInfo
   },
   data() {
     return {
@@ -26,6 +33,10 @@
       form: {
         // 绔欑偣鍚嶇О
         name: '',
+        // 杩愮淮鍟�
+        dutyCompany: [],
+        // 琛楅亾
+        street: [],
         // 閫夋嫨鐨勫紓甯哥被鍨�
         exceptionName: []
       },
@@ -39,6 +50,8 @@
       tableHeight: 400,
       // 琛ㄦ牸鏄剧ず
       isTableShow: false,
+      // 瀹℃牳杈呭姪鎸夐挳鏄剧ず
+      auditButton: false,
       // 褰撳墠椤�
       currentPage: 1,
       // 姣忛〉鏉℃暟
@@ -55,7 +68,8 @@
         exception4: true,
         exception5: true,
         exception6: true,
-        exception7: true
+        exception7: true,
+        exception8: true
       },
       // eslint-disable-next-line no-undef
       // 瀵硅瘽妗嗘樉绀�
@@ -78,6 +92,8 @@
         exception6: [],
         // 婊戝姩骞冲潎鍊煎紓甯�
         exception7: [],
+        // 鏈夋晥鐜囧紓甯�
+        exception8: [],
 
         // 璇ユ椂娈电殑寮傚父鏁伴噺
         exception0Num: 0,
@@ -87,7 +103,8 @@
         exception4Num: 0,
         exception5Num: 0,
         exception6Num: 0,
-        exception7Num: 0
+        exception7Num: 0,
+        exception8Num: 0
       },
       // 绔欑偣鎬绘暟閲�
       siteTotal: 0,
@@ -131,7 +148,8 @@
         banTouch: 0,
         // 0浠h〃鍒嗛〉锛�1浠h〃涓嶅垎椤�
         originClick: 0
-      }
+      },
+      areaColor: null
     }
   },
   setup() {
@@ -144,27 +162,6 @@
   // 鐩戝惉  鍒ゆ柇鎸夐挳鏄惁鍙偣鍑�
   watch: {
     selectedRowIndex(newVaue) {
-      // 澶勪簬琛ㄦ牸鐨勬渶鍚庝竴鏉℃暟鎹� 璁剧疆鈥樹笂涓�鏉♀�欐寜閽笉鍙偣
-      // if (newVaue === this.displayData.length - 1) {
-      //   this.dialog.isPreCantouch = true
-      //   //鐢ㄦ埛鍏堢偣浜嗙涓�鏉★紝pre涓簍rue,鐒跺悗鐐瑰嚮鏈�鍚庝竴鏉�,next涓簍rue銆傛鏃朵袱涓寜閽兘琚皝閿�
-      //   if (this.dialog.isNextCantouch == true) {
-      //     this.dialog.isNextCantouch = false
-      //   }
-      // }
-      // // 澶勪簬琛ㄦ牸绗竴鏉℃暟鎹� 璁剧疆鈥樹笅涓�鏉♀�欐寜閽笉鍙偣
-      // else if (newVaue === 0) {
-      //   this.dialog.isNextCantouch = true
-      //   //鐢ㄦ埛鍏堢偣浜嗚〃鏍兼渶鍚庝竴鏉�,next涓簍rue,鐒跺悗鐐瑰嚮绗竴鏉★紝pre涓簍rue銆傛鏃朵袱涓寜閽兘琚皝閿�
-      //   if (this.dialog.isPreCantouch == true) {
-      //     this.dialog.isPreCantouch = false
-      //   }
-      // }
-      // // 澶勪簬琛ㄦ牸鐨勪腑闂磋 灏嗘寜閽缃负鍙偣鍑荤姸鎬�
-      // else {
-      //   this.dialog.isPreCantouch = false
-      //   this.dialog.isNextCantouch = false
-      // }
       // 澶勪簬琛ㄦ牸鐨勬渶鍚庝竴鏉℃暟鎹� 璁剧疆鈥樹笂涓�鏉♀�欐寜閽笉鍙偣
       if (newVaue === 0) {
         this.dialog.isPreCantouch = true
@@ -209,7 +206,8 @@
         this.exception.exception4Num +
         this.exception.exception5Num +
         this.exception.exception6Num +
-        this.exception.exception7Num
+        this.exception.exception7Num +
+        this.exception.exception8Num
       if (sum == 0) {
         return 1
       } else {
@@ -225,7 +223,8 @@
         this.exception.exception4Num +
         this.exception.exception5Num +
         this.exception.exception6Num +
-        this.exception.exception7Num
+        this.exception.exception7Num +
+        this.exception.exception8Num
       if (sum == 0) {
         return 0
       } else {
@@ -237,7 +236,8 @@
           (this.exception.exception4Num / this.exceptionAllNum) * 100 -
           (this.exception.exception5Num / this.exceptionAllNum) * 100 -
           (this.exception.exception6Num / this.exceptionAllNum) * 100 -
-          (this.exception.exception7Num / this.exceptionAllNum) * 100
+          (this.exception.exception7Num / this.exceptionAllNum) * 100 -
+          (this.exception.exception8Num / this.exceptionAllNum) * 100
         ).toFixed(1)
       }
     },
@@ -270,7 +270,11 @@
           siteNum: this.exception.exception6.length,
           exceptionNum: this.exception.exception6Num,
           isNoDataStatus: this.isNoData.exception6
-        },
+        }
+      ]
+    },
+    cardRow2() {
+      return [
         {
           siteName: this.exception.exception7,
           exceptionType: '7',
@@ -279,11 +283,7 @@
           siteNum: this.exception.exception7.length,
           exceptionNum: this.exception.exception7Num,
           isNoDataStatus: this.isNoData.exception7
-        }
-      ]
-    },
-    cardRow2() {
-      return [
+        },
         {
           siteName: this.exception.exception0,
           exceptionType: '0',
@@ -301,7 +301,11 @@
           siteNum: this.exception.exception1.length,
           exceptionNum: this.exception.exception1Num,
           isNoDataStatus: this.isNoData.exception1
-        },
+        }
+      ]
+    },
+    cardRow3() {
+      return [
         {
           siteName: this.exception.exception2,
           exceptionType: '2',
@@ -319,6 +323,15 @@
           siteNum: this.exception.exception3.length,
           exceptionNum: this.exception.exception3Num,
           isNoDataStatus: this.isNoData.exception3
+        },
+        {
+          siteName: this.exception.exception8,
+          exceptionType: '8',
+          exceptionName: '鏈夋晥鐜囧紓甯�',
+          iconSrc: '@/assets/exception/exception3.png',
+          siteNum: this.exception.exception8.length,
+          exceptionNum: this.exception.exception8Num,
+          isNoDataStatus: this.isNoData.exception8
         }
       ]
     }
@@ -328,9 +341,63 @@
     // 鏌ヨ鏃堕棿娈电殑鍚勫紓甯哥殑绔欑偣锛屾煡璇㈣鏃堕棿鍖洪棿鐨勫悇寮傚父鏁伴噺
     this.getShopNames()
     this.getSiteNume()
+
+    let a = [
+      ['2023-10-01  11:45:00', '2023-10-01  13:45:00'],
+      ['2023-10-01  11:45:00', '2023-10-01  12:45:00']
+    ]
+
+    let b = time.splitTime(a)
+    console.log('鏃堕棿锛�', b)
   },
 
   methods: {
+    /**
+     * 鏈夋晥鐜囧紓甯� 璁剧疆鎶樼嚎鍥鹃厤缃」
+     * @param锛� 
+     * @returns锛�
+     */
+    validProcess() {
+      // x杞存暟鎹�
+      let xList = time.ascTime(
+        this.tableCurrentRowData.beginTime,
+        this.tableCurrentRowData.endTime,
+        15
+      )
+
+      // y杞存暟鎹�
+      let yList = []
+      xList.forEach((item) => {
+        // 鏌ユ壘璇ユ椂闂寸殑鏁版嵁
+        let r = lineChart.findDate(this.dialog.historyData, item)
+        if (r) {
+          yList.push(r.dustValue)
+        } else {
+          yList.push(null)
+        }
+      })
+      // 棰滆壊鑳屾櫙鍖洪棿
+      // 寰楀埌鏃犳暟鎹殑鏃堕棿鐐规垨flag涓嶇瓑浜嶯鐨勬椂闂寸偣
+      let noDataTime = time.invalidTime(this.dialog.historyData, xList)
+      let rangeTime = time.seriesTime(noDataTime, 15)
+      // let rangeTime_1 = time.splitTime(rangeTime)
+      // 寰楀埌鑳屾櫙鍖洪棿鐨勯厤缃�
+      let areaObj = lineChart.getMarkArea(rangeTime, '寮傚父')
+
+      // 浼犲叆鍙傛暟
+      this.dialog.option = exceptionOption.setExceptionChartOption(
+        xList,
+        yList,
+        '',
+        '',
+        '',
+        '',
+        this.tableCurrentRowData.exception,
+        areaObj,
+        this.tableCurrentRowData.exceptionType
+      )
+    },
+
     getImageUrl(name) {
       return new URL(`../../lib/Carousel/assets/${name}`, import.meta.url).href
     },
@@ -401,7 +468,8 @@
     otherExceptionRequest(allTimeArgs, allTime, exceptionBT, exceptionET) {
       // 鎶樼嚎鍥惧姞杞戒腑鏁堟灉
       this.loading.lineChart = true
-      this.$http.get('/dust/history', { params: allTimeArgs }).then((result) => {
+
+      historyApi.queryHistoryData(allTimeArgs).then((result) => {
         this.dialog.allExceptionTimeData = result.data.data
         //  鏁版嵁缂哄け寮傚父鏃堕噸鏂拌缃〃鏍�
         if (this.tableCurrentRowData.exceptionType == '0') {
@@ -414,7 +482,7 @@
         let dustValue = []
         let timeAndValue = {}
 
-        // 浠庢坊鍔犱簡棣栦綅鍖洪棿鐨勫紑濮嬪拰缁撴潫鏃堕棿杩涜閬嶅巻 淇濊瘉鏃堕棿浠�10鍒嗛挓涓洪棿闅�
+        // 浠庢坊鍔犱簡棣栦綅鍖洪棿鐨勫紑濮嬪拰缁撴潫鏃堕棿杩涜閬嶅巻 淇濊瘉鏃堕棿浠�15鍒嗛挓涓洪棿闅�
         timeAndValue = index.keepContinuousByEachFiftyMinutes(
           allTime[0],
           allTime[3],
@@ -428,483 +496,26 @@
         let endIndex = dateList.findIndex((item) => item === exceptionET)
 
         // 璁剧疆鎶樼嚎鍥鹃厤缃」
-        this.reSetChart(dateList, dustValue, exceptionBT, exceptionET, startIndex, endIndex)
+        // this.reSetChart(dateList, dustValue, exceptionBT, exceptionET, startIndex, endIndex)
+        this.dialog.option = exceptionOption.setExceptionChartOption(
+          dateList,
+          dustValue,
+          exceptionBT,
+          exceptionET,
+          startIndex,
+          endIndex,
+          this.tableCurrentRowData.exception,
+          '',
+          this.tableCurrentRowData.exceptionType
+        )
+        this.flag.banTouch = 0
         this.loading.lineChart = false
       })
+
+
+  
     },
 
-    /**
-     * description锛氱粯鍒舵姌绾垮浘
-     * @param锛� x杞存椂闂达紝 y杞存补鐑熸祿搴︼紝 寮傚父寮�濮嬫椂闂达紝寮傚父缁撴潫鏃堕棿锛屽紓甯稿紑濮嬫椂闂村湪鏁翠釜鍖洪棿鐨勭储寮曚笅鏍囷紝寮傚父缁撴潫鏃堕棿鍦ㄦ暣涓尯闂寸殑绱㈠紩涓嬫爣
-     */
-    reSetChart(xData, yData, exceptionBeginTime, exceptionEndTime, beginIndex, endIndex) {
-      this.dialog.option = {}
-      switch (this.tableCurrentRowData.exceptionType) {
-        // 鏂數鎴栨柇缃�  鏃堕棿娈�
-        case '0':
-          this.dialog.option = {
-            title: {
-              text: this.tableCurrentRowData.exception,
-              left: '1%',
-              textStyle: {
-                fontSize: 14
-              }
-            },
-            tooltip: {},
-            toolbox: {
-              // 宸ュ叿鏍�
-              feature: {
-                // dataZoom: {
-                //   // 鍖哄煙缂╂斁
-                //   yAxisIndex: 'none'
-                // },
-                // 淇濆瓨涓哄浘鐗�
-                saveAsImage: {}
-              }
-            },
-            xAxis: {
-              type: 'category',
-              data: xData,
-              name: '鏃堕棿',
-              axisLabel: {
-                formatter: function (value) {
-                  return value.slice(11, -3)
-                }
-              }
-            },
-            yAxis: {
-              type: 'value',
-              name: 'mg/m鲁'
-            },
-            series: [
-              {
-                name: '棰楃矑鐗╂祿搴�',
-                type: 'line',
-                data: yData,
-                markLine: {
-                  silent: true,
-                  data: [
-                    // 鏍囨敞鏃犳暟鎹椂闂存鐨勬晥鏋滐紝灏嗚繖涓椂闂存鐨勬暟杞撮儴鍒嗗彉涓虹孩鑹�
-                    {
-                      name: '鏃犳暟鎹�',
-                      xAxis: exceptionBeginTime
-                    },
-                    {
-                      xAxis: exceptionEndTime
-                    }
-                  ],
-                  lineStyle: {
-                    color: 'red'
-                  }
-                }
-              }
-            ]
-          }
-          break
-        // 瓒呮爣
-        case '2':
-          this.dialog.option = {
-            title: {
-              text: this.tableCurrentRowData.exception,
-              left: '1%',
-              textStyle: {
-                fontSize: 14
-              }
-            },
-            tooltip: {},
-            toolbox: {
-              // 宸ュ叿鏍�
-              feature: {
-                //     dataZoom: {
-                //   yAxisIndex: 'none'
-                // },
-                // 淇濆瓨涓哄浘鐗�
-                saveAsImage: {}
-              }
-            },
-            xAxis: {
-              type: 'category',
-              data: xData,
-              name: '鏃堕棿',
-              axisLabel: {
-                formatter: function (value) {
-                  return value.slice(11, -3)
-                }
-              }
-            },
-            yAxis: {
-              type: 'value',
-              name: 'mg/m鲁'
-            },
-            series: [
-              {
-                name: '棰楃矑鐗╂祿搴�',
-                type: 'line',
-                data: yData.map((item) => {
-                  if (item >= 1) {
-                    return {
-                      value: item,
-                      itemStyle: {
-                        color: 'red'
-                      }
-                    }
-                  }
-                  return item
-                }),
-                // 鍙樻崲鎸囧畾鏃堕棿鍖洪棿鐨勮儗鏅鑹�
-                markArea: {
-                  itemStyle: {
-                    color: 'rgba(255, 173, 177, 0.4)'
-                  },
-                  data: [
-                    [
-                      {
-                        name: '寮傚父鏃堕棿娈�',
-                        xAxis: exceptionBeginTime
-                      },
-                      {
-                        xAxis: exceptionEndTime
-                      }
-                    ]
-                  ]
-                },
-                markLine: {
-                  symbol: 'none',
-                  itemStyle: {
-                    // 鍩虹嚎鍏叡鏍峰紡
-                    normal: {
-                      lineStyle: {
-                        type: 'dashed'
-                      },
-                      label: {
-                        show: true,
-                        position: 'end',
-                        formatter: '{b}'
-                      }
-                    }
-                  },
-                  data: [
-                    {
-                      name: '瓒呮爣',
-                      type: 'average',
-                      yAxis: 1,
-                      lineStyle: {
-                        // color: '#ff0000'
-                        color: 'red'
-                      }
-                    }
-                  ]
-                }
-              }
-            ],
-            // 鎸囧畾鏃堕棿鍖洪棿鐨勭嚎娈靛彉棰滆壊
-            visualMap: {
-              show: false,
-              dimension: 0,
-              pieces: [
-                {
-                  lte: beginIndex,
-                  color: 'green'
-                },
-                {
-                  gt: beginIndex,
-                  lte: endIndex,
-                  color: 'red'
-                },
-                {
-                  gt: endIndex,
-                  lte: xData.length - 1,
-                  color: 'green'
-                }
-              ]
-            }
-          }
-          break
-        // 鏁版嵁瓒呬綆 鍙湁鏃堕棿鐐�
-        case '1':
-          this.dialog.option = {
-            title: {
-              text: this.tableCurrentRowData.exception,
-              left: '1%',
-              textStyle: {
-                fontSize: 14
-              }
-            },
-            tooltip: {},
-            toolbox: {
-              // 宸ュ叿鏍�
-              feature: {
-                //     dataZoom: {
-                //   yAxisIndex: 'none'
-                // },
-                // 淇濆瓨涓哄浘鐗�
-                saveAsImage: {}
-              }
-            },
-            xAxis: {
-              type: 'category',
-              data: xData,
-              name: '鏃堕棿',
-              axisLabel: {
-                formatter: function (value) {
-                  return value.slice(11, -3)
-                }
-              }
-            },
-            yAxis: {
-              type: 'value',
-              name: 'mg/m鲁'
-            },
-            series: [
-              {
-                name: '棰楃矑鐗╂祿搴�',
-                type: 'line',
-                data: yData.map((item) => {
-                  if (item <= 0.01) {
-                    return {
-                      value: item,
-                      itemStyle: {
-                        color: 'red'
-                      }
-                    }
-                  }
-                  return item
-                }),
-
-                markLine: {
-                  symbol: 'none',
-                  itemStyle: {
-                    // 鍩虹嚎鍏叡鏍峰紡
-                    normal: {
-                      lineStyle: {
-                        type: 'dashed'
-                      },
-                      label: {
-                        show: true,
-                        position: 'end',
-                        formatter: '{b}'
-                      }
-                    }
-                  },
-                  data: [
-                    {
-                      name: '鏁版嵁瓒呬綆',
-                      type: 'average',
-                      yAxis: 0.01,
-                      lineStyle: {
-                        // color: '#ff0000'
-                        color: 'red'
-                      }
-                    }
-                  ]
-                }
-              }
-            ],
-            // 鎸囧畾鏃堕棿鍖洪棿鐨勭嚎娈靛彉棰滆壊
-            visualMap: {
-              show: false,
-              dimension: 0,
-              pieces: [
-                {
-                  lte: beginIndex,
-                  color: 'green'
-                },
-                {
-                  gt: beginIndex,
-                  lte: endIndex,
-                  color: 'red'
-                },
-                {
-                  gt: endIndex,
-                  lte: xData.length - 1,
-                  color: 'green'
-                }
-              ]
-            }
-          }
-          break
-        // 鏁版嵁闀挎椂娈垫棤娉㈠姩
-        case '3':
-          this.dialog.option = {
-            title: {
-              text: this.tableCurrentRowData.exception,
-              left: '1%',
-              textStyle: {
-                fontSize: 14
-              }
-            },
-            tooltip: {},
-            toolbox: {
-              // 宸ュ叿鏍�
-              feature: {
-                //  dataZoom: {
-                //   yAxisIndex: 'none'
-                // },
-                // 淇濆瓨涓哄浘鐗�
-                saveAsImage: {}
-              }
-            },
-            xAxis: {
-              type: 'category',
-              data: xData,
-              name: '鏃堕棿',
-              axisLabel: {
-                formatter: function (value) {
-                  return value.slice(11, -3)
-                }
-              }
-            },
-            yAxis: {
-              type: 'value',
-              name: 'mg/m鲁'
-            },
-            series: [
-              {
-                name: '棰楃矑鐗╂祿搴�',
-                type: 'line',
-                data: yData.map((item) => {
-                  if (item >= 1) {
-                    return {
-                      value: item,
-                      itemStyle: {
-                        color: 'red'
-                      }
-                    }
-                  }
-                  return item
-                }),
-                // 鍙樻崲鎸囧畾鏃堕棿鍖洪棿鐨勮儗鏅鑹�
-                markArea: {
-                  itemStyle: {
-                    color: 'rgba(255, 173, 177, 0.4)'
-                  },
-                  data: [
-                    [
-                      {
-                        name: '寮傚父鏃堕棿娈�',
-                        xAxis: exceptionBeginTime
-                      },
-                      {
-                        xAxis: exceptionEndTime
-                      }
-                    ]
-                  ]
-                }
-              }
-            ],
-            // 鎸囧畾鏃堕棿鍖洪棿鐨勭嚎娈靛彉棰滆壊
-            visualMap: {
-              show: false,
-              dimension: 0,
-              pieces: [
-                {
-                  lte: beginIndex,
-                  color: 'green'
-                },
-                {
-                  gt: beginIndex,
-                  lte: endIndex,
-                  color: 'red'
-                },
-                {
-                  gt: endIndex,
-                  lte: xData.length - 1,
-                  color: 'green'
-                }
-              ]
-            }
-          }
-          break
-        // 閲忕骇绐佸彉寮傚父
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-          this.dialog.option = {
-            title: {
-              text: this.tableCurrentRowData.exception,
-              left: '1%',
-              textStyle: {
-                fontSize: 14
-              }
-            },
-            tooltip: {},
-            toolbox: {
-              // 宸ュ叿鏍�
-              feature: {
-                //     dataZoom: {
-                //   yAxisIndex: 'none'
-                // },
-                // 淇濆瓨涓哄浘鐗�
-                saveAsImage: {}
-              }
-            },
-            xAxis: {
-              type: 'category',
-              data: xData,
-              name: '鏃堕棿',
-              axisLabel: {
-                formatter: function (value) {
-                  return value.slice(11, -3)
-                }
-              }
-            },
-            yAxis: {
-              type: 'value',
-              name: 'mg/m鲁'
-            },
-            series: [
-              {
-                name: '棰楃矑鐗╂祿搴�',
-                type: 'line',
-                data: yData,
-                // 鍙樻崲鎸囧畾鏃堕棿鍖洪棿鐨勮儗鏅鑹�
-                markArea: {
-                  itemStyle: {
-                    color: 'rgba(255, 173, 177, 0.4)'
-                  },
-                  data: [
-                    [
-                      {
-                        name: '寮傚父鏃堕棿娈�',
-                        xAxis: exceptionBeginTime
-                      },
-                      {
-                        xAxis: exceptionEndTime
-                      }
-                    ]
-                  ]
-                }
-              }
-            ],
-            // 鎸囧畾鏃堕棿鍖洪棿鐨勭嚎娈靛彉棰滆壊
-            visualMap: {
-              show: false,
-              dimension: 0,
-              pieces: [
-                {
-                  lte: beginIndex,
-                  color: 'green'
-                },
-                {
-                  gt: beginIndex,
-                  lte: endIndex,
-                  color: 'red'
-                },
-                {
-                  gt: endIndex,
-                  lte: xData.length - 1,
-                  color: 'green'
-                }
-              ]
-            }
-          }
-          break
-        default:
-          console.log('娌℃湁璁剧疆璇ュ紓甯哥被鍨嬶紒')
-      }
-      this.flag.banTouch = 0
-    },
     /**
      * description锛氬垝鍒嗗嚭寮傚父璧峰鏃堕棿锛屾瀯閫犺姹傚墠涓悗鐨勫弬鏁�
      */
@@ -947,30 +558,33 @@
         //寰楀埌涓婁竴琛屾暟鎹储寮�
         this.selectedRowIndex = this.selectedRowIndex + 1
 
-        //璇锋眰鏁版嵁 鏀瑰彉exceedingData
-        // this.setinfo(this.selectedRowIndex);
-
         // 寰楀埌涓婁竴琛岀殑鏁版嵁
         this.tableCurrentRowData = this.displayData[this.selectedRowIndex]
-        let params = index.requestGetParms(
-          this.tableCurrentRowData.name,
-          this.tableCurrentRowData.beginTime,
-          this.tableCurrentRowData.endTime
-        )
+
         this.loading.preButton = true
-        this.$http.get('/dust/history', { params: params }).then((response) => {
+
+     
+        historyApi.queryHistoryData({
+          siteName:this.tableCurrentRowData.name,
+          beginTime:this.tableCurrentRowData.beginTime,
+          endTime:this.tableCurrentRowData.endTime
+        }).then(response => {
           // 淇濆瓨杩斿洖鐨勮秴鏍囨暟鎹�
           this.dialog.historyData = response.data.data
           this.dialog.exceptionTotal = response.data.data.length
           // 閫昏緫澶勭悊
-          this.timeAndDataProcessed()
+
+          if (this.tableCurrentRowData.exceptionType != '8') {
+            this.timeAndDataProcessed()
+          } else {
+            this.loading.lineChart = true
+            this.validProcess()
+            this.loading.lineChart = false
+            this.flag.banTouch = 0
+          }
           this.loading.preButton = false
         })
       }
-
-      //寰楀埌涓婁竴琛屾暟鎹储寮�
-      // this.selectedRowIndex = this.selectedRowIndex + 1;
-      // this.tableCurrentRowData = this.displayData[this.selectedRowIndex]
     },
     /**
      * description锛氳幏鍙栦笅涓�鏉″紓甯镐俊鎭�
@@ -983,26 +597,33 @@
 
         //寰楀埌涓婁竴琛屾暟鎹储寮�
         this.selectedRowIndex = this.selectedRowIndex - 1
-        //璇锋眰鏁版嵁 鏀瑰彉exceedingData
-        // this.setinfo(this.selectedRowIndex);
 
         // 寰楀埌涓婁竴琛岀殑鏁版嵁
         this.tableCurrentRowData = this.displayData[this.selectedRowIndex]
 
-        let params = index.requestGetParms(
-          this.tableCurrentRowData.name,
-          this.tableCurrentRowData.beginTime,
-          this.tableCurrentRowData.endTime
-        )
         this.loading.afterButton = true
-        this.$http.get('/dust/history', { params: params }).then((response) => {
+
+        historyApi.queryHistoryData({
+          siteName:this.tableCurrentRowData.name,
+          beginTime:this.tableCurrentRowData.beginTime,
+          endTime:this.tableCurrentRowData.endTime
+        }).then(response => {
           // 淇濆瓨杩斿洖鐨勮秴鏍囨暟鎹�
           this.dialog.historyData = response.data.data
           this.dialog.exceptionTotal = response.data.data.length
           // 閫昏緫澶勭悊
-          this.timeAndDataProcessed()
+
+          if (this.tableCurrentRowData.exceptionType != '8') {
+            this.timeAndDataProcessed()
+          } else {
+            this.loading.lineChart = true
+            this.validProcess()
+            this.loading.lineChart = false
+            this.flag.banTouch = 0
+          }
           this.loading.afterButton = false
         })
+
       }
     },
 
@@ -1015,254 +636,135 @@
       this.total = val2
     },
 
+    // 鏌ヨ寮傚父鏁版嵁鐨勭珯鐐瑰悕瀛楀拰鏁伴噺
+    queryExceptionSite(url, exceptionType) {
+      let params = {}
+      params['beginTime'] = this.beginTime
+      params['endTime'] = this.endTime
+      params['exceptionType'] = exceptionType
+
+      if (this.form.street.length != 0) {
+        params['street'] = this.form.street.join()
+      }
+      if (this.form.dutyCompany.length != 0) {
+        params['dutyCompany'] = this.form.dutyCompany.join()
+      }
+      return this.$http.get(url, { params: params })
+    },
+
     /**
      * description锛氬綋鐢ㄦ埛鏀瑰彉鏌ヨ鐨勬椂闂村尯闂存椂锛屼細鏍规嵁璇ュ尯闂存煡璇㈠悇寮傚父鐨勭珯鐐癸紝鏌ヨ璇ユ椂闂村尯闂寸殑鍚勫紓甯告暟閲�
      * @createTime:2023-08-18
      */
     getShopNames() {
       /* 鏌ヨ寮傚父鐨勭珯鐐� */
+      this.queryExceptionSite('/dust/sitenamecode', 0).then((result) => {
+        this.exception.exception0 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception0 = true
+          return
+        }
+        this.isNoData.exception0 = false
+      })
+      this.queryExceptionSite('/dust/sitenamecode', 1).then((result) => {
+        this.exception.exception1 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception1 = true
+          return
+        }
+        this.isNoData.exception1 = false
+      })
+      this.queryExceptionSite('/dust/sitenamecode', 2).then((result) => {
+        this.exception.exception2 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception2 = true
+          return
+        }
+        this.isNoData.exception2 = false
+      })
 
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '0',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception0 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception0 = true
-            return
-          }
-          this.isNoData.exception0 = false
-        })
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '1',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception1 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception1 = true
-            return
-          }
-          this.isNoData.exception1 = false
-        })
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '2',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception2 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception2 = true
-            return
-          }
-          this.isNoData.exception2 = false
-        })
+      this.queryExceptionSite('/dust/sitenamecode', 3).then((result) => {
+        this.exception.exception3 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception3 = true
+          return
+        }
+        this.isNoData.exception3 = false
+      })
 
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '3',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception3 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception3 = true
-            return
-          }
-          this.isNoData.exception3 = false
-        })
+      this.queryExceptionSite('/dust/sitenamecode', 4).then((result) => {
+        this.exception.exception4 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception4 = true
+          return
+        }
+        this.isNoData.exception4 = false
+      })
+      this.queryExceptionSite('/dust/sitenamecode', 5).then((result) => {
+        this.exception.exception5 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception5 = true
+          return
+        }
+        this.isNoData.exception5 = false
+      })
+      this.queryExceptionSite('/dust/sitenamecode', 6).then((result) => {
+        this.exception.exception6 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception6 = true
+          return
+        }
+        this.isNoData.exception6 = false
+      })
+      this.queryExceptionSite('/dust/sitenamecode', 7).then((result) => {
+        this.exception.exception7 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception7 = true
+          return
+        }
+        this.isNoData.exception7 = false
+      })
+      this.queryExceptionSite('/dust/sitenamecode', 8).then((result) => {
+        this.exception.exception8 = result.data.data
+        if (result.data.data.length == 0) {
+          this.isNoData.exception8 = true
+          return
+        }
 
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '4',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception4 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception4 = true
-            return
-          }
-          this.isNoData.exception4 = false
-        })
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '5',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception5 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception5 = true
-            return
-          }
-          this.isNoData.exception5 = false
-        })
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '6',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception6 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception6 = true
-            return
-          }
-          this.isNoData.exception6 = false
-        })
-      this.$http
-        .get('/dust/sitenamecode', {
-          params: {
-            exceptionType: '7',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception7 = result.data.data
-          if (result.data.data.length == 0) {
-            this.isNoData.exception7 = true
-            return
-          }
-          this.isNoData.exception7 = false
-        })
+        this.isNoData.exception8 = false
+      })
 
       /* 寮傚父寮傚父鏁伴噺 */
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '0',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception0Num = result.data.data
-        })
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '1',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception1Num = result.data.data
-        })
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '2',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception2Num = result.data.data
-        })
+      this.queryExceptionSite('/dust/exceptionnum', 0).then((result) => {
+        this.exception.exception0Num = result.data.data
+      })
+      this.queryExceptionSite('/dust/exceptionnum', 1).then((result) => {
+        this.exception.exception1Num = result.data.data
+      })
+      this.queryExceptionSite('/dust/exceptionnum', 2).then((result) => {
+        this.exception.exception2Num = result.data.data
+      })
 
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '3',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception3Num = result.data.data
-        })
+      this.queryExceptionSite('/dust/exceptionnum', 3).then((result) => {
+        this.exception.exception3Num = result.data.data
+      })
 
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '4',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception4Num = result.data.data
-        })
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '5',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception5Num = result.data.data
-        })
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '6',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception6Num = result.data.data
-        })
-      this.$http
-        .get('/dust/exceptionnum', {
-          params: {
-            exceptionType: '7',
-            beginTime: this.beginTime,
-            endTime: this.endTime
-          }
-        })
-        .then((result) => {
-          this.exception.exception7Num = result.data.data
-        })
+      this.queryExceptionSite('/dust/exceptionnum', 4).then((result) => {
+        this.exception.exception4Num = result.data.data
+      })
+      this.queryExceptionSite('/dust/exceptionnum', 5).then((result) => {
+        this.exception.exception5Num = result.data.data
+      })
+      this.queryExceptionSite('/dust/exceptionnum', 6).then((result) => {
+        this.exception.exception6Num = result.data.data
+      })
+      this.queryExceptionSite('/dust/exceptionnum', 7).then((result) => {
+        this.exception.exception7Num = result.data.data
+      })
+      this.queryExceptionSite('/dust/exceptionnum', 8).then((result) => {
+        this.exception.exception8Num = result.data.data
+      })
     },
-
-    /**
-     * description锛氳姹傚紓甯哥殑搴楅摵鍚嶅瓧
-     * @param锛氬紓甯哥被鍨嬶紝寮�濮嬫椂闂达紝缁撴潫鏃堕棿
-     * @returns锛� 寮傚父鐨勬暟鎹�
-     */
-    // getSiteNameByExceptionType(exception, beginT, endT) {
-    //   let param = {
-    //     exceptionType: exception,
-    //     beginTime: beginT,
-    //     endTime: endT
-    //   };
-
-    //   this.$http.get('/dust/sitenamecode', { params: param }).then((res) => {
-    //     return res.data.data;
-    //   });
-    //   return;
-    // },
 
     /**
      * description锛氭樉绀哄璇濇,杩斿洖璇ュ紓甯告椂闂存鐨勬墍鏈夋暟鎹�
@@ -1282,24 +784,28 @@
       //鏍规嵁褰撳墠琛岀殑缂栧彿锛岃捣濮嬫椂闂存潵 璇锋眰寮傚父鏁版嵁
       // 瀵硅姹傚埌鐨勬暟鎹繘琛岄灏炬嫾鎺�
       // 寰楀埌鍓嶅悗瀹屾暣鏁版嵁杩涜缁樺埗鍥惧舰
-      this.loading.lineChart = true
-      let params = {}
-      if (row.name) {
-        params['siteName'] = row.name
-      }
-      if (row.beginTime) {
-        params['beginTime'] = row.beginTime
-      }
-      if (row.endTime) {
-        params['endTime'] = row.endTime
-      }
+      
+      
 
-      this.$http.get('/dust/history', { params: params }).then((response) => {
-        this.dialog.historyData = response.data.data
-        this.dialog.exceptionTotal = response.data.data.length
-        // 閫昏緫澶勭悊
-        this.timeAndDataProcessed()
-      })
+      historyApi.queryHistoryData({
+          siteName:row.name,
+          beginTime:row.beginTime,
+          endTime:row.endTime
+        }).then(response => {
+          // 淇濆瓨杩斿洖鐨勮秴鏍囨暟鎹�
+          this.dialog.historyData = response.data.data
+          this.dialog.exceptionTotal = response.data.data.length
+          // 閫昏緫澶勭悊
+
+          if (this.tableCurrentRowData.exceptionType != '8') {
+            this.timeAndDataProcessed()
+          } else {
+            this.loading.lineChart = true
+            this.validProcess()
+            this.loading.lineChart = false
+            this.flag.banTouch = 0
+          }
+        })
     },
     /**
      * description锛氭潯浠舵煡璇㈠紓甯哥殑鏁版嵁
@@ -1325,10 +831,16 @@
       if (this.form.exceptionName.length != 0) {
         params['exceptionType'] = this.form.exceptionName.join()
       }
+      if (this.form.street.length != 0) {
+        params['street'] = this.form.street.join()
+      }
+      if (this.form.dutyCompany.length != 0) {
+        params['dutyCompany'] = this.form.dutyCompany.join()
+      }
       params['beginTime'] = this.beginTime
       params['endTime'] = this.endTime
 
-      this.$http.get('/dust/exceptiondata', { params: params }).then((response) => {
+      this.$http.get('/dust/exceptiondata2', { params: params }).then((response) => {
         // 淇濆瓨杩斿洖鐨�
         // this.tableData = response.data.data.rows;
         this.displayData = response.data.data.rows
@@ -1448,6 +960,14 @@
             </el-form-item>
 
             <el-form-item>
+              <DutyCompany @submitDutyCompanyValue="(n) => (form.dutyCompany = n)"> </DutyCompany>
+            </el-form-item>
+
+            <el-form-item>
+              <StreetInfo @submitStreetValue="(n) => (form.street = n)"> </StreetInfo>
+            </el-form-item>
+
+            <el-form-item>
               <TimeShortCuts timeType="day" @submit-time="giveTime"></TimeShortCuts>
             </el-form-item>
 
@@ -1483,7 +1003,7 @@
           </template>
 
           <el-row :gutter="20" class="card-row">
-            <el-col :span="6">
+            <el-col :span="5">
               <AnalysisCard
                 :site-name="cardRow1[0].siteName"
                 :exception-type="cardRow1[0].exceptionType"
@@ -1500,7 +1020,8 @@
                 <img src="@/assets/exception/exception4.png" height="24" width="24" />
               </AnalysisCard>
             </el-col>
-            <el-col :span="6">
+
+            <el-col :span="5">
               <AnalysisCard
                 :site-name="cardRow1[1].siteName"
                 :exception-type="cardRow1[1].exceptionType"
@@ -1517,7 +1038,46 @@
                 <img src="@/assets/exception/exception5.png" height="24" width="24" />
               </AnalysisCard>
             </el-col>
-            <el-col :span="6">
+
+
+            <el-col :span="4">
+              <AnalysisCard
+                :site-name="cardRow3[2].siteName"
+                :exception-type="cardRow3[2].exceptionType"
+                :begin-time="beginTime"
+                :end-time="endTime"
+                :exception-name="cardRow3[2].exceptionName"
+                :site-num="cardRow3[2].siteNum"
+                :exception-num="cardRow3[2].exceptionNum"
+                :exception-all-num="exceptionAllNum"
+                :site-num-all="siteTotal"
+                :isNoDataStatus="cardRow3[2].isNoDataStatus"
+                @get-abnormal-data-by-click="getAbnormalDataByClick"
+              >
+                <img src="@/assets/exception/exception3.png" height="24" width="24" />
+              </AnalysisCard>
+            </el-col>
+           
+
+            <el-col :span="5">
+              <AnalysisCard
+                :site-name="cardRow2[0].siteName"
+                :exception-type="cardRow2[0].exceptionType"
+                :begin-time="beginTime"
+                :end-time="endTime"
+                :exception-name="cardRow2[0].exceptionName"
+                :site-num="cardRow2[0].siteNum"
+                :exception-num="cardRow2[0].exceptionNum"
+                :exception-all-num="exceptionAllNum"
+                :site-num-all="siteTotal"
+                :isNoDataStatus="cardRow2[0].isNoDataStatus"
+                @get-abnormal-data-by-click="getAbnormalDataByClick"
+              >
+                <img src="@/assets/exception/exception7.png" height="24" width="24" />
+              </AnalysisCard>
+            </el-col>
+
+            <el-col :span="5">
               <AnalysisCard
                 :site-name="cardRow1[2].siteName"
                 :exception-type="cardRow1[2].exceptionType"
@@ -1534,60 +1094,11 @@
                 <img src="@/assets/exception/exception6.png" height="24" width="24" />
               </AnalysisCard>
             </el-col>
-            <el-col :span="6">
-              <AnalysisCard
-                :site-name="cardRow1[3].siteName"
-                :exception-type="cardRow1[3].exceptionType"
-                :begin-time="beginTime"
-                :end-time="endTime"
-                :exception-name="cardRow1[3].exceptionName"
-                :site-num="cardRow1[3].siteNum"
-                :exception-num="cardRow1[3].exceptionNum"
-                :exception-all-num="exceptionAllNum"
-                :site-num-all="siteTotal"
-                :isNoDataStatus="cardRow1[3].isNoDataStatus"
-                @get-abnormal-data-by-click="getAbnormalDataByClick"
-              >
-                <img src="@/assets/exception/exception7.png" height="24" width="24" />
-              </AnalysisCard>
-            </el-col>
+
+
           </el-row>
 
-          <el-row :gutter="20">
-            <el-col :span="6">
-              <AnalysisCard
-                :site-name="cardRow2[0].siteName"
-                :exception-type="cardRow2[0].exceptionType"
-                :begin-time="beginTime"
-                :end-time="endTime"
-                :exception-name="cardRow2[0].exceptionName"
-                :site-num="cardRow2[0].siteNum"
-                :exception-num="cardRow2[0].exceptionNum"
-                :exception-all-num="exceptionAllNum"
-                :site-num-all="siteTotal"
-                :isNoDataStatus="cardRow2[0].isNoDataStatus"
-                @get-abnormal-data-by-click="getAbnormalDataByClick"
-              >
-                <img src="@/assets/exception/exception0.png" height="24" width="24" />
-              </AnalysisCard>
-            </el-col>
-            <el-col :span="6">
-              <AnalysisCard
-                :site-name="cardRow2[1].siteName"
-                :exception-type="cardRow2[1].exceptionType"
-                :begin-time="beginTime"
-                :end-time="endTime"
-                :exception-name="cardRow2[1].exceptionName"
-                :site-num="cardRow2[1].siteNum"
-                :exception-num="cardRow2[1].exceptionNum"
-                :exception-all-num="exceptionAllNum"
-                :site-num-all="siteTotal"
-                :isNoDataStatus="cardRow2[1].isNoDataStatus"
-                @get-abnormal-data-by-click="getAbnormalDataByClick"
-              >
-                <img src="@/assets/exception/exception1.png" height="24" width="24" />
-              </AnalysisCard>
-            </el-col>
+          <el-row :gutter="20" class="card-row">
             <el-col :span="6">
               <AnalysisCard
                 :site-name="cardRow2[2].siteName"
@@ -1602,27 +1113,67 @@
                 :isNoDataStatus="cardRow2[2].isNoDataStatus"
                 @get-abnormal-data-by-click="getAbnormalDataByClick"
               >
-                <img src="@/assets/exception/exception2.png" height="24" width="24" />
+                <img src="@/assets/exception/exception1.png" height="24" width="24" />
               </AnalysisCard>
             </el-col>
             <el-col :span="6">
               <AnalysisCard
-                :site-name="cardRow2[3].siteName"
-                :exception-type="cardRow2[3].exceptionType"
+                :site-name="cardRow3[0].siteName"
+                :exception-type="cardRow3[0].exceptionType"
                 :begin-time="beginTime"
                 :end-time="endTime"
-                :exception-name="cardRow2[3].exceptionName"
-                :site-num="cardRow2[3].siteNum"
-                :exception-num="cardRow2[3].exceptionNum"
+                :exception-name="cardRow3[0].exceptionName"
+                :site-num="cardRow3[0].siteNum"
+                :exception-num="cardRow3[0].exceptionNum"
                 :exception-all-num="exceptionAllNum"
                 :site-num-all="siteTotal"
-                :isNoDataStatus="cardRow2[3].isNoDataStatus"
+                :isNoDataStatus="cardRow3[0].isNoDataStatus"
+                @get-abnormal-data-by-click="getAbnormalDataByClick"
+              >
+                <img src="@/assets/exception/exception2.png" height="24" width="24" />
+              </AnalysisCard>
+            </el-col>
+
+            <el-col :span="6">
+              <AnalysisCard
+                :site-name="cardRow3[1].siteName"
+                :exception-type="cardRow3[1].exceptionType"
+                :begin-time="beginTime"
+                :end-time="endTime"
+                :exception-name="cardRow3[1].exceptionName"
+                :site-num="cardRow3[1].siteNum"
+                :exception-num="cardRow3[1].exceptionNum"
+                :exception-all-num="exceptionAllNum"
+                :site-num-all="siteTotal"
+                :isNoDataStatus="cardRow3[1].isNoDataStatus"
                 @get-abnormal-data-by-click="getAbnormalDataByClick"
               >
                 <img src="@/assets/exception/exception3.png" height="24" width="24" />
               </AnalysisCard>
             </el-col>
+
+            <el-col :span="6">
+              <AnalysisCard
+                :site-name="cardRow2[1].siteName"
+                :exception-type="cardRow2[1].exceptionType"
+                :begin-time="beginTime"
+                :end-time="endTime"
+                :exception-name="cardRow2[1].exceptionName"
+                :site-num="cardRow2[1].siteNum"
+                :exception-num="cardRow2[1].exceptionNum"
+                :exception-all-num="exceptionAllNum"
+                :site-num-all="siteTotal"
+                :isNoDataStatus="cardRow2[1].isNoDataStatus"
+                @get-abnormal-data-by-click="getAbnormalDataByClick"
+              >
+                <img src="@/assets/exception/exception0.png" height="24" width="24" />
+              </AnalysisCard>
+            </el-col>
           </el-row>
+          <!-- 
+          <el-row :gutter="20">
+            
+          </el-row> -->
         </el-card>
       </el-col>
     </el-row>
@@ -1656,10 +1207,10 @@
             fixed
             :index="indexMethod1"
           />
-          <el-table-column prop="name" label="绔欑偣鍚嶇О" show-overflow-tooltip />
-          <el-table-column prop="mnCode" label="璁惧缂栧彿" align="center" show-overflow-tooltip />
+          <el-table-column prop="name" label="鐐逛綅鍚嶇О" show-overflow-tooltip />
+          <el-table-column prop="mnCode" label="璁惧缂栫爜" align="center" show-overflow-tooltip />
           <el-table-column prop="exception" label="寮傚父绫诲瀷" align="center" show-overflow-tooltip />
-          <el-table-column prop="region" label="鍖哄煙" align="center" show-overflow-tooltip />
+          <el-table-column prop="region" label="鍖哄幙" align="center" show-overflow-tooltip />
           <el-table-column prop="beginTime" label="寮�濮嬫椂闂�" align="center" show-overflow-tooltip />
           <el-table-column prop="endTime" label="缁撴潫鏃堕棿" align="center" show-overflow-tooltip />
           <el-table-column
@@ -1716,17 +1267,6 @@
             <div>
               <span class="diag-head-text1">杩愮淮鍟嗭細</span>{{ tableCurrentRowData.dutyCompany }}
             </div>
-            <!-- <div>
-            <span class="diag-head-text1">寮傚父绫诲瀷锛�</span>
-            <span v-if="tableCurrentRowData.exceptionType == '0'">鏁版嵁缂哄け寮傚父</span>
-            <span v-else-if="tableCurrentRowData.exceptionType == '1'">鏁版嵁瓒呬綆</span>
-            <span v-else-if="tableCurrentRowData.exceptionType == '2'">瓒呮爣</span>
-            <span v-else-if="tableCurrentRowData.exceptionType == '3'">鏁版嵁闀挎椂闂存棤娉㈠姩</span>
-            <span v-else-if="tableCurrentRowData.exceptionType == '4'">閲忕骇绐佸彉寮傚父</span>
-            <span v-else-if="tableCurrentRowData.exceptionType == '5'">涓磋繎瓒呮爣寮傚父</span>
-            <span v-else-if="tableCurrentRowData.exceptionType == '6'">鍗曟棩瓒呮爣娆℃暟涓寸晫寮傚父</span>
-            <span v-else-if="tableCurrentRowData.exceptionType == '7'">婊戝姩骞冲潎鍊煎紓甯�</span>
-          </div> -->
 
             <div>
               <span class="diag-head-text1">寮傚父鏃堕棿娈碉細</span>{{ tableCurrentRowData.beginTime }} ~
@@ -1769,8 +1309,6 @@
         </div>
       </template>
 
-      <!-- :option="dialog.option" -->
-
       <!-- 鍥惧舰 -->
       <DustLineChart
         :option="dialog.option"
@@ -1789,16 +1327,15 @@
             fixed
             :index="indexMethod2"
           ></el-table-column>
-          <!-- <el-table-column fixed prop="name" label="绔欑偣鍚嶇О" show-overflow-tooltip />
-        <el-table-column prop="mnCode" label="璁惧缂栧彿" align="center" show-overflow-tooltip />
-        <el-table-column prop="dutyCompany" label="杩愮淮鍟�" align="center" show-overflow-tooltip /> -->
+
           <el-table-column prop="lst" label="閲囬泦鏃堕棿" align="center" show-overflow-tooltip />
           <el-table-column
             prop="dustValue"
-            label="棰楃矑鐗╂祿搴�(mg/m鲁)"
+            label="TSP(mg/m鲁)"
             align="center"
             show-overflow-tooltip
           />
+          <el-table-column prop="flag" label="flag" align="center" show-overflow-tooltip />
         </el-table>
       </div>
       <template #footer>

--
Gitblit v1.9.3