翻译

src/assets/css/main.css

@@ -1521,7 +1521,7 @@ textarea {
 }
 
 .upload .upload-view {
-  width: 520px;
+  min-width: 520px;
   height: 520px;
   margin: 7.5px 10px;
   background: rgba(0, 132, 255, 0.15);

src/assets/css/main.scss

@@ -1604,7 +1604,7 @@ textarea {
     color: #fff;
 
     .upload-view {
-        width: 520px;
+        min-width: 520px;
         height: 520px;
         margin: 7.5px 10px;
         background: rgba(0, 132, 255, 0.15);

src/i18n/lang/en.js

@@ -1291,10 +1291,9 @@ module.exports = {
     "pump": {
       "pump1": "Water Pump 1",
       "pump2": "Water Pump 2",
-      "coolingLevel": {
         "prefix": "Start pump ",
-        "middle": " at cooling level ",
+        "middle": "at cooling level ",
-      }
+        "suffix": ""
     },
     "window": {
       "window1": "Vent Window 1 Mode",

src/views/page/upload-con.vue

@@ -40,7 +40,7 @@
                     <div class="page-title upload-title">
                         {{$t('upload.targetValue')}}
                     </div>
-                    <div class="upload-content upload-content1 ">
+                    <div class="upload-content">
                         <div @click="selList3(index)" v-for="item, index in list3" :key="index">
                             <div v-if="actList3.indexOf(index) == -1" class="no-sel"></div>
                             <div v-else class="sel"></div>

src/views/page/upload.vue

@@ -52,7 +52,18 @@ export default {
         return {
             actList1: [],
             actList1New: [],
-            list1: [ this.$t('upload.sensorTypes.outdoorAvgTemp'),
+          
+            actList2: [],
+            actList2New: [],
+            
+            inputData: [],
+      loading:null,
+
+        }
+    },
+    computed:{
+        list1(){
+            var data= [ this.$t('upload.sensorTypes.outdoorAvgTemp'),
                 this.$t('upload.sensorTypes.outdoorAvgHumidity'),
                 this.$t('upload.sensorTypes.outdoorAvgLight'),
                 this.$t('upload.sensorTypes.outdoorAvgWindSpeed'),
@@ -67,10 +78,11 @@ export default {
                 this.$t('upload.sensorTypes.outdoorAvgSoilTemp'),
                 this.$t('upload.sensorTypes.outdoorAvgSoilMoisture'),
                 this.$t('upload.sensorTypes.outdoorAvgPressure'),
-                this.$t('upload.sensorTypes.outdoorAvgSolarRadiation')],
+                this.$t('upload.sensorTypes.outdoorAvgSolarRadiation')]
-            actList2: [],
+                return data
-            actList2New: [],
+        },
-            list2: [
+        list2(){
+            var data=[
                   this.$t('upload.sensorTypes.targetPH'),
       this.$t('upload.sensorTypes.targetEC'),
       this.$t('upload.sensorTypes.avgPH'),
@@ -87,11 +99,9 @@ export default {
       `6${this.$t('upload.sensorTypes.channel')}`,
       `1${this.$t('upload.sensorTypes.waterTemp')}`,
       `2${this.$t('upload.sensorTypes.waterTemp')}`
-                ],
+                ]
-            inputData: [],
+            return  data
-      loading:null,
+         }, 
-
-        }
     },
     mounted() { 
         this.loading = this.$loading({

src/views/page/wetFan.vue

@@ -443,13 +443,13 @@ export default {
     methods: {
         getName(){
             if(this.indexs==1){
-                return '风机'
+                return this.$t('setParams.wetFan')
             }else if(this.indexs==2){
-                return '湿帘泵'
+                return this.$t('setParams.wetPump')
             }else if(this.indexs==3){
-                return '湿帘外翻窗'
+                return this.$t('setParams.wetWindow')
             }else{
-                return '湿帘风机'
+                return this.$t('setParams.wetFan')
             }
         },
         //失去焦点 计算公式 x/10

vue.config.js

@@ -44,9 +44,9 @@ module.exports = {
     },
       proxy: {
         "/api": {
-          // target: 'https://api.lihe-control.com', //地址
+          target: 'https://api.lihe-control.com', //地址
           // target: 'http://jiaxingtest.a1.luyouxia.net:21114', //地址
-          target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址
+          // target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址
           // target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址
           changeOrigin: true,
           pathRewrite: {