xiaofei hai 1 ano
pai
achega
39c1f5e7f1

+ 17 - 3
src/modules/mark/components/ScoreCheckDetail.vue

@@ -33,10 +33,18 @@
           >
           >
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
-        <el-form-item label="班级">
+        <el-form-item label="教学班">
+          <el-input
+            v-model.trim="filter.teachClassName"
+            placeholder="教学班"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="行政班">
           <el-input
           <el-input
             v-model.trim="filter.className"
             v-model.trim="filter.className"
-            placeholder="班级"
+            placeholder="行政班"
             clearable
             clearable
           >
           >
           </el-input>
           </el-input>
@@ -248,9 +256,15 @@
           min-width="160"
           min-width="160"
           sortable
           sortable
         ></el-table-column>
         ></el-table-column>
+        <el-table-column
+          prop="teachClassName"
+          label="教学班"
+          min-width="160"
+          sortable
+        ></el-table-column>
         <el-table-column
         <el-table-column
           prop="className"
           prop="className"
-          label="班级"
+          label="行政班"
           min-width="160"
           min-width="160"
           sortable
           sortable
         ></el-table-column>
         ></el-table-column>

+ 17 - 4
src/modules/mark/components/ScoreClassDetail.vue

@@ -39,10 +39,18 @@
             >
             >
             </el-input>
             </el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="班级">
+          <el-form-item label="教学班">
+            <el-input
+              v-model.trim="filter.teachClassName"
+              placeholder="教学班"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="行政班">
             <el-input
             <el-input
               v-model.trim="filter.className"
               v-model.trim="filter.className"
-              placeholder="班级"
+              placeholder="行政班"
               clearable
               clearable
             >
             >
             </el-input>
             </el-input>
@@ -196,7 +204,7 @@
             sortable
             sortable
           ></el-table-column>
           ></el-table-column>
           <el-table-column
           <el-table-column
-            prop="college"
+            prop="collegeName"
             label="院系"
             label="院系"
             width="180"
             width="180"
           ></el-table-column>
           ></el-table-column>
@@ -205,9 +213,14 @@
             label="专业"
             label="专业"
             width="180"
             width="180"
           ></el-table-column>
           ></el-table-column>
+          <el-table-column
+            prop="teachClassName"
+            label="教学班"
+            min-width="100"
+          ></el-table-column>
           <el-table-column
           <el-table-column
             prop="className"
             prop="className"
-            label="班级"
+            label="行政班"
             min-width="100"
             min-width="100"
           ></el-table-column>
           ></el-table-column>
           <el-table-column prop="checkTime" label="考试时间" width="180">
           <el-table-column prop="checkTime" label="考试时间" width="180">