diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue index 9762796..dc74d55 100644 --- a/src/views/data/allDeviceData.vue +++ b/src/views/data/allDeviceData.vue @@ -63,10 +63,10 @@ text: 'TSP(ug/m³)', value: 'tsp' }, - { - text: '噪声(db)', - value: 'noise' - }, + // { + // text: '噪声(db)', + // value: 'noise' + // }, // { // text: '风速(m/s)', // value: 'windSpeed' diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue index 9762796..dc74d55 100644 --- a/src/views/data/allDeviceData.vue +++ b/src/views/data/allDeviceData.vue @@ -63,10 +63,10 @@ text: 'TSP(ug/m³)', value: 'tsp' }, - { - text: '噪声(db)', - value: 'noise' - }, + // { + // text: '噪声(db)', + // value: 'noise' + // }, // { // text: '风速(m/s)', // value: 'windSpeed' diff --git a/src/views/data/pointData.vue b/src/views/data/pointData.vue index 99ebec7..00daffe 100644 --- a/src/views/data/pointData.vue +++ b/src/views/data/pointData.vue @@ -83,7 +83,7 @@ {name: 'PM2.5', unit:'ug/m³', value:'pm25'}, {name: 'PM10', unit:'ug/m³', value:'pm10'}, {name: 'TSP', unit:'ug/m³', value:'tsp'}, - {name: '噪声', unit:'db', value:'noise'}, + // {name: '噪声', unit:'db', value:'noise'}, {name: '风速', unit:'m/s', value:'windSpeed'}, {name: '风力', unit:'级', value:'windPower'}, {name: '风向', unit:'°', value:'windDirection'}, diff --git a/src/views/data/allDeviceData.vue b/src/views/data/allDeviceData.vue index 9762796..dc74d55 100644 --- a/src/views/data/allDeviceData.vue +++ b/src/views/data/allDeviceData.vue @@ -63,10 +63,10 @@ text: 'TSP(ug/m³)', value: 'tsp' }, - { - text: '噪声(db)', - value: 'noise' - }, + // { + // text: '噪声(db)', + // value: 'noise' + // }, // { // text: '风速(m/s)', // value: 'windSpeed' diff --git a/src/views/data/pointData.vue b/src/views/data/pointData.vue index 99ebec7..00daffe 100644 --- a/src/views/data/pointData.vue +++ b/src/views/data/pointData.vue @@ -83,7 +83,7 @@ {name: 'PM2.5', unit:'ug/m³', value:'pm25'}, {name: 'PM10', unit:'ug/m³', value:'pm10'}, {name: 'TSP', unit:'ug/m³', value:'tsp'}, - {name: '噪声', unit:'db', value:'noise'}, + // {name: '噪声', unit:'db', value:'noise'}, {name: '风速', unit:'m/s', value:'windSpeed'}, {name: '风力', unit:'级', value:'windPower'}, {name: '风向', unit:'°', value:'windDirection'}, diff --git a/src/views/overview/component/deviceLayer.vue b/src/views/overview/component/deviceLayer.vue index 3d79c82..c8044e5 100644 --- a/src/views/overview/component/deviceLayer.vue +++ b/src/views/overview/component/deviceLayer.vue @@ -78,7 +78,9 @@ getDeviceList(this.listQuery).then(response => { this.list = response.data this.deviceOnlineList = this.list.filter(item=>item.online=='1') - this.deviceOfflineList = this.list.filter(item=>item.online=='2') + this.deviceOfflineList = this.list.filter(item=>item.online=='0') + console.log('在线数据', this.deviceOnlineList); + console.log('离线数据', this.deviceOfflineList); this.addPointOnMap(this.deviceOnlineList,this.deviceOnlineLayer,this.deviceOnlineIcon) this.addPointOnMap(this.deviceOfflineList,this.deviceOfflineLayer,this.deviceOfflineIcon) }) @@ -145,7 +147,7 @@ '
pm2.5' + (data.pm25==''?'--':data.pm25) + 'ug/m³
'+ '
pm10' + (data.pm10==''?'--':data.pm10) + 'ug/m³
'+ '
TSP' + (data.tsp==''?'--':data.tsp) + 'ug/m³
'+ - '
噪声' + (data.noise==''?'--':data.noise) + 'db
'+ + // '
噪声' + (data.noise==''?'--':data.noise) + 'db
'+ '
风速' + (data.windSpeed==''?'--':data.windSpeed) + 'm/s
'+ '
风力' + (data.windPower==''?'--':data.windPower) + '
'+ '
风向' + (data.windDirection==''?'--':data.windDirection) + '°
'+