闫增涛
2024-12-20 b473b0c263a47bc33306991b497af50a738fbce7
教学互动答题修改
6个文件已修改
187 ■■■■ 已修改文件
assets/js/middleGround/api/edu.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/examination.js 167 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/examination.wxml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/questionOptions/index.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/questionOptions/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
assets/js/middleGround/api/edu.js
@@ -188,6 +188,14 @@
      data
    })
  },
  // 获取加入的班级列表
  getJoinCourseClassList(data) {
    return request({
      url: '/edu/api/ApiGetJoinCourseClassList',
      method: 'post',
      data
    })
  },
}
export default eduApi
packageBookService/pages/bookServices/detail/index.js
@@ -1175,7 +1175,7 @@
                jslx: false,
              });
            } else {
              data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.refCode != 'jsek_interaction')
              data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder')
              // && item.refCode != 'jsek_interaction'
              that.setData({
                jslx: true,
packageBookService/pages/bookServices/examination/examination.js
@@ -91,7 +91,6 @@
    }
    const token = wx.getStorageSync(app.config.tokenKey)
    if (!token) {
      loginInfo(app, (data) => {
        if (data) {
@@ -103,7 +102,6 @@
    } else {
      this.init()
    }
  },
  /**
@@ -761,6 +759,14 @@
        }, ],
      });
      this.init();
    } else if (this.data.answerType == 'interaction') {
      this.setData({
        countdownTime: 2 * 60 * 60 * 1000,
      });
      this.delinteractionInfo(() => {
        this.getQuestionList()
        this.clearTime();
      })
    } else {
      this.init();
      this.clearTime();
@@ -1080,9 +1086,6 @@
            questionDataList: questionList,
            cardList: cardUpdatedList,
          });
          console.log(
            '题目', this.data.questionDataList
          );
        });
      });
    }
@@ -2282,10 +2285,9 @@
    const query = {
      start: 0,
      size: 999,
      filterList: [],
      infoTypes: [],
    }
    app.MG.identity.joinedGroupByList(query).then((res) => {
      console.log('班级信息', res);
      res.datas.forEach(async item => {
        item.topicId = null
        const data = await this.getTopicInfo(item.id)
@@ -2293,21 +2295,47 @@
          item.topicId = data.id
        }
      })
      console.log('班级', res)
      if (res.datas.length) {
        this.setData({
          classList: res.datas
        })
        // 判断班级 是否所属于该书
        const flag = res.datas.some(item => item.linkProductDto.product.id == this.data.bookId)
        if (!flag) {
          this.setData({
            visible: true,
          })
        const classData = res.datas.find(item => item.linkProductDto.product.id == this.data.bookId)
        if (classData) {
          if (classData.userState == 'Normal') {
            // 加入班级
            this.setData({
              joinGroup: true
            })
          } else if (classData.userState == 'WaitValid') {
            this.setData({
              submitStatus: true
            })
            // 审核中
            wx.showModal({
              title: '提示',
              content: '请等待老师审核加入班级后答题',
              confirmColor: "#ff6c00",
              complete: (res) => {
                if (res.cancel) {
                  wx.navigateBack()
                }
                if (res.confirm) {
                  wx.navigateBack()
                }
              }
            })
          } else {
            // 拒绝
            this.setData({
              visible: true
            })
          }
        } else {
          // 未加入班级
          this.setData({
            visible: false,
            joinGroup: true
            visible: true
          })
        }
      } else {
@@ -2316,18 +2344,6 @@
        })
      }
      // if (res.datas.length) {
      //   this.setData({
      //     classList: res.datas,
      //     visible: true
      //   })
      // } else {
      //   // 未加入班级,唤起加入班级弹窗
      //   this.setData({
      //     joinGroup: false,
      //     visible: true
      //   })
      // }
    })
  },
  // 加入班级
@@ -2388,9 +2404,9 @@
          let value = JSON.parse(res[0].value);
          const scoreData = value.dataList.find(item => item.name == "客观题得分" && item.path == this.data.productLinkPath)
          this.setData({
            submitStatus: value.submitStatus,
            currentIndex: value.currentIndex,
            subjectiveNum: scoreData ? scoreData.score : 0
            currentIndex: value.currentIndex ? value.currentIndex : 0,
            subjectiveNum: scoreData ? scoreData.score : 0,
            submitStatus: true
          });
          // 携带答题记录 获取题目
          this.getQuestionList(value.dataList);
@@ -2403,7 +2419,7 @@
      });
  },
  // 提交教学互动答题数据
  setinteractionInfo(submitStatus) {
  setinteractionInfo() {
    const list = []
    this.data.cardList.forEach(item => {
      list.push({
@@ -2420,14 +2436,12 @@
      score: this.data.subjectiveNum,
      path: this.data.productLinkPath,
    })
    console.log('提交数据', list);
    app.MG.identity
      .setUserKey({
        setKeyRequests: [{
          domain: "interactionData",
          key: this.data.productLinkPath,
          value: JSON.stringify({
            submitStatus,
            currentIndex: this.data.currentIndex,
            dataList: list
          }),
@@ -2437,12 +2451,11 @@
  },
  // 处理教学互动答题 
  handleClassQuestion() {
    console.log(1, this.data.questionDataList);
    const flag = this.data.questionDataList.some(item => !item.userAnswer)
    if (flag) {
      // 没做完,保存即可
      const isAnswer = this.data.questionDataList.some(item => item.userAnswer)
      if (isAnswer) this.setinteractionInfo(false)
      if (isAnswer) this.setinteractionInfo()
    } else {
      // 做完了且加入了班级,提交到message
      if (this.data.classList.length && this.data.joinGroup) {
@@ -2450,10 +2463,10 @@
          if (item.linkProductDto.product.id == this.data.bookId)
            this.newTopicMessage(item.topicId)
        })
        this.setinteractionInfo(true)
        this.setinteractionInfo()
      } else {
        // 做完了,没加入班级
        this.setinteractionInfo(false)
        this.setinteractionInfo()
      }
      this.setData({
        isShowDialog: true
@@ -2475,49 +2488,41 @@
        state: citem.questionType == 'shortAnswer' ? 'none' : citem.isRight,
        type: citem.questionType
      })
    }
    const data = {
      description: '',
      icon: '',
      state: 'Normal',
      topicIdOrRefCode: String(topicId),
      name: this.data.answerTitle,
      content: JSON.stringify({
        bookId: this.data.bookId,
        userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name,
        path: this.data.productLinkPath,
        content
      }),
      type: 'Normal',
      cmsTypeRefCode: '',
      newDataListRequest: []
    }
    app.MG.ugc.newTopicMessage(data).then((res) => {
      if (res) {
        this.setData({
          isShowDialog: true
        })
      const userInfo = JSON.parse(wx.getStorageSync(app.config.userInfoKey))
      const data = {
        description: '',
        icon: '',
        state: 'Normal',
        topicIdOrRefCode: String(topicId),
        name: this.data.answerTitle,
        content: JSON.stringify({
          bookId: this.data.bookId,
          userName: userInfo.name ? userInfo.name : userInfo.nickName ? userInfo.nickName : '-',
          path: this.data.productLinkPath,
          content
        }),
        type: 'Normal',
        cmsTypeRefCode: '',
        newDataListRequest: []
      }
    })
      app.MG.ugc.newTopicMessage(data).then((res) => {
        if (res) {
          this.setData({
            isShowDialog: true
          })
        }
      })
    }
  },
  // 新建子topicMessage
  // newTopicSubMessage(parentId,topicId) {
  //   const data = {
  //     description: '',
  //     icon: '',
  //     parentId,
  //     state: 'Normal',
  //     topicIdOrRefCode: String(topicId),
  //     name: this.data.answerTitle,
  //     content: '',
  //     type: 'Normal',
  //     cmsTypeRefCode: '',
  //     newDataListRequest: []
  //   }
  //   MG.ugc.newTopicMessage(data).then((res) => {
  //     if (res) {
  //     }
  //   })
  // },
});
  // 删除教学互动答题记录
  delinteractionInfo(callback) {
    app.MG.identity
      .delUserKey({
        domain: 'interactionData',
        keys: [this.data.productLinkPath]
      })
      .then((res) => {
        if (callback) callback()
      })
  }
})
packageBookService/pages/bookServices/examination/examination.wxml
@@ -59,6 +59,7 @@
      subjectiveGrade="{{subjectiveGrade}}"
      correctNum="{{correctNum}}"
      mockSumTime="{{mockData.sumTime}}"
      joinGroup="{{joinGroup}}"
      showId="{{showId}}"
      bind:setCollect="setCollect"
      bind:submitPaper="submitPaper"
@@ -80,6 +81,4 @@
></page-container>
<!-- 加入班级弹窗 -->
<join-dialog visible="{{visible}}" bind:joinClass="joinClass">
</join-dialog>
<join-dialog visible="{{visible}}" bind:joinClass="joinClass"> </join-dialog>
packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -57,6 +57,9 @@
    },
    isShowDialog: {
      type: Boolean
    },
    joinGroup:{
      type:Boolean
    }
  },
packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -37,7 +37,7 @@
  <view
    class="li-option"
    bind:tap="resterBtn"
    wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus)}}"
    wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus) || (answerType == 'interaction' && !joinGroup)}}"
    style="color: {{isNight ? '#fff' : '#000'}};"
  >
    <image