Quellcode durchsuchen

:art: 温湿度单词顺序

Ritchie vor 1 Jahr
Ursprung
Commit
59afae1f57
2 geänderte Dateien mit 9 neuen und 10 gelöschten Zeilen
  1. 3 3
      src/assets/language/en.json
  2. 6 7
      src/views/device/index.vue

+ 3 - 3
src/assets/language/en.json

@@ -460,7 +460,6 @@
     "notSleeping": "Not sleeping",
     "lastRefreshTime": "Recent refresh time",
     "machineUniqueCode": "Machine Code",
-    "furnaceHeadTemperature": "Furnace head temperature",
     "stirringTemperature": "Temperature two",
     "cornGeneratorTemperature": "Temperature one",
     "cupQuantity": "Cup quantity",
@@ -469,8 +468,9 @@
     "outsideTm": "Outside temperature",
     "outsidehd": "Humidity outside cabinet",
     "noData": "No data available",
-    "temperatureInCabinet": "Temperature in cabinet",
-    "humidityInCabinet": "Humidity in cabinet",
+    "furnaceHeadTemperature": "Furnace temp",
+    "temperatureInCabinet": "Cabinet temp",
+    "humidityInCabinet": "Cabinet humidity",
     "showGoods": "Block or display goods",
     "diyFlower": "DIY flower",
     "editCheck": "Are you sure about the change?",

+ 6 - 7
src/views/device/index.vue

@@ -89,12 +89,6 @@
                 </span> -->
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
                   class="txt1 o-mt-10">
-                  {{ $t("device.furnaceHeadTemperature") + ':' +
-                    item.furnaceTm
-                    + $t("device.degree") }}
-                </span>
-                <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
-                  class="txt1 o-mt-10">
                   {{ $t("device.temperatureInCabinet") + ':' + item.cabinetTm
                     + $t("device.degree") }}
                 </span>
@@ -103,7 +97,12 @@
                   {{ $t("device.humidityInCabinet") + ':' + item.cabinetHd
                     + $t("device.humidity") }}
                 </span>
-
+                <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
+                  class="txt1 o-mt-10">
+                  {{ $t("device.furnaceHeadTemperature") + ':' +
+                    item.furnaceTm
+                    + $t("device.degree") }}
+                </span>
                 <img v-if="item.checkType" class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
                 <div class="contentBottomCon" v-if="item.checkType">