IP限制-remark

src/modules/examwork/view/examIpLimit.vue

@@ -24,10 +24,10 @@
               :disabled="true"
             ></el-input>
           </el-form-item>
-          <el-form-item label="ip">
+          <el-form-item label="IP">
             <el-input
               v-model="formSearch.ip"
-              placeholder="请输入ip"
+              placeholder="请输入IP"
               class="input"
             ></el-input>
           </el-form-item>
@@ -75,16 +75,16 @@
           size="small"
           type="primary"
           icon="el-icon-edit"
-          :disabled="noBatchSelected"
-          @click="editIpLimitType"
-          >类型设置</el-button
+          @click="editIpLimitProperty"
+          >整体控制设置</el-button
         >
         <el-button
           size="small"
           type="primary"
           icon="el-icon-edit"
-          @click="editIpLimitProperty"
-          >控制设置</el-button
+          :disabled="noBatchSelected"
+          @click="editIpLimitType"
+          >批量限制类型设置</el-button
         >
         <el-button
           size="small"
@@ -127,7 +127,7 @@
           <el-table-column type="selection" width="50"></el-table-column>
           <el-table-column
             prop="id"
-            width="100"
+            width="80"
             label="ID"
             sortable
           ></el-table-column>
@@ -137,19 +137,20 @@
           <el-table-column
             prop="limitType"
             label="限制类型"
+            width="130"
             sortable
           ></el-table-column>
           <el-table-column
-            width="180"
+            width="170"
             prop="creationTime"
             label="创建时间"
           ></el-table-column>
           <el-table-column
-            width="180"
+            width="170"
             prop="updateTime"
             label="修改时间"
           ></el-table-column>
-          <el-table-column label="操作" width="300">
+          <el-table-column label="操作" width="320">
             <div slot-scope="scope">
               <el-button
                 size="mini"
@@ -170,7 +171,7 @@
                 type="primary"
                 icon="el-icon-edit"
                 @click="editIpLimitType(scope.row)"
-                >切换类型</el-button
+                >限制类型设置</el-button
               >
             </div>
           </el-table-column>
@@ -189,20 +190,19 @@
 
         <!-- 新增弹出窗口 -->
         <el-dialog
-          title="IP限制信息页面"
+          title="IP限制信息设置"
           :visible.sync="addingIpLimitDialog"
-          width="650px"
+          width="350px"
           @close="closeAddIpLimitDialog"
         >
           <el-form
             ref="addIpLimitForm"
             :rules="rules"
             :model="examIpLimitForm"
-            :inline="true"
             label-width="85px"
             class="editForm"
           >
-            <el-form-item label="ip" prop="ip">
+            <el-form-item label="IP" prop="ip">
               <el-input
                 v-model="examIpLimitForm.ip"
                 class="input"
@@ -226,6 +226,14 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="examIpLimitForm.remark"
+                class="input"
+                auto-complete="off"
+                maxlength="30"
+              ></el-input>
+            </el-form-item>
           </el-form>
           <div style="text-align: center">
             <el-button type="primary" @click="addIpLimit">确 定</el-button>
@@ -235,9 +243,9 @@
 
         <!-- 切换类型弹出窗口 -->
         <el-dialog
-          title="类型切换页面"
+          title="限制类型设置"
           :visible.sync="editIpLimitTypeDialog"
-          width="650px"
+          width="350px"
           @close="closeEditIpLimitTypeDialog"
         >
           <el-form
@@ -273,9 +281,9 @@
 
         <!-- 控制修改弹出窗口 -->
         <el-dialog
-          title="控制修改页面"
+          title="整体控制设置"
           :visible.sync="editIpLimitPropertyDialog"
-          width="650px"
+          width="350px"
           @close="closeEditIpLimitPropertyDialog"
         >
           <el-form
@@ -327,8 +335,8 @@
 
         <!-- 导入弹窗 -->
         <el-dialog
-          title="Ip限制信息导入页"
-          size="tiny"
+          title="IP限制信息导入"
+          width="500px"
           :visible.sync="ipLimitImportDialog"
         >
           <el-form ref="ipLimitImportForm" :model="ipLimitImportForm">
@@ -447,6 +455,7 @@ export default {
         ip: "",
         examId: "",
         limitType: "",
+        remark: "",
       },
       examIpLimitTypeForm: {
         id: "",
@@ -536,6 +545,7 @@ export default {
       this.examIpLimitForm.id = null;
       this.examIpLimitForm.ip = null;
       this.examIpLimitForm.limitType = null;
+      this.examIpLimitForm.remark = null;
       this.addingIpLimitDialog = true;
       this.showIpColumn = true;
     },
@@ -614,6 +624,7 @@ export default {
       }
       this.examIpLimitForm.id = row.id;
       this.examIpLimitForm.ip = row.ip;
+      this.examIpLimitForm.remark = row.remark;
       this.examIpLimitForm.limitType = this.getLimitType(row.limitType);
       this.addingIpLimitDialog = true;
       this.showIpColumn = true;