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

src/views/stationOperation/components/MapPane.vue

@@ -288,7 +288,7 @@ const filterList = [
     title: 'Nuclear Facilities',
     type: MarkerType.NuclearFacility,
     icon: FilterIcon[MarkerType.NuclearFacility],
-    checked: true,
+    checked: false,
   },
   {
     title: 'Groud monitoring station',

src/views/stationOperation/index.vue

@@ -171,6 +171,7 @@ import DataListItem from './components/DataListItem.vue'
 import ScrollContainer from '@/components/ScrollContainer/index.vue'
 import { getAction } from '../../api/manage'
 import { cloneDeep } from 'lodash'
+import { MarkerType } from './components/markerEnum'
 const key = 'updateList'
 export default {
   name: 'StationOperation',
@@ -257,7 +258,9 @@ export default {
         const res = await getAction('/jeecg-station-operation/stationOperation/findList')
         this.originalDataList = res // 保留初始版本
         this.dataList = cloneDeep(res)
-        this.markerList = cloneDeep(res)
+
+        this.markerList = cloneDeep(res).filter((stationInfo) => stationInfo.stationType !== MarkerType.NuclearFacility) // 去除核设施
+
         this.markerList_clone = cloneDeep(res)
         this.getDataProvisionEfficiency(this.markerList_clone, 'one')
         // this.timer = setInterval(() => {