e преди 2 години
родител
ревизия
f7a97acb98

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

@@ -422,7 +422,12 @@
   "zs":"certificate",
   "zssc":"Certificate upload",
   "mqbcts":"The maximum number of brokers is limited to 5",
-  "xtpz":"system configuration"
+  "xtpz":"system configuration",
+  "wu":"nothing",
+  "rzxy":"Authentication protocol",
+  "rzmm":"Authentication password",
+  "jmxy":"Encryption protocol",
+  "jmmm":"Encrypt password"
 
 
 }

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

@@ -423,6 +423,11 @@
   "zs":"Сертификат",
   "zssc":"Загрузка сертификата",
   "mqbcts":"Максимальное количество брокеров ограничено пятью",
-  "xtpz":"Настройка системы"
+  "xtpz":"Настройка системы",
+  "wu":"Нет",
+  "rzxy":"Соглашение об аутентификации",
+  "rzmm":"Пароль аутентификации",
+  "jmxy":"Протокол шифрования",
+  "jmmm":"Шифрование"
 
 }

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

@@ -422,8 +422,12 @@
   "zs":"证书",
   "zssc":"证书上传",
   "mqbcts":"broker最大数量限定为5个",
-  "xtpz":"系统配置"
-
+  "xtpz":"系统配置",
+  "wu":"无",
+  "rzxy":"认证协议",
+  "rzmm":"认证密码",
+  "jmxy":"加密协议",
+  "jmmm":"加密密码"
 
 
 

+ 53 - 2
web/三相/src/views/fwgl/snmpsz/index.vue

@@ -25,7 +25,28 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item :required="true" v-if="form.mode=='1'" :label="'SNMP TRAP'+this.$t('fwzt')" prop="trapMode">
+                <el-form-item   v-if="form.mode=='1'  && form.snmpVersion=='SNMP V3'" :label="this.$t('yhm2')" prop="yhm2">
+                  <el-input v-model="form.yhm"    />
+                </el-form-item>
+                <el-form-item  v-if="form.mode=='1' && form.snmpVersion=='SNMP V3' " :label="this.$t('rzxy')" prop="rzxy">
+                  <el-select style="width: 100%" v-model="form.rzxy"    @change="handleSelectChange1"    allow-create    :filterable="false">
+                    <el-option v-for="item in rzxys" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1' && form.snmpVersion=='SNMP V3'" :label="this.$t('rzmm')" prop="rzmm">
+                  <el-input v-model="form.rzmm"   :disabled="showClass1"   />
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1' && form.snmpVersion=='SNMP V3'" :label="this.$t('jmxy')" prop="jmxy">
+                  <el-select style="width: 100%" v-model="form.jmxy" @change="handleSelectChange2"       allow-create    :filterable="false">
+                    <el-option v-for="item in jmxys" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1' && form.snmpVersion=='SNMP V3'" :label="this.$t('jmmm')" prop="jmmm">
+                  <el-input v-model="form.jmmm"   :disabled="showClass2"  />
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1'" :label="'SNMP TRAP'+this.$t('fwzt')" prop="trapMode">
                   <el-select style="width: 100%" v-model="form.trapMode"       allow-create    :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>
@@ -67,12 +88,15 @@
         // 是否显示弹出层
         open: false,
         usertoken:"",
-
+        showClass1: true,
+        showClass2: true,
         // 表单参数
         form: {},
         sensorStatusForm: {}, // 传感器表单数据
         modes:[{"id":"0","name":"gb"},{"id":"1","name":"kq"}],
         SNMPs:[{"id":"SNMP V1","name":"SNMP V1"},{"id":"SNMP V2c","name":"SNMP V2c"},{"id":"SNMP V3","name":"SNMP V3"}],
+        rzxys:[{"id":"0","name":"wu"},{"id":"MD5","name":"MD5"},{"id":"SHA","name":"SHA"}],
+        jmxys:[{"id":"0","name":"wu"},{"id":"DES","name":"DES"},{"id":"AES","name":"AES"}],
         activeName: '温湿度传感器', // 当前激活的标签页的 name
         sensorStatusTabs:[],
         sensorStatusOpen: false, // 配置传感器
