qinchao 4 лет назад
Родитель
Сommit
12e0a16083
2 измененных файлов с 30 добавлено и 32 удалено
  1. 15 5
      src/modules/examwork/view/examIpLimit.vue
  2. 15 27
      src/modules/examwork/view/onlineExam.vue

+ 15 - 5
src/modules/examwork/view/examIpLimit.vue

@@ -34,8 +34,8 @@
           <el-form-item label="限制类型">
             <el-select v-model="formSearch.limitType" class="input">
               <el-option label="未选择" value=""></el-option>
-              <el-option label="允许访问" value="0"></el-option>
-              <el-option label="限制访问" value="1"></el-option>
+              <el-option label="允许访问" value="false"></el-option>
+              <el-option label="限制访问" value="true"></el-option>
             </el-select>
           </el-form-item>
 
@@ -294,7 +294,7 @@
                 maxlength="20"
               >
                 <el-option
-                  v-for="item in limitTypeList"
+                  v-for="item in totalList"
                   :key="item.id"
                   :label="item.label"
                   :value="item.id"
@@ -407,14 +407,24 @@ export default {
       ],
       centerList: [
         {
-          id: 0,
+          id: false,
           label: "关闭",
         },
         {
-          id: 1,
+          id: true,
           label: "开启",
         },
       ],
+      totalList: [
+        {
+          id: false,
+          label: "允许访问",
+        },
+        {
+          id: true,
+          label: "禁止访问",
+        },
+      ],
       showIpColumn: true,
       button: {},
       ipLimitImportDialog: false,

+ 15 - 27
src/modules/examwork/view/onlineExam.vue

@@ -230,6 +230,18 @@
                     >开启手机app考试,将不能开启人脸身份检测</span
                   >
                 </el-row>
+                <el-row>
+                  <el-form-item
+                    label="开启IP访问设置"
+                    :label-width="style.label_width_tab1"
+                  >
+                    <el-switch
+                      v-model="form.properties.IP_LIMIT"
+                      on-text="是"
+                      off-text="否"
+                    ></el-switch>
+                  </el-form-item>
+                </el-row>
               </el-tab-pane>
               <!-- 周期设置 -->
               <el-tab-pane label="周期设置" name="tab8">
@@ -817,33 +829,6 @@
                   </el-form-item>
                 </el-row>
               </el-tab-pane>
-              <el-tab-pane label="网络设置" name="tab6">
-                <el-row>
-                  <el-form-item
-                    label="IP限制"
-                    :label-width="style.label_width_tab6"
-                  >
-                    <el-radio-group v-model="form.properties.IP_LIMIT">
-                      <el-radio label="true">开启</el-radio>
-                      <el-radio label="false">关闭</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-row>
-                <el-row>
-                  <el-form-item
-                    label="IP段( *表示任意 )"
-                    :label-width="style.label_width_tab6"
-                  >
-                    <el-input
-                      v-model="form.properties.IP_ADDRESSES"
-                      maxlength="2000"
-                      class="input"
-                      type="textarea"
-                      rows="6"
-                    ></el-input>
-                  </el-form-item>
-                </el-row>
-              </el-tab-pane>
               <el-tab-pane label="其它" name="tab7">
                 <el-row>
                   <el-form-item
@@ -1570,6 +1555,9 @@ export default {
             this.form.properties.APP_EXAM_ENABLED =
               this.form.properties.APP_EXAM_ENABLED === "true";
 
+            this.form.properties.IP_LIMIT =
+              this.form.properties.IP_LIMIT === "true";
+
             if (this.form.properties.EXAM_CYCLE_TIME_RANGE) {
               this.examCycleTimeRangeArr = JSON.parse(
                 this.form.properties.EXAM_CYCLE_TIME_RANGE