fiex:bu

src/views/education/examManagement/applicationData/examRegistration/index.vue

@@ -134,11 +134,7 @@
               ></el-input-number>
               <span style="margin-left: 6px">分</span>
             </el-form-item>
-            <el-form-item
-              v-if="getTimes(item)"
-              label="考试结果"
-              prop="result"
-            >
+            <el-form-item v-if="getTimes(item)" label="考试结果" prop="result">
               <el-radio-group v-model="item.result">
                 <el-radio :label="1">通过</el-radio>
                 <el-radio :label="0">不通过</el-radio>
@@ -419,23 +415,6 @@ export default {
       },
     };
   },
-  computed: {
-    getTimes: function () {
-      return function (obj) {
-        var time = `${this.$methodsTools.onlyForma(
-          obj.applySiteExamTime,
-          false
-        )} ${obj.applySiteStartTime}:00`;
-        var newTime = new Date().getTime();
-        var theTime = new Date(time).getTime();
-        if (newTime > theTime && obj.examStatus == 1) {
-          return true;
-        } else {
-          return false;
-        }
-      };
-    },
-  },
   async mounted() {
     await this.getFirstOptions();
     this.search();
@@ -444,6 +423,19 @@ export default {
     this.search();
   },
   methods: {
+    getTimes(obj) {
+      var time = `${this.$methodsTools.onlyForma(
+        obj.applySiteExamTime,
+        false
+      )} ${obj.applySiteStartTime}:00`;
+      var newTime = new Date().getTime();
+      var theTime = new Date(time).getTime();
+      if (newTime > theTime && obj.examStatus == 1) {
+        return true;
+      } else {
+        return false;
+      }
+    },
     /**
      * 考试登记
      */

src/views/resource/bankManagement/chapterVolumeManagement/add/index.vue

@@ -320,7 +320,7 @@ export default {
       minTimeAll: 0, //总时长
       tableSet: [
         { label: "排序", prop: "sort", scope: "inputs", width: "100" },
-        { label: "试卷编码", prop: "code", width: "120" },
+        { label: "试卷编码", prop: "code", width: "140" },
         { label: "标题前缀", prop: "prefixName", width: "170" },
         { label: "试卷标题", prop: "examName", width: "300" },
         {

src/views/resource/bankManagement/chapterVolumeManagement/edit/index.vue

@@ -331,14 +331,14 @@ export default {
       minTimeAll: 0, //总时长
       tableSet: [
         { label: "排序", prop: "sort", scope: "inputs", width: "100" },
-        { label: "试卷编码", prop: "code", width: "120" },
+        { label: "试卷编码", prop: "code", width: "140" },
         { label: "标题前缀", prop: "prefixName", width: "170" },
         { label: "试卷标题", prop: "examName", width: "300" },
         {
           label: "发布状态",
           prop: "publishStatus",
-          scope: "Status", 
-          width: "120" 
+          scope: "Status",
+          width: "120",
         },
       ],
       tableData: [],

src/views/resource/handoutManagement/handoutList/edit/index.vue

@@ -221,8 +221,6 @@ export default {
     this.search();
   },
   methods: {
-<<<<<<< HEAD
-=======
     handleCheckedCitiesChange() {
       let nid = this.newSujectOption.map((item) => {
         return item.newId;
@@ -262,7 +260,6 @@ export default {
         this.isIndeterminate = false;
       }
     },
->>>>>>> 0d5b2d704ca6f89c27bdc409f0538aa9c2d0dc71
     search() {
       this.$api
         .obtainCourseHandouts(this.$route.query.id)