@@ -102,6 +126,18 @@
       handleSelectChange(type){
         this.form.mode=type
         //this.editDisabled()
+      },  handleSelectChange1(type){
+        if(type != '0') {  // 自动获取
+          this.showClass1 = false;
+        }else {
+          this.showClass1 = true;
+        }
+      },  handleSelectChange2(type){
+        if(type != '0') {  // 自动获取
+          this.showClass2 = false;
+        }else {
+          this.showClass2 = true;
+        }
       },
       //
       queryIp(){
@@ -111,6 +147,16 @@
         serviceManagement(params).then(response => {
           if(response.data!=null){
           this.form=response.data;
+          if( this.form.rzxy!='0'){
+            this.showClass1 = false;
+          }else{
+            this.showClass1 = true;
+          }
+          if( this.form.jmxy!='0'){
+            this.showClass2 = false;
+          }else{
+            this.showClass2 = true;
+          }
           }
 
       });
@@ -123,6 +169,11 @@
             params.token=this.usertoken;
             params.type="SnmpSave";
             params.mode=this.form.mode;
+            params.rzxy=this.form.rzxy;
+            params.rzmm=this.form.rzmm;
+            params.jmxy=this.form.jmxy;
+            params.jmmm=this.form.jmmm;
+            params.yhm=this.form.yhm;
             params.public=this.form.public;
             params.snmpVersion=this.form.snmpVersion;
             params.trapMode=this.form.trapMode;

+ 6 - 1
web/安德森/src/utils/i18n/i18n-en-US.json

@@ -431,7 +431,12 @@
   "zs":"certificate",
   "zssc":"Certificate upload",
   "IPbb":"IP version",
-  "xtpz":"system configuration"
+  "xtpz":"system configuration",
+  "wu":"nothing",
+  "rzxy":"Authentication protocol",
+  "rzmm":"Authentication password",
+  "jmxy":"Encryption protocol",
+  "jmmm":"Encrypt password"
 
 
 

+ 7 - 1
web/安德森/src/utils/i18n/i18n-ru-RU.json

@@ -432,5 +432,11 @@
   "zs":"Сертификат",
   "zssc":"Загрузка сертификата",
   "xtpz":"Настройка системы",
-  "IPbb":"Версия IP"
+  "IPbb":"Версия IP",
+  "wu":"Нет",
+  "rzxy":"Соглашение об аутентификации",
+  "rzmm":"Пароль аутентификации",
+  "jmxy":"Протокол шифрования",
+  "jmmm":"Шифрование"
+
 }

+ 6 - 1
web/安德森/src/utils/i18n/i18n-zh-CN.json

@@ -432,7 +432,12 @@
   "zs":"证书",
   "zssc":"证书上传",
   "xtpz":"系统配置",
-  "IPbb":"IP版本"
+  "IPbb":"IP版本",
+  "wu":"无",
+  "rzxy":"认证协议",
+  "rzmm":"认证密码",
+  "jmxy":"加密协议",
+  "jmmm":"加密密码"
 
 
 

+ 55 - 4
web/安德森/src/views/fwgl/snmpsz/index.vue

