处理bug

plub/menu.js

@@ -34,7 +34,7 @@ export default [
         path: '/advancedConfig/sslClient'
       },
       {
-        name: 'IPSecVpn',
+        name: 'IPSecVPN',
         path: '/advancedConfig/ipsecClient'
       }
     ]
@@ -48,7 +48,7 @@ export default [
         path: '/advancedConfig/sslServer'
       },
       {
-        name: 'IPSecVpn',
+        name: 'IPSecVPN',
         path: '/advancedConfig/ipsecServer'
       }
     ]
@@ -65,7 +65,7 @@ export default [
         path: '/advancedConfig/log/sslvpn'
       },
       {
-        name: 'IPSecVpn日志',
+        name: 'IPSecVPN日志',
         path: '/advancedConfig/log/ipsecvpn'
       }
     ]

src/views/advancedConfig.vue

@@ -63,11 +63,11 @@ h5 {
   overflow: hidden;
 }
 .menu {
-  width: 20%;
+  width: 210px;
   height: 100%;
 }
 .view {
-  width: 80%;
   height: 100%;
+  padding: 0 10px;
 }
 </style>

src/views/cert/cert.vue

@@ -135,6 +135,7 @@ export default {
         password: null,
         dn: null
       }
+      this.dialogFormVisible = false
     },
     // 上传失败钩子
     handleError () {
@@ -160,12 +161,14 @@ export default {
     certs () {
       this.title = '上传证书密钥'
       this.type = 'cert'
+      this.form = { pwatype: 'sm2' }
       this.dialogFormVisible = true
     },
     // 生成申请书
     reqs () {
       this.title = '生成申请书'
       this.type = 'req'
+      this.form = { pwatype: 'sm2' }
       this.dialogFormVisible = true
     },
     // 表单提交

src/views/network/lan.vue

@@ -9,7 +9,7 @@
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm" size="small">
+      <el-form :model="ruleForm" :rules="rules" ref="form" label-width="120px" class="demo-ruleForm" size="small">
         <el-form-item label="网关IP地址" prop="address">
           <el-input v-model="ruleForm.address" placeholder="请输入IP地址"></el-input>
         </el-form-item>
@@ -17,10 +17,20 @@
           <el-switch v-model="ruleForm.type" :active-value="'0'" :inactive-value="'1'" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
         </el-form-item>
         <el-form-item class="items" v-if="ruleForm.type == '0'" label="IP地址分配范围">
-          <span>{{ ruleForm.address | addresstop }}</span>
-          <el-input v-model="ruleForm.start"></el-input>
+          <el-form :model="ruleForm" :rules="rules" ref="range" :inline="true" size="small">
+            <el-form-item prop="start">
+              <span>{{ ruleForm.address | addresstop }}</span>
+              <el-input v-model="ruleForm.start" maxlength="3"></el-input>
+            </el-form-item>
+            <el-form-item prop="end">
+              <span>—</span>
+              <el-input v-model="ruleForm.end" maxlength="3"></el-input>
+            </el-form-item>
+          </el-form>
+          <!-- <span>{{ ruleForm.address | addresstop }}</span>
+          <el-input v-model="ruleForm.start" maxlength="3"></el-input>
           <span>—</span>
-          <el-input v-model="ruleForm.end"></el-input>
+          <el-input v-model="ruleForm.end" maxlength="3"></el-input> -->
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="onSubmit">立即提交</el-button>
@@ -55,10 +65,10 @@ export default {
           { pattern: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/, message: '请输入正确网关' }
         ],
         start: [
-          { type: 'number', message: '请输入1~255', min: 1, max: 255 }
+          { pattern: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/, message: '请输入1~255', min: 1, max: 255 }
         ],
         end: [
-          { type: 'number', message: '请输入1~255', min: 1, max: 255 }
+          { pattern: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/, message: '请输入1~255', min: 1, max: 255 }
         ]
       }
     }
