gengxin

src/layout/user/checkList.vue

@@ -10,11 +10,15 @@
             </div>
             <van-row class="attend" v-for="(tag, index) in checkWorkList" :key="index">
               <template v-for="(item, indexs) in tag.attend">
-                <van-col :span="20" class="dateTime" :key="'aa' + indexs">
+                <van-col :span="16" class="dateTime" :key="'aa' + indexs">
                   <p>{{ item.date }}</p>
                   <p>{{ item.time }}</p>
                 </van-col>
-                <van-col :span="4" class="status" :key="'bb' + indexs">
+
+                <van-col :span="6" class="status" :key="'bb' + indexs">
+                  {{ item.type === '0' ? '上课考勤' : item.type === '1' ? '寝室考勤' : '' }}
+                </van-col>
+                <van-col :span="2" class="status" :key="'bb' + indexs">
                   {{ item.status === '0' ? '未签到' : item.status === '1' ? '签到' : '迟到' }}
                 </van-col>
               </template>

src/views/question/index.vue

@@ -70,18 +70,20 @@ export default {
     ...questionnaire({ getQuestList: 'query', getQuestMerge: 'mergeRequest' }),
     ...mapClass({ classinfo: 'query' }),
     ...mapStudent({ stuQuery: 'query', stuFetch: 'fetch' }),
+
     // 查询问卷调查列表
     async search() {
       let res = await this.getQuestList({ type: 0 });
-      console.log(res.data);
-      this.$set(this, `questionnaireList`, res.data);
-      // if (this.$checkRes(res)) {
-      //   let ids = _.flattenDeep(res.data.map(i => i.questionnaireid));
-      //   console.log(ids);
-      //   let quest = await this.getQuestMerge({ method: 'fetch', data: ids });
-      //   console.log(quest);
-      //   // this.$set(this, `questionnaireList`, quest);
-      // }
+      let termid = this.user.termid;
+      let ress = await this.query({ termid });
+      let ids = _.flattenDeep(ress.data.map(i => i.questionnaireid));
+      console.log(ids);
+      let quest = await this.getQuestMerge({ method: 'fetch', data: ids });
+      console.log(quest);
+      let news = [];
+      news = [...res.data, ...quest];
+      console.log(news);
+      this.$set(this, `questionnaireList`, news);
     },
     // 班主任查询管理班级列表
     async searchInfo({ ...info } = {}) {

src/views/user/checkWork.vue

@@ -71,7 +71,9 @@ export default {
     // 查询考勤列表
     async search() {
       let studentid = this.user.userid;
-      const res = await this.query();
+      const res = await this.query({ studentid });
+      console.log(res.data);
+
       this.$set(this, `checkWorkList`, res.data);
       this.$set(this, `anames`, this.user.name);
     },

src/views/user/pingfenclass.vue

@@ -54,8 +54,10 @@ export default {
     async searchInfo({ ...info } = {}) {
       let batchid = this.user.batchid;
       let termid = this.user.termid;
-      let classid = this.user.classid;
-      const res = await this.classinfo({ batchid, termid, classid, ...info });
+      let id = this.user.classid;
+      const res = await this.classinfo({ batchid, termid, id, ...info });
+      console.log(res.data);
+
       this.$set(this, `classList`, res.data);
     },
   },

src/views/user/pingfenindex.vue

@@ -7,9 +7,9 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="leaveBtn" v-if="this.user.job == '学委' || this.user.type == '3'">
+          <!-- <el-col :span="24" class="leaveBtn" v-if="this.user.job == '学委' || this.user.type == '3'">
             <van-button round type="info" icon="smile" @click="onClickRight()">添加分数</van-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="24" class="leaveList">
             <pingfenList :groupList="groupList" :leaveList="leaveList" :stuList="groupList"></pingfenList>
           </el-col>