Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/views/stationOperation/components/MapPane.vue

@@ -257,6 +257,7 @@ import { Circle } from 'ol/geom'
 import { fromLonLat } from 'ol/proj'
 import Feature from 'ol/Feature'
 import { Fill, Stroke, Style } from 'ol/style'
+import { cloneDeep } from 'lodash'
 
 // Filter中的筛选列表
 const filterList = [
@@ -394,8 +395,8 @@ export default {
 
       checkedKeys: [], // 选中的树节点
 
-      filterList, // 筛选类型列表
+      filterList: cloneDeep(filterList), // 筛选类型列表
-      dataQualityList, // 数据质量列表
+      dataQualityList: cloneDeep(dataQualityList), // 数据质量列表
 
       radius: 5000, // 距离
       dataSource: [], // Infomation Radius 表格数据源

src/views/stationOperation/index.vue

@@ -205,7 +205,7 @@ export default {
       markerList: [], // 地图上标记点列表
       markerList_clone: [], // 地图上标记点列表
       upDateStationList: [], // 有效率列表（显示波纹）
-      orgStationList: [], // 地图上标记点列表
+      orgStationList: [], // 地图上波纹列表
       markerType: 1, // 是否绘制地图上的圆
       circleRadius: 0,
 
@@ -227,6 +227,7 @@ export default {
       treeData: [], // 台站树列表
       timer: null,
       updataFilterType: [],
+      updataFilterDataQuality: [],
     }
   },
   created() {
@@ -290,12 +291,19 @@ export default {
               })
             })
             this.orgStationList = res.result
+            let arrA = []
+            let arrB = []
+            let arrC = []
             if (this.updataFilterType.length > 0) {
-              this.upDateStationList = this.orgStationList.filter((item) =>
+              arrA = this.orgStationList.filter((item) => this.updataFilterType.includes(item.stationType))
-                this.updataFilterType.includes(item.stationType)
-              )
             } else {
-              this.upDateStationList = res.result
+              arrA = res.result
+            }
+            if (this.updataFilterDataQuality.length > 0) {
+              arrB = this.orgStationList.filter((item) => this.updataFilterDataQuality.includes(item.quality))
+            } else {
+              arrB = res.result
+              // this.upDateStationList = res.result
             }
             if (this.markerList.length > 0) {
               let curList = []
@@ -308,8 +316,13 @@ export default {
                   })
                 }
               })
-              this.upDateStationList = curList
+              arrC = curList
             } else {
+              arrC = []
+            }
+            if (arrA.length > 0 && arrB.length > 0 && arrC.length > 0) {
+              this.upDateStationList = arrA.filter((val) => arrB.includes(val)).filter((item) => arrC.includes(item))
+            } else if (arrA.length == 0 || arrB.length == 0 || arrC.length == 0) {
               this.upDateStationList = []
             }
             setTimeout(() => {
@@ -492,8 +505,23 @@ export default {
         filterType,
         filterDataQuality
       )
+      this.updataFilterDataQuality = []
+      filterDataQuality.forEach((item) => {
+        if (item === 'Excellent data quality') {
+          this.updataFilterDataQuality.push('excellent')
+        } else if (item === 'Good data quality') {
+          this.updataFilterDataQuality.push('good')
+        } else if (item === 'Poor data quality') {
+          this.updataFilterDataQuality.push('bad')
+        } else {
+          this.updataFilterDataQuality.push('signal')
+        }
+      })
       this.markerList = this.originalDataList.filter((item) => filterType.includes(item.stationType))
       this.upDateStationList = this.orgStationList.filter((item) => filterType.includes(item.stationType))
+      this.upDateStationList = this.upDateStationList.filter((item) =>
+        this.updataFilterDataQuality.includes(item.quality)
+      )
     },
 
     // 地图图标点击