xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiaoguangbin 2023-12-12 19:16:48 +08:00
commit d689449fca
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/stationOperation/components/MapPane.vue
View File

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

5
src/views/stationOperation/index.vue
View File

@ -171,6 +171,7 @@ import DataListItem from './components/DataListItem.vue'
import ScrollContainer from '@/components/ScrollContainer/index.vue' import ScrollContainer from '@/components/ScrollContainer/index.vue'
import { getAction } from '../../api/manage' import { getAction } from '../../api/manage'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
import { MarkerType } from './components/markerEnum'
const key = 'updateList' const key = 'updateList'
export default { export default {
name: 'StationOperation', name: 'StationOperation',
@ -257,7 +258,9 @@ export default {
const res = await getAction('/jeecg-station-operation/stationOperation/findList') const res = await getAction('/jeecg-station-operation/stationOperation/findList')
this.originalDataList = res // 保留初始版本 this.originalDataList = res // 保留初始版本
this.dataList = cloneDeep(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.markerList_clone = cloneDeep(res)
this.getDataProvisionEfficiency(this.markerList_clone, 'one') this.getDataProvisionEfficiency(this.markerList_clone, 'one')
// this.timer = setInterval(() => { // this.timer = setInterval(() => {