Browse Source

归档吸怪

zhangjie 3 năm trước cách đây
mục cha
commit
24416a2b2a

+ 3 - 0
src/assets/styles/base.scss

@@ -358,6 +358,9 @@ body {
 .text-right {
   text-align: right;
 }
+.text-prewrap {
+  white-space: pre-wrap;
+}
 
 // other
 .btn-danger {

+ 8 - 22
src/modules/stmms/views/ScoreArchive.vue

@@ -3,27 +3,14 @@
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
-          <el-form-item label="考试时间:">
-            <semester-select
-              v-model="filter.semesterId"
-              placeholder="考试时间"
-            ></semester-select>
+          <el-form-item label="学期:">
+            <semester-select v-model="filter.semesterId"></semester-select>
           </el-form-item>
-          <el-form-item label="学院:">
-            <college-select
-              v-model="filter.orgId"
+          <el-form-item label="考试:">
+            <exam-select
+              v-model="filter.examId"
               :semester-id="filter.semesterId"
-              cascader
-              placeholder="学院"
-            ></college-select>
-          </el-form-item>
-          <el-form-item label="专业:">
-            <major-select
-              v-model="filter.majorId"
-              :college-id="filter.orgId"
-              cascader
-              placeholder="专业"
-            ></major-select>
+            ></exam-select>
           </el-form-item>
           <el-form-item label="班级:">
             <class-select
@@ -57,7 +44,7 @@
           type="success"
           icon="el-icon-refresh"
           :loading="syncLoading"
-          :disabled="!filter.semesterId || !filter.courseCode"
+          :disabled="!filter.semesterId || !filter.examId"
           @click="toSync"
           >同步</el-button
         >
@@ -165,8 +152,7 @@ export default {
     return {
       filter: {
         semesterId: "",
-        orgId: "",
-        majorId: "",
+        examId: "",
         clazzId: "",
         courseCode: ""
       },

+ 2 - 2
src/modules/stmms/views/SyncManage.vue

@@ -73,10 +73,10 @@
               v-if="scope.row.result === 'ERROR'"
               placement="left-start"
               popper-class="answer-popover"
-              width="310"
+              width="400"
               trigger="hover"
             >
-              <p>{{ scope.row.errorMessage }}</p>
+              <p class="text-prewrap" v-html="scope.row.errorMessage"></p>
               <span class="color-danger" slot="reference">{{
                 scope.row.resultStr
               }}</span>