lideyin 4 ani în urmă
părinte
comite
c05db88fb2

+ 4 - 0
src/modules/examwork/view/examStudent.vue

@@ -1567,6 +1567,7 @@ export default {
       this.examStudentForm.phone = null;
       this.examStudentForm.infoCollector = null;
       this.examStudentForm.ext1 = null;
+      this.examStudentForm.examStageId = null;
       if (this.pureLC) {
         this.examStudentForm.orgId = this.lc_id;
         this.orgList4InsertOrUpdate = [
@@ -1579,6 +1580,7 @@ export default {
       }
       this.examList4InsertOrUpdate = [];
       this.courseList4InsertOrUpdate = [];
+      this.examStageDisabled4Insert = true;
 
       this.queryExams4InsertOrUpdate("");
       this.getCourses4InsertOrUpdate("");
@@ -1891,6 +1893,7 @@ export default {
       }
     },
     handleExamChange4Search(value) {
+      this.formSearch.examStageId = "";
       if (this.examList4Search.length > 0) {
         let examArr = this.examList4Search.filter(p => p.id == value);
         if (examArr && examArr.length > 0) {
@@ -1912,6 +1915,7 @@ export default {
       }
     },
     handleExamChange4InsertOrUpdate(value) {
+      this.examStudentForm.examStageId = "";
       if (this.examList4InsertOrUpdate.length > 0) {
         let examArr = this.examList4InsertOrUpdate.filter(p => p.id == value);
         if (examArr && examArr.length > 0) {

+ 4 - 3
src/modules/examwork/view/student.vue

@@ -290,9 +290,9 @@
           ></el-table-column>
           <el-table-column width="168" label="更新时间" sortable>
             <template slot-scope="scope">
-              <el-button @click="gotoOperateLog(scope.row.id)" type="text">
-                {{ scope.row.updateTime }}
-              </el-button>
+              <el-button @click="gotoOperateLog(scope.row.id)" type="text">{{
+                scope.row.updateTime
+              }}</el-button>
             </template>
           </el-table-column>
           <el-table-column width="50" label="状态">
@@ -1390,6 +1390,7 @@ export default {
       this.searchForm();
     },
     handleExamChange4Search(value) {
+      this.stuExamSearch.examStageId = "";
       if (this.examList4Search.length > 0) {
         let examArr = this.examList4Search.filter(p => p.id == value);
         if (examArr && examArr.length > 0) {

+ 1 - 0
src/modules/oe/component/commonForm.vue

@@ -222,6 +222,7 @@ export default {
         });
     },
     changeExam(examId) {
+      this.form.examStageId = "";
       this.examList.forEach(exam => {
         if (exam.id == examId) {
           this.form.examType = exam.examType;

+ 5 - 3
src/modules/oe/views/examDetail.vue

@@ -429,7 +429,7 @@
         </el-form>
       </el-dialog>
       <el-dialog :append-to-body="true" :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="" />
+        <img width="100%" :src="dialogImageUrl" alt />
       </el-dialog>
     </el-main>
   </el-container>
@@ -474,7 +474,8 @@ export default {
         endTime: null,
         infoCollector: null,
         hasVirtual: null,
-        ORG_FIND_ALL: false //查询所有机构
+        ORG_FIND_ALL: false, //查询所有机构
+        examStageId: null
       },
       getExamCondition: {
         params: {
@@ -545,7 +546,8 @@ export default {
         startTime: null,
         endTime: null,
         infoCollector: null,
-        ORG_FIND_ALL: this.form.ORG_FIND_ALL
+        ORG_FIND_ALL: this.form.ORG_FIND_ALL,
+        examStageId: null
       };
       this.startExamDatetimeRange = [];
     },

+ 9 - 2
src/modules/oe/views/examScheduling.vue

@@ -999,10 +999,15 @@ export default {
           this.offlineAnswerFile = "";
           this.search();
         })
-        .catch(() => {
+        .catch(e => {
+          debugger;
+          let errMsg = "上传失败";
+          if (e.response) {
+            errMsg = e.response.data.desc;
+          }
           this.$notify({
             title: "提示",
-            message: "上传失败",
+            message: errMsg,
             type: "error",
             duration: 2000
           });
@@ -1011,6 +1016,8 @@ export default {
         });
     },
     beforeFileUpload(file) {
+      debugger;
+
       const isLt5M = file.size / 1024 / 1024 <= 5;
       if (!isLt5M) {
         this.$message.error("上传的单个数据文件大小不能超过5MB!");

+ 1 - 0
src/modules/oe/views/examSummary.vue

@@ -389,6 +389,7 @@ export default {
         });
     },
     changeExam(examId) {
+      this.examStageId = "";
       var exam = this.examList.filter(item => {
         return item.id == examId;
       })[0];

+ 10 - 5
src/modules/oe/views/illegalityNameList.vue

@@ -72,9 +72,9 @@
                   type="text"
                   >{{ scope.row.examRecordDataId }}</el-button
                 >
-                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">
-                  {{ scope.row.examRecordDataId }}
-                </span>
+                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">{{
+                  scope.row.examRecordDataId
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -211,7 +211,8 @@ export default {
         isWarn: null,
         pageNo: 1,
         pageSize: 10,
-        ORG_FIND_ALL: false //查询所有机构
+        ORG_FIND_ALL: false, //查询所有机构
+        examStageId: null
       },
 
       getExamCondition: {
@@ -273,7 +274,8 @@ export default {
         isWarn: null,
         pageNo: 1,
         pageSize: 10,
-        ORG_FIND_ALL: this.form.ORG_FIND_ALL
+        ORG_FIND_ALL: this.form.ORG_FIND_ALL,
+        examStageId: null
       };
     },
     search(type) {
@@ -291,6 +293,9 @@ export default {
       }
       this.tableLoading = true;
       var params = JSON.parse(JSON.stringify(this.form));
+      if (params.examStageId == "") {
+        params.examStageId = null;
+      }
       this.$http
         .post("/api/ecs_oe_admin/exam/audit/discipline/list", params)
         .then(response => {