lrf 1 jaar geleden
bovenliggende
commit
4f6c34b6d3
4 gewijzigde bestanden met toevoegingen van 10 en 2 verwijderingen
  1. 1 0
      .gitignore
  2. 2 2
      src/views/classes/name-list.vue
  3. 2 0
      src/views/league/index.vue
  4. 5 0
      src/views/stuscore/scoreList.vue

+ 1 - 0
.gitignore

@@ -2,6 +2,7 @@
 node_modules
 /dist
 package-lock.json
+director
 # local env files
 .env.local
 .env.*.local

+ 2 - 2
src/views/classes/name-list.vue

@@ -11,7 +11,7 @@
         <el-col :span="12">
           <el-button type="primary" size="mini" @click="addstu()">添加学生</el-button>
           <el-button type="primary" size="mini" @click="toComputIsFine()" :disabled="this.defaultOption.classid ? false : true">设置优秀学员</el-button>
-          <el-button type="primary" size="mini" @click="toExportList()">导出学生名单</el-button>
+          <!-- <el-button type="primary" size="mini" @click="toExportList()">导出学生名单</el-button> -->
         </el-col>
       </el-col>
       <data-table :fields="fields" :data="list" :opera="opera" @edit="toEdit" @delete="toDelete" @post="toPost"> </data-table>
@@ -168,7 +168,7 @@ export default {
     // 导出学生名单
     async toExportList() {
       const msg = this.$message({ duration: 0, message: '正在导出,请稍后...' });
-      const res = await this.toExport({ type: 'class', classid: this.id });
+      const res = await this.toExport({ type: 'class', classid: this.id, planid: _.get(this, 'defaultOption.planid') });
       msg.close();
       if (this.$checkRes(res)) {
         const { data } = res;

+ 2 - 0
src/views/league/index.vue

@@ -61,6 +61,8 @@ export default {
     async search() {
       // 查询课表
       let classid = this.id;
+      console.log(classid);
+      if (!classid) return;
       let res = await this.modelFetch({ model: 'lesson', classid });
       let r = res.data.lessons.filter(f => f.subid);
       r = r.map(r => {

+ 5 - 0
src/views/stuscore/scoreList.vue

@@ -57,6 +57,11 @@ export default {
       if (res.errcode === 0) {
         let nd = _.uniqBy(res.data, 'stuid');
         nd = nd.filter(f => this.stuList.find(sf => sf._id === f.stuid) && f.score);
+        nd = nd.map(i => {
+          const stu = this.stuList.find(sf => sf._id === i.stuid);
+          if (stu) i.name = stu.name;
+          return i;
+        });
         this.$set(this, `list`, nd);
         this.$set(this, `total`, res.total);
         // 教师总分