@@ -80,10 +90,16 @@ export default {
     ...mapActions(['setlan', 'landown', 'lanup', 'lanquery']),
     // 提交数据
     async onSubmit () {
-      const res = await this.setlan(this.ruleForm)
-      if (res && res.errcode === 0) {
-        this.$message.success('设置成功')
-      }
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        this.$refs.range.validate(async (valid) => {
+          if (!valid) return false
+          const res = await this.setlan(this.ruleForm)
+          if (res && res.errcode === 0) {
+            this.$message.success('设置成功')
+          }
+        })
+      })
     },
     // 重启网卡  （先调用停止，在调用启动）
     async reboot () {
@@ -122,11 +138,11 @@ h3 {
   }
 }
 .items /deep/ .el-form-item__content {
-  display: flex;
+  // display: flex;
   .el-input {
-    display: block;
-    width: 25%;
-    margin: 0 2%;
+    // display: block;
+    width: 60px;
+    margin-left: 10px;
   }
 }
 </style>

src/views/network/wan.vue

@@ -7,7 +7,7 @@
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="small">
+      <el-form :model="ruleForm" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm" size="small">
         <el-form-item label="上网方式" prop="type">
           <el-select class="select" @change="typeChage" v-model="ruleForm.type" placeholder="请选择上网方式">
             <el-option label="自动获取IP" :value="'0'"></el-option>
@@ -46,21 +46,20 @@ export default {
     ...mapState(['wandata'])
   },
   data () {
+    const ipaddr = { pattern: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/, message: '请输入正确的IP地址' }
+
     return {
       ruleForm: {
         type: '0',
         staticip: '0'
       },
       rules: {
-        address: [
-          { pattern: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/, message: '请输入正确地址' }
-        ],
+        address: [ipaddr],
         netmask: [
           { pattern: /^(254|252|248|240|224|192|128|0)\.0\.0\.0|255\.(254|252|248|240|224|192|128|0)\.0\.0|255\.255\.(254|252|248|240|224|192|128|0)\.0|255\.255\.255\.(254|252|248|240|224|192|128|0)$/, message: '请输入正确掩码' }
         ],
-        gateway: [
-          { pattern: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/, message: '请输入正确网关' }
-        ]
+        gateway: [ipaddr],
+        dns: [ipaddr]
       }
     }
   },
@@ -79,10 +78,13 @@ export default {
     },
     // 提交数据
     async onSubmit () {
-      const res = await this.setwan(this.ruleForm)
-      if (res && res.errcode === 0) {
-        this.$message.success('设置成功')
-      }
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.setwan(this.ruleForm)
+        if (res && res.errcode === 0) {
+          this.$message.success('设置成功')
+        }
+      })
     },
     // 重启网卡  （先调用停止，在调用启动）
     async reboot () {

src/views/system/date.vue

@@ -38,6 +38,7 @@ export default {
     if (res && res.errcode === 0) {
       this.ntp = res.data || 'no'
       this.form.ntp = this.ntp
+      console.log(this.form)
     }
   },
   methods: {

src/views/system/passwd.vue

@@ -51,6 +51,7 @@ export default {
           { required: true, message: '请输入新密码' }
         ],
         confirm: [
+          { required: true, message: '请重新输入新密码' },
           { validator: checkConfirm(), trigger: 'blur' }
         ]
       }

src/views/vpn/ipsec-server.vue

@@ -26,10 +26,10 @@
             <el-option v-for="(item, index) in sigdata" :label="item.name" :value="item.uuid" :key="index"></el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="虚拟地址" prop="addressTow">
+        <el-form-item label="虚拟子网地址" prop="addressTow">
             <el-input v-model="ruleForm.addressTow"></el-input>
         </el-form-item>
-        <el-form-item label="虚拟地址掩码长度" prop="digitTow">
+        <el-form-item label="虚拟子网掩码" prop="digitTow">
             <el-input v-model="ruleForm.digitTow"></el-input>
         </el-form-item>
         <el-form-item label="日志级别" prop="loglevel">
@@ -71,11 +71,11 @@ export default {
           { required: true, message: '请选择签名证书', trigger: 'chage' }
         ],
         addressTow: [
-          { required: true, message: '请输入虚拟地址', trigger: 'blur' },
+          { required: true, message: '请输入虚拟子网地址', trigger: 'blur' },
           { pattern: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/, message: '请输入正确地址' }
         ],
         digitTow: [
-          { required: true, message: '请输入虚拟地址掩码长度', trigger: 'blur' }
+          { type: 'number', min: 0, max: 32, required: true, message: '请输入掩码长度(0~32)', trigger: 'blur' }
         ],
         pwa: [
           { required: true, message: '请选择加密证书', trigger: 'chage' }