From 457f157829d0bdcfb5de3eec8ee0c55c00fba65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Sat, 5 Jul 2025 15:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/main.css       |  2 +-
 src/assets/css/main.scss      |  2 +-
 src/i18n/lang/en.js           |  5 ++---
 src/views/page/upload-con.vue |  2 +-
 src/views/page/upload.vue     | 30 ++++++++++++++++++++----------
 src/views/page/wetFan.vue     |  8 ++++----
 vue.config.js                 |  4 ++--
 7 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index b7b4ea81..da22bbe4 100644
--- a/src/assets/css/main.css
+++ b/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);
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index cb8f51d7..83c26d0f 100644
--- a/src/assets/css/main.scss
+++ b/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);
diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js
index d374fbba..eae52c3a 100644
--- a/src/i18n/lang/en.js
+++ b/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",
diff --git a/src/views/page/upload-con.vue b/src/views/page/upload-con.vue
index 4c8e8488..db245601 100644
--- a/src/views/page/upload-con.vue
+++ b/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>
diff --git a/src/views/page/upload.vue b/src/views/page/upload.vue
index 2711dfba..f420e306 100644
--- a/src/views/page/upload.vue
+++ b/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')],
-            actList2: [],
-            actList2New: [],
-            list2: [
+                this.$t('upload.sensorTypes.outdoorAvgSolarRadiation')]
+                return data
+        },
+        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: [],
-      loading:null,
-
-        }
+                ]
+            return  data
+         }, 
     },
     mounted() { 
         this.loading = this.$loading({
diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue
index 8f9155e9..1c911c39 100644
--- a/src/views/page/wetFan.vue
+++ b/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
diff --git a/vue.config.js b/vue.config.js
index 6cfc47b0..5ced73b8 100644
--- a/vue.config.js
+++ b/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: {