zhangjie hai 1 ano
pai
achega
fa0aaa8a9c

+ 11 - 6
src/modules/base/components/course-simple/AddClazzSimpleDialog.vue

@@ -12,7 +12,14 @@
   >
   >
     <el-form ref="FilterForm" label-position="left" inline label-width="0px">
     <el-form ref="FilterForm" label-position="left" inline label-width="0px">
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="toPage(1)">查询</el-button>
+        <el-input
+          v-model.trim="clazzName"
+          placeholder="请输入教学班名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList">查询</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 
@@ -73,13 +80,14 @@ export default {
       modalIsShow: false,
       modalIsShow: false,
       isSubmit: false,
       isSubmit: false,
       dataList: [],
       dataList: [],
+      clazzName: "",
       multipleSelection: [],
       multipleSelection: [],
     };
     };
   },
   },
   methods: {
   methods: {
     visibleChange() {
     visibleChange() {
       this.multipleSelection = [];
       this.multipleSelection = [];
-      this.toPage(1);
+      this.getList();
     },
     },
     cancel() {
     cancel() {
       this.modalIsShow = false;
       this.modalIsShow = false;
@@ -90,15 +98,12 @@ export default {
     async getList() {
     async getList() {
       const datas = {
       const datas = {
         examId: this.course.examId,
         examId: this.course.examId,
+        clazzName: this.clazzName,
       };
       };
 
 
       const data = await basicTeachClazzListPage(datas);
       const data = await basicTeachClazzListPage(datas);
       this.dataList = data || [];
       this.dataList = data || [];
     },
     },
-    toPage(page) {
-      this.current = page;
-      this.getList();
-    },
     handleSelectionChange(val) {
     handleSelectionChange(val) {
       this.multipleSelection = val.map((item) => item.id);
       this.multipleSelection = val.map((item) => item.id);
     },
     },

+ 7 - 6
src/modules/base/components/course-simple/TeacherSimpleAssignCourseDialog.vue

@@ -17,12 +17,11 @@
             v-model.trim="filterLabel"
             v-model.trim="filterLabel"
             placeholder="请输入班级名称"
             placeholder="请输入班级名称"
             clearable
             clearable
-            @change="labelChange"
           ></el-input>
           ></el-input>
         </el-form-item>
         </el-form-item>
-        <!-- <el-form-item>
+        <el-form-item>
           <el-button type="primary" @click="getList">查询</el-button>
           <el-button type="primary" @click="getList">查询</el-button>
-        </el-form-item> -->
+        </el-form-item>
       </el-form>
       </el-form>
       <el-table ref="TableList" :data="dataList">
       <el-table ref="TableList" :data="dataList">
         <el-table-column width="55" align="center">
         <el-table-column width="55" align="center">
@@ -76,18 +75,20 @@ export default {
     async getList() {
     async getList() {
       const data = await teacherSimpleCourseQuery({
       const data = await teacherSimpleCourseQuery({
         teachCourseId: this.teacher.teachCourseId,
         teachCourseId: this.teacher.teachCourseId,
+        clazzName: this.filterLabel,
       });
       });
-      this.orignDataList = (data || []).map((item) => {
+      this.dataList = (data || []).map((item) => {
         if (item.teacherList && item.teacherList.length) {
         if (item.teacherList && item.teacherList.length) {
           item.teachers = item.teacherList.map((t) => t.name).join(",");
           item.teachers = item.teacherList.map((t) => t.name).join(",");
-          item.checked = item.teacherList.some((t) => t.id === this.teacher.id);
+          item.checked = item.teacherList.some(
+            (t) => t.id === this.teacher.userId
+          );
         } else {
         } else {
           item.teachers = "公共班级";
           item.teachers = "公共班级";
           item.checked = false;
           item.checked = false;
         }
         }
         return item;
         return item;
       });
       });
-      this.labelChange();
     },
     },
     checkAllChagne(checked) {
     checkAllChagne(checked) {
       this.dataList.forEach((item) => {
       this.dataList.forEach((item) => {

+ 1 - 1
src/modules/base/views/CourseManage.vue

@@ -105,7 +105,7 @@
         ></el-table-column>
         ></el-table-column>
         <el-table-column
         <el-table-column
           prop="courseCode"
           prop="courseCode"
-          label="课程码"
+          label="课程码"
           min-width="120"
           min-width="120"
         ></el-table-column>
         ></el-table-column>
         <el-table-column
         <el-table-column

+ 6 - 2
src/modules/course/components/EndScoreManage.vue

@@ -23,8 +23,12 @@
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table :data="dataList">
       <el-table :data="dataList">
         <el-table-column type="index" label="序号" width="70"></el-table-column>
         <el-table-column type="index" label="序号" width="70"></el-table-column>
-        <el-table-column prop="name" label="姓名"></el-table-column>
-        <el-table-column prop="studentCode" label="学号"></el-table-column>
+        <el-table-column prop="name" label="姓名" width="140"></el-table-column>
+        <el-table-column
+          prop="studentCode"
+          label="学号"
+          width="140"
+        ></el-table-column>
         <el-table-column prop="score" label="成绩" width="80">
         <el-table-column prop="score" label="成绩" width="80">
         </el-table-column>
         </el-table-column>
         <el-table-column prop="scoreDetailContent" label="成绩明细">
         <el-table-column prop="scoreDetailContent" label="成绩明细">

+ 6 - 2
src/modules/course/components/NormalScoreManage.vue

@@ -9,8 +9,12 @@
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table :data="dataList">
       <el-table :data="dataList">
         <el-table-column type="index" label="序号" width="70"></el-table-column>
         <el-table-column type="index" label="序号" width="70"></el-table-column>
-        <el-table-column prop="name" label="姓名"></el-table-column>
-        <el-table-column prop="studentCode" label="学号"></el-table-column>
+        <el-table-column prop="name" label="姓名" width="140"></el-table-column>
+        <el-table-column
+          prop="studentCode"
+          label="学号"
+          width="140"
+        ></el-table-column>
         <template v-for="(item, index) in normalScoreItems">
         <template v-for="(item, index) in normalScoreItems">
           <el-table-column :key="index" :label="item">
           <el-table-column :key="index" :label="item">
             <template slot-scope="scope">
             <template slot-scope="scope">