Browse Source

处理界面问题

dygapp 4 years ago
parent
commit
f86d8abe5b

+ 1 - 1
src/views/cert/cacert.vue

@@ -18,7 +18,7 @@
           <el-button size="small" type="text">上传证书</el-button>
         </el-upload>
       </div>
-      <el-table :data="cadata" border style="width: 100%">
+      <el-table :data="cadata" border style="width: 100%" size="small">
         <el-table-column label="DN" width="500">
           <template slot-scope="scope">
             <span style="margin-left: 10px">{{ scope.row.dn }}</span>

+ 6 - 6
src/views/cert/cert.vue

@@ -8,23 +8,23 @@
           <el-button size="small" class="upload-demo" type="text" @click="certs">上传证书密钥</el-button>
           <el-button size="small" class="upload-demo" type="text" @click="reqs">生成申请书</el-button>
       </div>
-      <el-table :data="sigdata" border style="width: 100%">
-        <el-table-column label="名称" width="200">
+      <el-table :data="sigdata" border style="width: 100%" size="small">
+        <el-table-column label="名称" width="120">
           <template slot-scope="scope">
             <span style="margin-left: 10px">{{ scope.row.name }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="DN" width="400">
+        <el-table-column label="DN">
           <template slot-scope="scope">
             <span style="margin-left: 10px">{{ scope.row.dn }}</span>
           </template>
         </el-table-column>
-         <el-table-column label="算法类型" width="200">
+         <el-table-column label="算法类型" width="80">
           <template slot-scope="scope">
             <span style="margin-left: 10px">{{ scope.row.pwatype }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="200">
           <template slot-scope="scope">
             <div class="czbox">
               <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
@@ -50,7 +50,7 @@
     </el-main>
     <!-- 弹窗 -->
     <el-dialog :title="title" :visible.sync="dialogFormVisible">
-      <el-form :model="form" label-width="120px">
+      <el-form :model="form" label-width="120px" size="small">
         <el-form-item label="证书名称">
           <el-input v-model="form.name" ></el-input>
         </el-form-item>

+ 10 - 2
src/views/devinfo.vue

@@ -4,13 +4,17 @@
       <h5>设备详情</h5>
       <div class="info">
         <h3>设备信息:</h3>
-        <div class="input_info">
+        <div class="info_box">
+          <div class="info_item">
           <el-input disabled :value="devinfos.model">
               <template slot="prepend">产品型号</template>
           </el-input>
+          </div>
+          <div class="info_item">
           <el-input disabled  :value="devinfos.version">
               <template slot="prepend">软件版本</template>
           </el-input>
+          </div>
         </div>
       </div>
       <div class="usex">
@@ -78,10 +82,14 @@ h5 {
     margin: 3% auto;
     border-bottom: 1px solid #999;
 }
-.input_info {
+.info_box {
   width: 90%;
   display: flex;
   margin: 3% auto;
+  .info_item {
+    flex: 1;
+    margin: 0 5px;
+  }
 }
 .usex {
   width: 90%;

+ 11 - 7
src/views/network/lan.vue

@@ -4,22 +4,22 @@
       <div class="headers">
         <h3>LAN配置</h3>
         <el-button class="rebootcard" size="mini" type="primary" @click="reboot"
-          >重启网</el-button
+          >重启网</el-button
         >
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
-        <el-form-item label="IP地址" prop="address">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" 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>
-        <el-form-item label="DHCP服务" prop="staticip">
+        <el-form-item label="启用DHCP" prop="staticip">
           <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>
-          <span>—</span>
+          <span>—</span>
           <el-input v-model="ruleForm.end"></el-input>
         </el-form-item>
         <el-form-item>
@@ -53,6 +53,12 @@ export default {
         ],
         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: '请输入正确网关' }
+        ],
+        start: [
+          { type: 'number', message: '请输入1~255', min: 1, max: 255 }
+        ],
+        end: [
+          { type: 'number', message: '请输入1~255', min: 1, max: 255 }
         ]
       }
     }
