。

web/三相/src/layout/components/Navbar.vue

@@ -133,7 +133,7 @@ export default {
               // 用户修改了显示语言，重新设置语言
               this.chooseLanguage = languageKey;
               // 临时保存到cookies中，后面由具体的方法去处理
-              Cookies.set("flowinnIotLanguage", this.chooseLanguage,{ expires: 3000 });
+              Cookies.set("flowinnIotLanguage", this.chooseLanguage,{ expires: 30000 });
               this.setWebLanguage();
               window.location.reload();
               console.info("change-language:" + value);
@@ -179,6 +179,7 @@ export default {
       this.$i18n.locale = this.chooseLanguage;
       // 修改页面标题
       document.title = (this.$i18n.t('loginFormTitle')).replace("PDU","");
+      window.location.reload();
     },
     handleBianJi(){
       this.$router.push({ path: "/jgbh/xtjg"}).catch(()=>{});

web/三相/src/utils/i18n/i18n-en-US.json

@@ -266,7 +266,7 @@
   "szsx": "Set Sequence",
   "wsdcgq": "Temperature and Humidity Sensor",
   "ywcgq": "Smoke Sensor",
-  "sqcgq": "Water Immersion Sensor",
+  "sqcgq": "Water immersion Sensor",
   "mjcgq": "Access Control Sensor",
   "qtcgq": "Gas Sensor",
   "qyqlcgq": "Pressure Airflow Sensor",
@@ -413,7 +413,9 @@
   "VPNsz":"VPN settings",
   "WIFIsz":"WIFI settings",
   "gjnr":"Alarm content",
-  "cgqmc":"Sensor name"
+  "cgqmc":"Sensor name",
+  "SMTPsz":"SMTP settings",
+  "SNMPsz":"SNMP settings"
 
 
 }

web/三相/src/utils/i18n/i18n-ru-RU.json

@@ -362,7 +362,7 @@
   "sxxgl":"фазовая мощность",
   "sxxdl":"фазовый ток",
   "sxxhdl":"Потребление энергии по фазе",
-  "wlljg":"Оповещение сетие",
+  "wlljg":"Оповещение сети",
   "dyljg":"Оповещение по питанию",
   "cgqljg":"Оповещение по датчикам",
   "gjlx":"Тип оповещения",
@@ -414,5 +414,7 @@
   "VPNsz":"Настройки VPN",
   "WIFIsz":"Настройки WIFI",
   "gjnr":"Описание",
-  "cgqmc":"Тип датчика"
+  "cgqmc":"Тип датчика",
+  "SMTPsz":"Настройки SMTP",
+  "SNMPsz":"Настройки SNMP"
 }

web/三相/src/utils/i18n/i18n-zh-CN.json

@@ -413,7 +413,9 @@
   "VPNsz":"VPN设置",
   "WIFIsz":"WIFI设置",
   "gjnr":"告警内容",
-  "cgqmc":"传感器名称"
+  "cgqmc":"传感器名称",
+  "SMTPsz":"SMTP设置",
+  "SNMPsz":"SNMP设置"
 
 
 

web/三相/src/views/fwgl/dxsz/index.vue

@@ -10,7 +10,7 @@
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form" :model="form" :rules="rules" label-width="auto"  >
 
-                <el-form-item :required="true"  :label="this.$t('zt')" prop="mode">
+                <el-form-item   :label="this.$t('zt')" prop="mode">
                   <el-select style="width: 100%" v-model="form.mode"   @change="handleSelectChange"  allow-create   clearable :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>

