题目答案1
' - }, - { - optionType: 2, - optionContent: '题目答案2
' - }, - { - optionType: 3, - optionContent: '题目答案3
' - } - ] - - return this.setState({ - currentIndex: index, - currentActive: item.subjectType === 2 ? activeList : activeList[0], - subjectObject: { - subjectName: '题干内容', - subjectType: item.subjectType, - optionList, - // subjectList: subjectList, - // currentIndex: index, - // currentActive: item.sub??jectType === 2 ? activeList : activeList[0], - isMark: isMark - } - }) - req({ - method: 'post', - data: params, - url: ApiName.getPracticeSubject - }) - .then(res => { - if (res.data) { - let subjectObject = res.data - if (item.subjectType === 3) { - subjectObject.optionList = [ - { - optionContent: '正确', - optionType: 1 - }, - { - optionContent: '错误', - optionType: 0 - } - ] - } - this.setState({ - subjectObject: res.data, - subjectList: subjectList, - currentIndex: index, - currentActive: item.subjectType === 2 ? activeList : activeList[0], - isMark: isMark - }) - } - }) - .catch(err => console.log(err)) - } - - /** - * 选择单选 - * @param {*} e - * @returns - */ - onChangeRadio = e => () => { - let { currentIndex, subjectList } = this.state - _.set(subjectList, [currentIndex, 'activeList'], [e]) - this.setState({ - currentActive: e, - subjectList - }) - } - - /** - * 选择多选 - * @param {*} e - * @returns - */ - onChangeCheck = e => { - let { currentIndex, subjectList } = this.state - _.set(subjectList, [currentIndex, 'activeList'], e) - this.setState({ - currentActive: e, - subjectList - }) - } - - /** - * 暂停计时 - */ - onChangeStop = () => { - this.setState({ isShowStopBox: true }) - this.timerRef.current.stop() - } - - /** - * 标记一下 - */ - onChangeMark = () => { - let { currentIndex, subjectList, subjectObject } = this.state - let flag = 1 - if (subjectList[currentIndex]?.isMark) { - flag = 0 - } - _.set(subjectList, [currentIndex, 'isMark'], flag) - this.setState({ - subjectList, - isMark: flag, - subjectObject - }) - } - - /** - * 选择答题卡 - * @param {*} index - * @param {*} item - * @returns - */ - onChangePaging = index => { - let { currentIndex } = this.state - // 如果点击当前题目，直接return - if (currentIndex === index) { - return - } - this.changeData(index) - } - - /** - * 交卷 - */ - onChangeOver = () => { - const { subjectList } = this.state - let answerDetails = [] - subjectList.forEach(item => { - let obj = { - subjectId: item.subjectId, - subjectType: item.subjectType, - answerContents: [] - } - if (item?.activeList && item?.activeList?.length > 0) { - obj.answerContents = item.activeList - } - answerDetails.push(obj) - }) - let params = { - setId: this.setId, - timeUse: this.timerRef.current.getUseTime(), - submitTime: getCurrentTime(), - answerDetails: answerDetails - } - req({ - method: 'post', - data: params, - url: ApiName.submitSubject - }) - .then(res => { - if (res.data && res.data.practiceId) { - //关闭定时器 - this.timerRef.current.end() - this.props.history.replace( - splicingQuery('/practice-analytic', { - practiceId: res.data.practiceId - }) - ) - } - }) - .catch(err => console.log(err)) - } - - /** - * 提前交卷弹框-直接交卷 - */ - onHandleSubmitModal = () => { - this.onChangeOver() - } - - /** - * 提前交卷弹框-继续做题 - */ - onHandleCancelModal = () => { - this.setState({ isShowAdvanOverceBox: false }) - } - - /** - * 提前交卷 - */ - onChangeAdvanceOver = () => { - this.setState({ - isShowAdvanOverceBox: true - }) - } - - /** - * 下一题 - * @returns - */ - onChangeNext = () => { - let { currentIndex } = this.state - currentIndex += 1 - this.changeData(currentIndex) - } - - /** - * 改变数据 - * @param {*} index 当前点击下标 - */ - changeData = index => { - let { subjectList } = this.state - let subObj = subjectList[index] - let activeList = [] // 多选 选中的答案项 - let isMark = 0 // 是否被标记 - - // 将其他item设置为未选中 - subjectList.forEach(item => { - item.active = false - }) - _.set(subjectList, [index, 'active'], true) - - // if当前选择的有选答案，则直接显示出来 - if (subObj?.activeList?.length > 0) { - activeList = subObj?.activeList - } - - // if当前已被标记，则直接显示出来 - if (subObj?.isMark == 1) { - isMark = 1 - } - - this.getPracticeSubject(subObj, subjectList, index, activeList, isMark) - } - - /** - * 暂停弹框-继续做题 - */ - onChangeSubmitModal = () => { - this.timerRef.current.run() - this.setState({ isShowStopBox: false }) - } - - /** - * 暂停弹框-再次再做 - */ - onChangeCancelModal = () => { - this.props.history.goBack() - } - - render() { - const { - isMark, - isCollection, - currentIndex, - currentActive, - subjectList, - subjectObject, - isShowAdvanOverceBox, - isShowStopBox - } = this.state - const isLast = currentIndex === subjectList?.length - 1 - // 获得已答的题目个数 - const noAnswerNum = - subjectList.filter(item => item.activeList && item.activeList.length > 0).length || 0 - return ( -题目答案1
' - }, - { - optionType: 2, - optionContent: '题目答案2
' - }, - { - optionType: 3, - optionContent: '题目答案3
' - } - ] - setCurrentActive(item.subjectType === 2 ? activeList : activeList[0]) - setCurrentIndex(index) - setSubjectObject({ - subjectName: '题干内容', - subjectType: item.subjectType, - optionList, - // subjectList: subjectList, - // currentIndex: index, - // currentActive: item.sub??jectType === 2 ? activeList : activeList[0], - isMark: isMark - }) - - return - req({ - method: 'post', - data: params, - url: ApiName.getPracticeSubject - }) + req( + { + method: 'post', + data: params, + url: ApiName.getPracticeSubject + }, + '/practice' + ) .then(res => { if (res.data) { let subjectObject = res.data - if (item.subjectType === 3) { + if (subjectObject.subjectType === 3) { subjectObject.optionList = [ { optionContent: '正确', @@ -158,13 +105,10 @@ const PracticeDetails = props => { } ] } - setState({ - subjectObject: res.data, - subjectList: subjectList, - currentIndex: index, - currentActive: item.subjectType === 2 ? activeList : activeList[0], - isMark: isMark - }) + setCurrentActive(subjectObject.subjectType === 2 ? activeList : activeList[0]) + setCurrentIndex(index) + setSubjectObject({ ...subjectObject, isMark }) + setSubjectList(subjectList) } }) .catch(err => console.log(err)) @@ -188,7 +132,6 @@ const PracticeDetails = props => { * @returns */ const onChangeCheck = e => { - // let { currentIndex, subjectList } = state const list = [...subjectList] _.set(list, [currentIndex, 'activeList'], e) setCurrentActive(e) @@ -199,7 +142,6 @@ const PracticeDetails = props => { * 暂停计时 */ const onChangeStop = () => { - // setState({ isShowStopBox: true }) setIsShowStopBox(true) timerRef.current.stop() } @@ -237,43 +179,28 @@ const PracticeDetails = props => { */ const onChangeOver = () => { timerRef.current.end() - navigate('/practice-analytic/1', { replace: true }) - // const list = [...subjectList] - // let answerDetails = [] - // list.forEach(item => { - // let obj = { - // subjectId: item.subjectId, - // subjectType: item.subjectType, - // answerContents: [] - // } - // if (item?.activeList && item?.activeList?.length > 0) { - // obj.answerContents = item.activeList - // } - // answerDetails.push(obj) - // }) - // let params = { - // setId: setId, - // timeUse: timerRef.current.getUseTime(), - // submitTime: getCurrentTime(), - // answerDetails: answerDetails - // } - // req({ - // method: 'post', - // data: params, - // url: ApiName.submitSubject - // }) - // .then(res => { - // if (res.data && res.data.practiceId) { - // //关闭定时器 - // timerRef.current.end() - // props.history.replace( - // splicingQuery('/practice-analytic', { - // practiceId: res.data.practiceId - // }) - // ) - // } - // }) - // .catch(err => console.log(err)) + let params = { + setId, + practiceId: subjectInfo.practiceId, + timeUse: timerRef.current.getUseTime(), + submitTime: getCurrentTime() + } + req( + { + method: 'post', + data: params, + url: ApiName.submit + }, + '/practice' + ) + .then(res => { + if (res.success) { + //关闭定时器 + timerRef.current.end() + navigate('/practise-analytic/' + subjectInfo.practiceId, { replace: true }) + } + }) + .catch(err => console.log(err)) } /** @@ -288,8 +215,6 @@ const PracticeDetails = props => { */ const onHandleCancelModal = () => { setIsShowAdvanOverceBox(false) - - // setState({ isShowAdvanOverceBox: false }) } /** @@ -297,9 +222,6 @@ const PracticeDetails = props => { */ const onChangeAdvanceOver = () => { setIsShowAdvanOverceBox(true) - // setState({ - // isShowAdvanOverceBox: true - // }) } /** @@ -307,8 +229,28 @@ const PracticeDetails = props => { * @returns */ const onChangeNext = () => { - // let { currentIndex } = state - // currentIndex += 1 + console.log(subjectList) + const { subjectId, subjectType, activeList } = subjectList[currentIndex] + + let params = { + practiceId: subjectInfo.practiceId, + timeUse: timerRef.current.getUseTime(), + subjectId: subjectId, + subjectType: subjectType, + answerContents: activeList + } + req( + { + method: 'post', + data: params, + url: ApiName.submitSubject + }, + '/practice' + ) + .then(res => { + console.log(res) + }) + .catch(err => console.log(err)) setCurrentIndex(currentIndex + 1) changeData(currentIndex + 1) } @@ -318,7 +260,6 @@ const PracticeDetails = props => { * @param {*} index 当前点击下标 */ const changeData = index => { - // let { subjectList } = state const list = [...subjectList] let subObj = list[index] let activeList = [] // 多选 选中的答案项 @@ -349,14 +290,12 @@ const PracticeDetails = props => { const onChangeSubmitModal = () => { timerRef.current.run() setIsShowStopBox(false) - // setState({ isShowStopBox: false }) } /** * 暂停弹框-再次再做 */ const onChangeCancelModal = () => { - // props.history.goBack() navigate(-1) } @@ -367,7 +306,7 @@ const PracticeDetails = props => {