diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue
index 4fcfbf4..b54dd39 100644
--- a/src/views/laboratory/overview/index.vue
+++ b/src/views/laboratory/overview/index.vue
@@ -393,10 +393,10 @@
// ============================海口======================
// 海口温度检定工作间
const temperatureRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口温度检定工作间')
- if (receiveDispatchRoomIndex !== -1) {
+ if (temperatureRoomHKIndex !== -1) {
temperatureRoomHK.value.temperature = `${res.data[temperatureRoomHKIndex].temperature}` ? `${res.data[temperatureRoomHKIndex].temperature}` : '-'
temperatureRoomHK.value.humidity = `${res.data[temperatureRoomHKIndex].humidity}` ? `${res.data[temperatureRoomHKIndex].humidity}` : '-'
- temperatureRoomHK.value.voltage = `${res.data[temperatureRoomHKIndex].voltage}` ? `${res.data[temperatureRoomHKIndex].voltage}` : '-'
+ temperatureRoomHK.value.voltage = `${res.data[temperatureRoomHKIndex].voltage}` !== '' ? `${res.data[temperatureRoomHKIndex].voltage}` : '-'
temperatureRoomHK.value.netWork = res.data[temperatureRoomHKIndex].airStatus === '关机' || res.data[temperatureRoomHKIndex].airStatus === '开机'
temperatureRoomHK.value.airConditioner = res.data[temperatureRoomHKIndex].airStatus
temperatureRoomHK.value.smokeStatus = res.data[temperatureRoomHKIndex].smokeStatus
@@ -404,7 +404,7 @@
// 海口湿度检定工作间
const humidityRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口湿度检定工作间')
- if (receiveDispatchRoomIndex !== -1) {
+ if (humidityRoomHKIndex !== -1) {
humidityRoomHK.value.temperature = `${res.data[humidityRoomHKIndex].temperature}` ? `${res.data[humidityRoomHKIndex].temperature}` : '-'
humidityRoomHK.value.humidity = `${res.data[humidityRoomHKIndex].humidity}` ? `${res.data[humidityRoomHKIndex].humidity}` : '-'
humidityRoomHK.value.voltage = `${res.data[humidityRoomHKIndex].voltage}` ? `${res.data[humidityRoomHKIndex].voltage}` : '-'
@@ -414,14 +414,14 @@
// 海口UPS电源间
const UPSRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口UPS电源间')
- if (receiveDispatchRoomIndex !== -1) {
+ if (UPSRoomHKIndex !== -1) {
UPSRoomHK.value.temperature = `${res.data[UPSRoomHKIndex].temperature}` ? `${res.data[UPSRoomHKIndex].temperature}` : '-'
UPSRoomHK.value.humidity = `${res.data[UPSRoomHKIndex].humidity}` ? `${res.data[UPSRoomHKIndex].humidity}` : '-'
}
// 海口档案间
const FileRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口档案间')
- if (receiveDispatchRoomIndex !== -1) {
+ if (FileRoomHKIndex !== -1) {
FileRoomHK.value.temperature = `${res.data[FileRoomHKIndex].temperature}` ? `${res.data[FileRoomHKIndex].temperature}` : '-'
FileRoomHK.value.humidity = `${res.data[FileRoomHKIndex].humidity}` ? `${res.data[FileRoomHKIndex].humidity}` : '-'
FileRoomHK.value.voltage = `${res.data[FileRoomHKIndex].voltage}` ? `${res.data[FileRoomHKIndex].voltage}` : '-'
@@ -431,7 +431,7 @@
// 海口电磁学工作间1
const electromagnetism1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口电磁学工作间1')
- if (receiveDispatchRoomIndex !== -1) {
+ if (electromagnetism1RoomHKIndex !== -1) {
electromagnetism1RoomHK.value.temperature = `${res.data[electromagnetism1RoomHKIndex].temperature}` ? `${res.data[electromagnetism1RoomHKIndex].temperature}` : '-'
electromagnetism1RoomHK.value.humidity = `${res.data[electromagnetism1RoomHKIndex].humidity}` ? `${res.data[electromagnetism1RoomHKIndex].humidity}` : '-'
electromagnetism1RoomHK.value.voltage = `${res.data[electromagnetism1RoomHKIndex].voltage}` ? `${res.data[electromagnetism1RoomHKIndex].voltage}` : '-'
@@ -441,7 +441,7 @@
// 海口时间频率检定工作间1
const timeFrequency1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口时间频率检定工作间1')
- if (receiveDispatchRoomIndex !== -1) {
+ if (timeFrequency1RoomHKIndex !== -1) {
timeFrequency1RoomHK.value.temperature = `${res.data[timeFrequency1RoomHKIndex].temperature}` ? `${res.data[timeFrequency1RoomHKIndex].temperature}` : '-'
timeFrequency1RoomHK.value.humidity = `${res.data[timeFrequency1RoomHKIndex].humidity}` ? `${res.data[timeFrequency1RoomHKIndex].humidity}` : '-'
timeFrequency1RoomHK.value.voltage = `${res.data[timeFrequency1RoomHKIndex].voltage}` ? `${res.data[timeFrequency1RoomHKIndex].voltage}` : '-'
@@ -451,7 +451,7 @@
// 海口时间频率检定工作间2
const timeFrequency2RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口时间频率检定工作间2')
- if (receiveDispatchRoomIndex !== -1) {
+ if (timeFrequency2RoomHKIndex !== -1) {
timeFrequency2RoomHK.value.temperature = `${res.data[timeFrequency2RoomHKIndex].temperature}` ? `${res.data[timeFrequency2RoomHKIndex].temperature}` : '-'
timeFrequency2RoomHK.value.humidity = `${res.data[timeFrequency2RoomHKIndex].humidity}` ? `${res.data[timeFrequency2RoomHKIndex].humidity}` : '-'
timeFrequency2RoomHK.value.voltage = `${res.data[timeFrequency2RoomHKIndex].voltage}` ? `${res.data[timeFrequency2RoomHKIndex].voltage}` : '-'
@@ -461,7 +461,7 @@
// 海口微波信号检定工作间1
const microwaveSignal1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口微波信号检定工作间1')
- if (receiveDispatchRoomIndex !== -1) {
+ if (microwaveSignal1RoomHKIndex !== -1) {
microwaveSignal1RoomHK.value.temperature = `${res.data[microwaveSignal1RoomHKIndex].temperature}` ? `${res.data[microwaveSignal1RoomHKIndex].temperature}` : '-'
microwaveSignal1RoomHK.value.humidity = `${res.data[microwaveSignal1RoomHKIndex].humidity}` ? `${res.data[microwaveSignal1RoomHKIndex].humidity}` : '-'
microwaveSignal1RoomHK.value.voltage = `${res.data[microwaveSignal1RoomHKIndex].voltage}` ? `${res.data[microwaveSignal1RoomHKIndex].voltage}` : '-'
@@ -471,7 +471,7 @@
// 海口仪器收发间
const receiveDispatchRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口仪器收发间')
- if (receiveDispatchRoomIndex !== -1) {
+ if (receiveDispatchRoomHKIndex !== -1) {
receiveDispatchRoomHK.value.temperature = `${res.data[receiveDispatchRoomHKIndex].temperature}` ? `${res.data[receiveDispatchRoomHKIndex].temperature}` : '-'
receiveDispatchRoomHK.value.humidity = `${res.data[receiveDispatchRoomHKIndex].humidity}` ? `${res.data[receiveDispatchRoomHKIndex].humidity}` : '-'
receiveDispatchRoomHK.value.oxygenDensity = `${res.data[receiveDispatchRoomHKIndex].voltage}` ? `${res.data[receiveDispatchRoomHKIndex].oxygenDensity}` : '-'
@@ -479,7 +479,7 @@
// 海口安全阀校验间
const safetyValveRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口安全阀校验间')
- if (receiveDispatchRoomIndex !== -1) {
+ if (safetyValveRoomHKIndex !== -1) {
safetyValveRoomHK.value.temperature = `${res.data[safetyValveRoomHKIndex].temperature}` ? `${res.data[safetyValveRoomHKIndex].temperature}` : '-'
safetyValveRoomHK.value.humidity = `${res.data[safetyValveRoomHKIndex].humidity}` ? `${res.data[safetyValveRoomHKIndex].humidity}` : '-'
safetyValveRoomHK.value.oxygenDensity = `${res.data[safetyValveRoomHKIndex].voltage}` ? `${res.data[safetyValveRoomHKIndex].oxygenDensity}` : '-'
@@ -487,7 +487,7 @@
// 海口压力检定工作间2
const pressure2RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口压力检定工作间2')
- if (receiveDispatchRoomIndex !== -1) {
+ if (pressure2RoomHKIndex !== -1) {
pressure2RoomHK.value.temperature = `${res.data[pressure2RoomHKIndex].temperature}` ? `${res.data[pressure2RoomHKIndex].temperature}` : '-'
pressure2RoomHK.value.humidity = `${res.data[pressure2RoomHKIndex].humidity}` ? `${res.data[pressure2RoomHKIndex].humidity}` : '-'
pressure2RoomHK.value.voltage = `${res.data[pressure2RoomHKIndex].voltage}` ? `${res.data[pressure2RoomHKIndex].voltage}` : '-'
@@ -497,7 +497,7 @@
// 海口压力检定工作间1
const pressure1RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口压力检定工作间1')
- if (receiveDispatchRoomIndex !== -1) {
+ if (pressure1RoomHKIndex !== -1) {
pressure1RoomHK.value.temperature = `${res.data[pressure1RoomHKIndex].temperature}` ? `${res.data[pressure1RoomHKIndex].temperature}` : '-'
pressure1RoomHK.value.humidity = `${res.data[pressure1RoomHKIndex].humidity}` ? `${res.data[pressure1RoomHKIndex].humidity}` : '-'
pressure1RoomHK.value.voltage = `${res.data[pressure1RoomHKIndex].voltage}` ? `${res.data[pressure1RoomHKIndex].voltage}` : '-'
@@ -507,7 +507,7 @@
// 海口电磁学工作间2
const electromagnetism2RoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口电磁学工作间2')
- if (receiveDispatchRoomIndex !== -1) {
+ if (electromagnetism2RoomHKIndex !== -1) {
electromagnetism2RoomHK.value.temperature = `${res.data[electromagnetism2RoomHKIndex].temperature}` ? `${res.data[electromagnetism2RoomHKIndex].temperature}` : '-'
electromagnetism2RoomHK.value.humidity = `${res.data[electromagnetism2RoomHKIndex].humidity}` ? `${res.data[electromagnetism2RoomHKIndex].humidity}` : '-'
electromagnetism2RoomHK.value.voltage = `${res.data[electromagnetism2RoomHKIndex].voltage}` ? `${res.data[electromagnetism2RoomHKIndex].voltage}` : '-'
@@ -517,7 +517,7 @@
// 海口质量检定工作间
const qualityArbitrationRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口质量检定工作间')
- if (receiveDispatchRoomIndex !== -1) {
+ if (qualityArbitrationRoomHKIndex !== -1) {
qualityArbitrationRoomHK.value.temperature = `${res.data[qualityArbitrationRoomHKIndex].temperature}` ? `${res.data[qualityArbitrationRoomHKIndex].temperature}` : '-'
qualityArbitrationRoomHK.value.humidity = `${res.data[qualityArbitrationRoomHKIndex].humidity}` ? `${res.data[qualityArbitrationRoomHKIndex].humidity}` : '-'
qualityArbitrationRoomHK.value.voltage = `${res.data[qualityArbitrationRoomHKIndex].voltage}` ? `${res.data[qualityArbitrationRoomHKIndex].voltage}` : '-'
@@ -527,7 +527,7 @@
// 海口备品备件库
const spareRoomHKIndex = res.data.findIndex((item: { locationName: string }) => item.locationName === '海口备品备件库')
- if (receiveDispatchRoomIndex !== -1) {
+ if (spareRoomHKIndex !== -1) {
spareRoomHK.value.temperature = `${res.data[spareRoomHKIndex].temperature}` ? `${res.data[spareRoomHKIndex].temperature}` : '-'
spareRoomHK.value.humidity = `${res.data[spareRoomHKIndex].humidity}` ? `${res.data[spareRoomHKIndex].humidity}` : '-'
spareRoomHK.value.voltage = `${res.data[spareRoomHKIndex].voltage}` ? `${res.data[spareRoomHKIndex].voltage}` : '-'
@@ -584,90 +584,90 @@
-