wuhongyu 5 年之前
父节点
当前提交
f320fdd8d4
共有 4 个文件被更改,包括 20 次插入9 次删除
  1. 0 1
      src/router/index.js
  2. 10 6
      src/views/question/index.vue
  3. 8 1
      src/views/question/question.vue
  4. 2 1
      src/views/user/pingfenclass.vue

+ 0 - 1
src/router/index.js

@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import store from '@/store/index';
-
 Vue.use(VueRouter);
 
 const routes = [

+ 10 - 6
src/views/question/index.vue

@@ -72,12 +72,16 @@ export default {
     ...mapStudent({ stuQuery: 'query', stuFetch: 'fetch' }),
     // 查询问卷调查列表
     async search() {
-      let res = await this.query({ termid: this.user.termid });
-      if (this.$checkRes(res)) {
-        let ids = _.flattenDeep(res.data.map(i => i.questionnaireid));
-        let quest = await this.getQuestMerge({ method: 'fetch', data: ids });
-        this.$set(this, `questionnaireList`, quest);
-      }
+      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);
+      // }
     },
     // 班主任查询管理班级列表
     async searchInfo({ ...info } = {}) {

+ 8 - 1
src/views/question/question.vue

@@ -77,12 +77,14 @@ export default {
       // 将答案塞进去
       result.data.question.map(i => {
         if (!i.answer) i.type === '1' ? (i.answer = []) : '';
-        let mid = asArr.find(f => f.questionid === i.id);
+        let mid = asArr.find(f => f.questionid === i._id);
+        console.log(mid);
         if (_.get(mid, `answer`)) {
           i.answer = JSON.parse(mid.answer);
         }
         return i;
       });
+
       this.$set(this, `info`, { ...result.data, ...asObject });
     },
     // 提交答案
@@ -96,7 +98,12 @@ export default {
       });
       let object = { termid, batchid, classid, studentid, questionnaireid: this.id, answers };
       let res;
+
+      console.log(object);
+      console.log(answerid);
+
       if (!answerid) {
+        console.log('ccc');
         res = await this.sendAnswer(object);
       } else {
         object.id = answerid;

+ 2 - 1
src/views/user/pingfenclass.vue

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