WANG 6 years ago
parent
commit
483204cc21

+ 4 - 4
src/modules/examwork/view/onlineExam.vue

@@ -74,12 +74,12 @@
                 </el-row>
                 <el-row>
                   <el-form-item
-                    label="禁止考试"
+                    label="是否可以考试"
                     :label-width="style.label_width_tab1"
                   >
                     <el-radio-group v-model="form.examLimit" class="input">
-                      <el-radio label="true"></el-radio>
-                      <el-radio label="false"></el-radio>
+                      <el-radio label="true"></el-radio>
+                      <el-radio label="false"></el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-row>
@@ -777,7 +777,7 @@ export default {
   data() {
     return {
       style: {
-        label_width_tab1: "80px",
+        label_width_tab1: "100px",
         label_width_tab2: "110px",
         label_width_tab3: "120px",
         label_width_tab4: "170px",

+ 34 - 36
src/modules/examwork/view/onlineExamOrgSettings.vue

@@ -72,12 +72,33 @@
           </el-table-column>
           <el-table-column prop="endTime" width="155" label="结束时间">
           </el-table-column>
-          <el-table-column prop="updateTime" width="155" label="更新时间">
+          <el-table-column width="110" label="是否可以考试">
+            <span slot-scope="scope">
+              <span v-if="!scope.row.examLimit">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="是"
+                  placement="left"
+                >
+                  <i class="el-icon-success" style="color:green;"></i>
+                </el-tooltip>
+              </span>
+              <span v-else>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="否"
+                  placement="left"
+                >
+                  <i class="el-icon-error" style="color:red;"></i>
+                </el-tooltip>
+              </span>
+            </span>
           </el-table-column>
-          <el-table-column width="80" label="上传附件">
-            <span slot-scope="scope"> {{ getCanUpload(scope.row) }} </span>
+          <el-table-column prop="updateTime" width="155" label="更新时间">
           </el-table-column>
-          <el-table-column label="操作" width="80">
+          <el-table-column label="操作" width="100">
             <template slot-scope="scope">
               <div>
                 <el-button
@@ -161,12 +182,10 @@
               </el-form-item>
             </el-row>
             <el-row>
-              <el-form-item label-width="120px" label="上传附件">
-                <el-radio-group
-                  v-model="orgSetting.properties.CAN_UPLOAD_ATTACHMENT"
-                >
-                  <el-radio label="true">允许</el-radio>
-                  <el-radio label="false">不允许</el-radio>
+              <el-form-item label="是否可以考试" label-width="120px">
+                <el-radio-group v-model="orgSetting.examLimit" class="input">
+                  <el-radio label="true">否</el-radio>
+                  <el-radio label="false">是</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-row>
@@ -239,12 +258,10 @@
               </el-form-item>
             </el-row>
             <el-row>
-              <el-form-item label-width="120px" label="上传附件">
-                <el-radio-group
-                  v-model="orgSetting.properties.CAN_UPLOAD_ATTACHMENT"
-                >
-                  <el-radio label="true">允许</el-radio>
-                  <el-radio label="false">不允许</el-radio>
+              <el-form-item label="是否可以考试" label-width="120px">
+                <el-radio-group v-model="orgSetting.examLimit" class="input">
+                  <el-radio label="true">否</el-radio>
+                  <el-radio label="false">是</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-row>
@@ -269,18 +286,6 @@
 import { CORE_API, EXAM_WORK_API } from "@/constants/constants.js";
 import LinkTitlesCustom from "@/components/LinkTitlesCustom.vue";
 
-let _this = null;
-
-let validateOrgSettingDatetimeRange = (rule, value, callback) => {
-  let examDatetimeRange = _this.orgSettingDatetimeRange;
-  if (!examDatetimeRange || 0 == examDatetimeRange.length) {
-    callback(new Error("请输入考试时间"));
-    _this.activeName = "tab1";
-  } else {
-    callback();
-  }
-};
-
 export default {
   components: { LinkTitlesCustom },
   data() {
@@ -304,6 +309,7 @@ export default {
         orgId: null,
         beginTime: null,
         endTime: null,
+        examLimit: "false",
         properties: {
           CAN_UPLOAD_ATTACHMENT: "true"
         }
@@ -316,13 +322,6 @@ export default {
       orgSettingRules: {
         orgId: [
           { required: true, message: "请选择学习中心", trigger: "blur,change" }
-        ],
-        orgSettingDatetimeRange: [
-          {
-            required: true,
-            validator: validateOrgSettingDatetimeRange,
-            trigger: "blur"
-          }
         ]
       }
     };
@@ -477,7 +476,6 @@ export default {
     }
   },
   created() {
-    _this = this;
     this.examId = this.$route.params.id;
     this.formSearch.examId = this.examId;
     this.init();