@@ -77,8 +83,6 @@ export default {
       const res = await this.setlan(this.ruleForm)
       if (res && res.errcode === 0) {
         this.$message.success('设置成功')
-      } else {
-        this.$message.success('设置失败')
       }
     },
     // 重启网卡  (先调用停止,在调用启动)

+ 2 - 4
src/views/network/wan.vue

@@ -3,11 +3,11 @@
     <el-header class="header">
       <div class="headers">
         <h3>WAN配置</h3>
-        <el-button class="rebootcard" size="mini" type="primary" @click="reboot">重启网</el-button>
+        <el-button class="rebootcard" size="mini" type="primary" @click="reboot">重启网</el-button>
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" 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>
@@ -82,8 +82,6 @@ export default {
       const res = await this.setwan(this.ruleForm)
       if (res.errcode && res.errcode === 0) {
         this.$message.success('设置成功')
-      } else {
-        this.$message.success('设置成功')
       }
     },
     // 重启网卡  (先调用停止,在调用启动)

+ 1 - 1
src/views/system/date.vue

@@ -4,7 +4,7 @@
       <h3>时间设置</h3>
     </el-header>
     <el-main class="main">
-      <el-form ref="form" :model="form" label-width="150px">
+      <el-form ref="form" :model="form" label-width="150px" size="small">
         <el-form-item label="VPN服务器同步开关:">
           <el-switch v-model="form.ntp" :active-value="'yes'" :inactive-value="'no'" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
         </el-form-item>

+ 1 - 1
src/views/vpn/ipsec-client.vue

@@ -9,7 +9,7 @@
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :rules="rules" :model="ruleForm" ref="form" label-width="150px" class="demo-ruleForm" >
+      <el-form :rules="rules" :model="ruleForm" ref="form" label-width="150px" class="demo-ruleForm" size="small">
         <el-form-item label="VPN服务器IP地址" prop="address">
             <el-input v-model="ruleForm.address"></el-input>
         </el-form-item>

+ 4 - 4
src/views/vpn/ipsec-server.vue

@@ -9,7 +9,7 @@
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :model="ruleForm" :rules="rules" ref="form" label-width="150px" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="form" label-width="150px" class="demo-ruleForm" size="small">
         <el-form-item label="本地子网地址" prop="address">
             <el-input v-model="ruleForm.address"></el-input>
         </el-form-item>
@@ -18,12 +18,12 @@
         </el-form-item>
         <el-form-item label="签名证书" prop="cert">
             <el-select v-model="ruleForm.cert" placeholder="选择签名证书">
-            <el-option v-for="(item, index) in devitem" :label="item.name" :value="item.uuid" :key="index"></el-option>
+            <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="pwa">
             <el-select v-model="ruleForm.pwa" placeholder="选择加密证书">
-            <el-option v-for="(item, index) in devitem" :label="item.name" :value="item.uuid" :key="index"></el-option>
+            <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">
@@ -54,7 +54,7 @@ export default {
   name: 'lan',
   components: {},
   computed: {
-    ...mapState(['cadata', 'sigdata', 'ssldata'])
+    ...mapState(['sigdata'])
   },
   data () {
     return {

+ 1 - 1
src/views/vpn/ssl-client.vue

@@ -9,7 +9,7 @@
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :rules="rules" :model="ruleForm" ref="form" label-width="150px" class="demo-ruleForm">
+      <el-form :rules="rules" :model="ruleForm" ref="form" label-width="150px" class="demo-ruleForm" size="small">
          <el-form-item prop="address" label="VPN服务器IP地址">
           <el-input v-model="ruleForm.address" placeholder="请输入IP地址"></el-input>
         </el-form-item>

+ 1 - 1
src/views/vpn/ssl-server.vue

@@ -9,7 +9,7 @@
       </div>
     </el-header>
     <el-main class="main">
-      <el-form :rules="rules" :model="ruleForm" ref="form" label-width="150px" class="demo-ruleForm">
+      <el-form :rules="rules" :model="ruleForm" ref="form" label-width="150px" class="demo-ruleForm" size="small">
          <el-form-item prop="address" label="虚拟子网地址">
           <el-input v-model="ruleForm.address"></el-input>
         </el-form-item>