Kaynağa Gözat

fix(设施环境配置选择温湿度范围组件):修复填0值默认赋值系统限定值问题

ZZJ 1 yıl önce
ebeveyn
işleme
f550c372cb

+ 8 - 8
src/views/component/environmentRange.vue

@@ -134,22 +134,22 @@ export default {
         packageObj() {
         packageObj() {
             const obj = {
             const obj = {
                 temperature: {
                 temperature: {
-                    min: this.environmentInfo.temperatureMin || this.environmentInfo.minTemperature,
-                    max: this.environmentInfo.temperatureMax || this.environmentInfo.maxTemperature,
+                    min: this.environmentInfo.temperatureMin, // || this.environmentInfo.minTemperature,
+                    max: this.environmentInfo.temperatureMax // || this.environmentInfo.maxTemperature,
                 },
                 },
                 humidity: {
                 humidity: {
-                    min: this.environmentInfo.humidityMin || this.environmentInfo.minHumidity,
-                    max: this.environmentInfo.humidityMax || this.environmentInfo.maxHumidity,
+                    min: this.environmentInfo.humidityMin, // || this.environmentInfo.minHumidity,
+                    max: this.environmentInfo.humidityMax // || this.environmentInfo.maxHumidity,
                 },
                 },
             };
             };
             return JSON.stringify(obj);
             return JSON.stringify(obj);
         },
         },
         resolveObj(jsonString = "") {
         resolveObj(jsonString = "") {
             const data = jsonString.trim() !== "" && JSON.parse(jsonString);
             const data = jsonString.trim() !== "" && JSON.parse(jsonString);
-            this.environmentInfo.temperatureMin = data?.temperature?.min || this.environmentInfo.temperatureMin;
-            this.environmentInfo.temperatureMax = data?.temperature?.max || this.environmentInfo.temperatureMax;
-            this.environmentInfo.humidityMin = data?.humidity?.min || this.environmentInfo.humidityMin;
-            this.environmentInfo.humidityMax = data?.humidity?.max || this.environmentInfo.humidityMax;
+            this.environmentInfo.temperatureMin = data?.temperature?.min // || this.environmentInfo.temperatureMin;
+            this.environmentInfo.temperatureMax = data?.temperature?.max // || this.environmentInfo.temperatureMax;
+            this.environmentInfo.humidityMin = data?.humidity?.min // || this.environmentInfo.humidityMin;
+            this.environmentInfo.humidityMax = data?.humidity?.max // || this.environmentInfo.humidityMax;
         },
         },
         // 关闭当前窗口
         // 关闭当前窗口
         closeDialog() {
         closeDialog() {

+ 9 - 8
src/views/component/environmentRangePlus.vue

@@ -133,22 +133,23 @@ export default {
         packageObj() {
         packageObj() {
             const obj = {
             const obj = {
                 temperature: {
                 temperature: {
-                    min: this.environmentInfo.temperatureMin || this.environmentInfo.minTemperature,
-                    max: this.environmentInfo.temperatureMax || this.environmentInfo.maxTemperature,
+                    min: this.environmentInfo.temperatureMin, // || this.environmentInfo.minTemperature,
+                    max: this.environmentInfo.temperatureMax // || this.environmentInfo.maxTemperature,
                 },
                 },
                 humidity: {
                 humidity: {
-                    min: this.environmentInfo.humidityMin || this.environmentInfo.minHumidity,
-                    max: this.environmentInfo.humidityMax || this.environmentInfo.maxHumidity,
+                    min: this.environmentInfo.humidityMin, // || this.environmentInfo.minHumidity,
+                    max: this.environmentInfo.humidityMax // || this.environmentInfo.maxHumidity,
                 },
                 },
             };
             };
             return JSON.stringify(obj);
             return JSON.stringify(obj);
         },
         },
         resolveObj(jsonString = "") {
         resolveObj(jsonString = "") {
             const data = jsonString.trim() !== "" && JSON.parse(jsonString);
             const data = jsonString.trim() !== "" && JSON.parse(jsonString);
-            this.environmentInfo.temperatureMin = data?.temperature?.min || this.environmentInfo.temperatureMin;
-            this.environmentInfo.temperatureMax = data?.temperature?.max || this.environmentInfo.temperatureMax;
-            this.environmentInfo.humidityMin = data?.humidity?.min || this.environmentInfo.humidityMin;
-            this.environmentInfo.humidityMax = data?.humidity?.max || this.environmentInfo.humidityMax;
+            this.environmentInfo.temperatureMin = data?.temperature?.min // || this.environmentInfo.temperatureMin;
+            this.environmentInfo.temperatureMax = data?.temperature?.max // || this.environmentInfo.temperatureMax;
+            this.environmentInfo.humidityMin = data?.humidity?.min // || this.environmentInfo.humidityMin;
+            this.environmentInfo.humidityMax = data?.humidity?.max // || this.environmentInfo.humidityMax;
+            console.log(data,this.environmentInfo)
         },
         },
         // 关闭当前窗口
         // 关闭当前窗口
         closeDialog() {
         closeDialog() {