|
@@ -131,6 +131,7 @@
|
|
|
:max="currentMonitorDevice.temperatureUp"
|
|
|
style="width: 100%"
|
|
|
:disabled="!currentMonitorDevice.temperatureUp"
|
|
|
+ @change="temperatureChange"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -145,6 +146,7 @@
|
|
|
:max="currentMonitorDevice.temperatureUp"
|
|
|
style="width: 100%"
|
|
|
:disabled="!currentMonitorDevice.temperatureDown"
|
|
|
+ @change="temperatureChange"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -271,14 +273,14 @@
|
|
|
// 温度上下限校验
|
|
|
function validateTemperature(rule, value, callback) {
|
|
|
if (rule.field == 'temperatureDown') {
|
|
|
- if (formData.value.temperatureUp !== null && value >= formData.value.temperatureUp) {
|
|
|
- callback(new Error('温度下限不能大于或等于温度上限:' + formData.value.temperatureUp))
|
|
|
+ if (value !== null && value >= formData.value.temperatureUp) {
|
|
|
+ callback(new Error('温度下限不能大于等于所填的温度上限:' + formData.value.temperatureUp))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
|
} else if (rule.field == 'temperatureUp') {
|
|
|
- if (formData.value.temperatureDown !== null && value <= formData.value.temperatureDown) {
|
|
|
- callback(new Error('温度上限不能小于或等于温度下限:' + formData.value.temperatureDown))
|
|
|
+ if (value !== null && value <= formData.value.temperatureDown) {
|
|
|
+ callback(new Error('温度上限不能小于等于所填的温度下限:' + formData.value.temperatureDown))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
@@ -288,14 +290,14 @@
|
|
|
// 湿度上下限校验
|
|
|
function validateHumidity(rule, value, callback) {
|
|
|
if (rule.field == 'humidityDown') {
|
|
|
- if (formData.value.humidityUp !== null && value >= formData.value.humidityUp) {
|
|
|
- callback(new Error('湿度下限不能大于或等于湿度上限:' + formData.value.humidityUp))
|
|
|
+ if (value !== null && value >= formData.value.humidityUp) {
|
|
|
+ callback(new Error('湿度下限不能大于等于所填的湿度上限:' + formData.value.humidityUp))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
|
} else if (rule.field == 'humidityUp') {
|
|
|
- if (formData.value.humidityDown !== null && value <= formData.value.humidityDown) {
|
|
|
- callback(new Error('湿度上限不能小于或等于湿度下限:' + formData.value.humidityDown))
|
|
|
+ if (value !== null && value <= formData.value.humidityDown) {
|
|
|
+ callback(new Error('湿度上限不能小于等于所填的湿度下限:' + formData.value.humidityDown))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
@@ -305,14 +307,14 @@
|
|
|
// CO2上下限校验
|
|
|
function validateCo2(rule, value, callback) {
|
|
|
if (rule.field == 'co2Down') {
|
|
|
- if (formData.value.co2Up !== null && value >= formData.value.co2Up) {
|
|
|
- callback(new Error('CO2下限不能大于或等于CO2上限:' + formData.value.co2Up))
|
|
|
+ if (value !== null && value >= formData.value.co2Up) {
|
|
|
+ callback(new Error('CO2下限不能大于等于所填的CO2上限:' + formData.value.co2Up))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
|
} else if (rule.field == 'co2Up') {
|
|
|
- if (formData.value.co2Down !== null && value <= formData.value.co2Down) {
|
|
|
- callback(new Error('CO2上限不能小于或等于CO2下限:' + formData.value.co2Down))
|
|
|
+ if (value !== null && value <= formData.value.co2Down) {
|
|
|
+ callback(new Error('CO2上限不能小于等于所填的CO2下限:' + formData.value.co2Down))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
@@ -346,6 +348,9 @@
|
|
|
temperatureUp: data.up, //温度上限
|
|
|
temperatureDown: data.down //温度下限
|
|
|
}
|
|
|
+ nextTick(() => {
|
|
|
+ formRef.value.validate(['temperatureUp', 'temperatureDown'])
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
// 获取监测对象
|
|
@@ -364,6 +369,7 @@
|
|
|
if (type == 'add') {
|
|
|
formData.value.name = currentMonitorObj.value.name + '-' + pointName.value
|
|
|
} else {
|
|
|
+ pointName.value = '' // 编辑取消回显
|
|
|
formData.value.time = [
|
|
|
formData.value.ignoreStartTime ? formData.value.ignoreStartTime : null,
|
|
|
formData.value.ignoreEndTime ? formData.value.ignoreEndTime : null
|
|
@@ -461,6 +467,23 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 温度上下限变化 暂时逻辑控制冰箱型号回显用
|
|
|
+ const temperatureChange = () => {
|
|
|
+ if (fridgeName.value) {
|
|
|
+ const { up, down } = fridgeRanges.value[fridgeName.value]
|
|
|
+ if (formData.value.temperatureUp != up || formData.value.temperatureDown != down) {
|
|
|
+ fridgeName.value = null
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ // 这里是温度上下限达到对饮冰箱型号的up down 就回显选中
|
|
|
+ // filteredFridges.value.forEach((i) => {
|
|
|
+ // if (formData.value.temperatureUp == i.range.up && formData.value.temperatureDown == i.range.down) {
|
|
|
+ // fridgeName.value = i.value
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
const fridgeName = ref() //选择的冰箱型号
|
|
|
const fridgeRanges = ref({
|
|
|
'-80': { up: -70, down: -80 },
|
|
@@ -478,7 +501,8 @@
|
|
|
|
|
|
return {
|
|
|
...fridge,
|
|
|
- disabled: isDisabled
|
|
|
+ disabled: isDisabled,
|
|
|
+ range: { up, down }
|
|
|
}
|
|
|
})
|
|
|
}
|
|
@@ -554,6 +578,9 @@
|
|
|
:deep(.ant-form-item) {
|
|
|
width: 100%;
|
|
|
margin-bottom: 10px;
|
|
|
+ .ant-form-item-control {
|
|
|
+ flex: 1;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.form_item {
|