@@ -25,7 +25,28 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item :required="true" v-if="form.mode=='1'" :label="'SNMP TRAP'+this.$t('fwzt')" prop="trapMode">
+                <el-form-item   v-if="form.mode=='1'  && form.snmpVersion=='SNMP V3'" :label="this.$t('yhm2')" prop="yhm2">
+                  <el-input v-model="form.yhm"    />
+                </el-form-item>
+                <el-form-item  v-if="form.mode=='1' && form.snmpVersion=='SNMP V3' " :label="this.$t('rzxy')" prop="rzxy">
+                  <el-select style="width: 100%" v-model="form.rzxy"    @change="handleSelectChange1"    allow-create    :filterable="false">
+                    <el-option v-for="item in rzxys" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1' && form.snmpVersion=='SNMP V3'" :label="this.$t('rzmm')" prop="rzmm">
+                  <el-input v-model="form.rzmm"   :disabled="showClass1"   />
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1' && form.snmpVersion=='SNMP V3'" :label="this.$t('jmxy')" prop="jmxy">
+                  <el-select style="width: 100%" v-model="form.jmxy" @change="handleSelectChange2"       allow-create    :filterable="false">
+                    <el-option v-for="item in jmxys" :key="item.id" :label="$t(item.name)" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1' && form.snmpVersion=='SNMP V3'" :label="this.$t('jmmm')" prop="jmmm">
+                  <el-input v-model="form.jmmm"   :disabled="showClass2"  />
+                </el-form-item>
+                <el-form-item   v-if="form.mode=='1'" :label="'SNMP TRAP'+this.$t('fwzt')" prop="trapMode">
                   <el-select style="width: 100%" v-model="form.trapMode"       allow-create    :filterable="false">
                     <el-option v-for="item in modes" :key="item.id" :label="$t(item.name)" :value="item.id">
                     </el-option>
@@ -67,12 +88,15 @@
         // 是否显示弹出层
         open: false,
         usertoken:"",
-
+        showClass1: true,
+        showClass2: true,
         // 表单参数
         form: {},
         sensorStatusForm: {}, // 传感器表单数据
         modes:[{"id":"0","name":"gb"},{"id":"1","name":"kq"}],
         SNMPs:[{"id":"SNMP V1","name":"SNMP V1"},{"id":"SNMP V2c","name":"SNMP V2c"},{"id":"SNMP V3","name":"SNMP V3"}],
+        rzxys:[{"id":"0","name":"wu"},{"id":"MD5","name":"MD5"},{"id":"SHA","name":"SHA"}],
+        jmxys:[{"id":"0","name":"wu"},{"id":"DES","name":"DES"},{"id":"AES","name":"AES"}],
         activeName: '温湿度传感器', // 当前激活的标签页的 name
         sensorStatusTabs:[],
         sensorStatusOpen: false, // 配置传感器
@@ -86,7 +110,7 @@
     },
     created() {
       this.usertoken= this.$store.state.user.usertoken;
-         this.queryIp();
+      this.queryIp();
     },
     methods: {
       editDisabled() {
@@ -102,6 +126,18 @@
       handleSelectChange(type){
         this.form.mode=type
         //this.editDisabled()
+      },  handleSelectChange1(type){
+        if(type != '0') {  // 自动获取
+          this.showClass1 = false;
+        }else {
+          this.showClass1 = true;
+        }
+      },  handleSelectChange2(type){
+        if(type != '0') {  // 自动获取
+          this.showClass2 = false;
+        }else {
+          this.showClass2 = true;
+        }
       },
       //
       queryIp(){
@@ -111,7 +147,17 @@
         serviceManagement(params).then(response => {
           if(response.data!=null){
           this.form=response.data;
+          if( this.form.rzxy!='0'){
+            this.showClass1 = false;
+          }else{
+            this.showClass1 = true;
+          }
+          if( this.form.jmxy!='0'){
+            this.showClass2 = false;
+          }else{
+            this.showClass2 = true;
           }
+        }
 
       });
       },
@@ -123,6 +169,11 @@
             params.token=this.usertoken;
             params.type="SnmpSave";
             params.mode=this.form.mode;
+            params.rzxy=this.form.rzxy;
+            params.rzmm=this.form.rzmm;
+            params.jmxy=this.form.jmxy;
+            params.jmmm=this.form.jmmm;
+            params.yhm=this.form.yhm;
             params.public=this.form.public;
             params.snmpVersion=this.form.snmpVersion;
             params.trapMode=this.form.trapMode;
@@ -135,7 +186,7 @@
               serviceManagement(params);
             }).then(() => {
               this.$modal.msgSuccess(this.$t('zxcg'));
-            }).catch(() => {});
+          }).catch(() => {});
 
 
           }