web/三相/src/views/fwgl/smtpsz/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="14" class="card-box">
 
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> SMTP{{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('SMTPsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">

web/三相/src/views/fwgl/snmpsz/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> SNMP {{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i>  {{$t('SNMPsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">

web/三相/src/views/fwgl/telnetsz/index.vue

@@ -10,7 +10,7 @@
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form" :model="form" :rules="rules" label-width="auto"  >
 
-                <el-form-item :required="true" :label="this.$t('zt')" prop="mode">
+                <el-form-item   :label="this.$t('zt')" prop="mode">
                   <el-select style="width: 100%" v-model="form.mode"   @change="handleSelectChange"  allow-create   clearable :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>

web/三相/src/views/fwgl/wfwpz/index.vue

@@ -316,3 +316,9 @@
   };
 </script>
 
+<style>
+  .el-form-item__content .el-button--mini{
+    width: 100px;
+  }
+</style>
+

web/三相/src/views/login.vue

@@ -241,6 +241,7 @@
       this.$i18n.locale = this.chooseLanguage;
       // 修改页面标题
       document.title = (this.$i18n.t('loginFormTitle')).replace("PDU","");
+      window.location.reload();
     },
     handleChangeLanguage(languageKey){
       for (var i = 0; i < this.language.length; i++) {
@@ -253,7 +254,7 @@
             // 用户修改了显示语言，重新设置语言
             this.chooseLanguage = languageKey;
             // 临时保存到cookies中，后面由具体的方法去处理
-            Cookies.set("flowinnIotLanguage", this.chooseLanguage,{ expires: 3000 });
+            Cookies.set("flowinnIotLanguage", this.chooseLanguage,{ expires: 30000 });
             this.setWebLanguage();
             window.location.reload();
             console.info("change-language:" + value);

web/三相/src/views/txgl/rssz/index.vue

@@ -3,25 +3,25 @@
     <el-row>
       <el-col :span="12" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> RS485{{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('RS485sz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form" :model="form"  :rules="rules1"  label-width="140px">
 
-                <el-form-item :required="true" :label="this.$t('xzms')" prop="mode">
+                <el-form-item   :label="this.$t('xzms')" prop="mode">
                   <el-select style="width: 100%" v-model="form.mode"   @change="handleSelectChange"  allow-create   clearable :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
 
-                <el-form-item  :required="true" :label="this.$t('dz')" prop="ipaddress">
+                <el-form-item    :label="this.$t('dz')" prop="ipaddress">
                   <el-input v-model="form.ipaddress"   />
                 </el-form-item>
 
-                <el-form-item  :required="true" :label="this.$t('btl')" prop="sensorBaud">
+                <el-form-item    :label="this.$t('btl')" prop="sensorBaud">
                   <el-input v-model="form.sensorBaud"    />
                 </el-form-item>
 

web/三相/src/views/txgl/vpnsz/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> VPN{{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('VPNsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">

web/三相/src/views/txgl/wifisz/index.vue

@@ -4,13 +4,13 @@
     <el-row>
       <el-col :span="8" class="card-box">
         <el-card>
-          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> WIFI{{$t('sz')}}</span>
+          <div slot="header"><span style=" font-size: 20px; font-weight: bold;"><i class="el-icon-monitor"></i> {{$t('WIFIsz')}}</span>
           </div>
 
           <div class="el-table el-table--enable-row-hover el-table--medium">
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form3" :model="form3" :rules="rules1" label-width="auto">
-                <el-form-item   :required="true" :label="'SSID'" prop="ssid">
+                <el-form-item    :label="'SSID'" prop="ssid">
                   <el-input v-model="form3.ssid"   />
                 </el-form-item>
 
@@ -36,7 +36,7 @@
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form" :model="form"  :rules="rules2" label-width="auto">
 
-                <el-form-item :required="true" :label="this.$t('xzms')" prop="mode">
+                <el-form-item  :label="this.$t('xzms')" prop="mode">
                   <el-select style="width: 100%" v-model="form.mode"   @change="handleSelectChange"  allow-create   clearable :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>
@@ -80,7 +80,7 @@
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form2" :model="form2"  :rules="rules3" label-width="auto">
 
-                <el-form-item :required="true" :label="this.$t('xzms')" prop="mode">
+                <el-form-item   :label="this.$t('xzms')" prop="mode">
                   <el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable filterable>
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>

web/三相/src/views/txgl/wksz/index.vue

@@ -10,7 +10,7 @@
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form" :model="form" :rules="rules1"  label-width="auto">
 
-                    <el-form-item :required="true" :label="this.$t('xzms')" prop="mode">
+                    <el-form-item  :label="this.$t('xzms')" prop="mode">
                       <el-select style="width: 100%" v-model="form.mode"   @change="handleSelectChange"  allow-create   clearable :filterable="false">
                         <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                         </el-option>
@@ -54,7 +54,7 @@
             <template cellspacing="0" style="width: 100%;">
               <el-form ref="form2" :model="form2" :rules="rules2"  label-width="auto">
 
-                <el-form-item :required="true" :label="this.$t('xzms')" prop="mode">
+                <el-form-item   :label="this.$t('xzms')" prop="mode">
                   <el-select style="width: 100%" v-model="form2.mode"   @change="handleSelectChange2"  allow-create   clearable :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>