|
@@ -193,27 +193,47 @@ const useOptions = (
|
|
{ immediate: true }
|
|
{ immediate: true }
|
|
)
|
|
)
|
|
|
|
|
|
|
|
+ const watchQuestionHandle = () => {
|
|
|
|
+ isChooseAllOptionMap.question = !dataModel.question
|
|
|
|
+ if (types.includes('group') && dataModel.subject && dataModel.question) {
|
|
|
|
+ // resetGroupList()
|
|
|
|
+ // changeModelValue('group')(void 0)
|
|
|
|
+ getQuestionGroupList({ subjectCode: dataModel.subject, mainNumber: dataModel.question }).then((res: any) => {
|
|
|
|
+ // if (!userInfo.value?.markingGroupNumber && res && res[0]) {
|
|
|
|
+ // changeModelValue('group')(res[0])
|
|
|
|
+ // }
|
|
|
|
+ changeModelValue('group')(
|
|
|
|
+ multGroup && showAllLabel
|
|
|
|
+ ? groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
|
|
|
|
+ ? [void 0]
|
|
|
|
+ : []
|
|
|
|
+ : void 0
|
|
|
|
+ )
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
watch(
|
|
watch(
|
|
// [() => dataModel.question, () => dataModel.question],
|
|
// [() => dataModel.question, () => dataModel.question],
|
|
() => dataModel.question,
|
|
() => dataModel.question,
|
|
() => {
|
|
() => {
|
|
- isChooseAllOptionMap.question = !dataModel.question
|
|
|
|
- if (types.includes('group') && dataModel.subject && dataModel.question) {
|
|
|
|
- // resetGroupList()
|
|
|
|
- // changeModelValue('group')(void 0)
|
|
|
|
- getQuestionGroupList({ subjectCode: dataModel.subject, mainNumber: dataModel.question }).then((res: any) => {
|
|
|
|
- // if (!userInfo.value?.markingGroupNumber && res && res[0]) {
|
|
|
|
- // changeModelValue('group')(res[0])
|
|
|
|
- // }
|
|
|
|
- changeModelValue('group')(
|
|
|
|
- multGroup && showAllLabel
|
|
|
|
- ? groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
|
|
|
|
- ? [void 0]
|
|
|
|
- : []
|
|
|
|
- : void 0
|
|
|
|
- )
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
|
|
+ watchQuestionHandle()
|
|
|
|
+ // isChooseAllOptionMap.question = !dataModel.question
|
|
|
|
+ // if (types.includes('group') && dataModel.subject && dataModel.question) {
|
|
|
|
+ // // resetGroupList()
|
|
|
|
+ // // changeModelValue('group')(void 0)
|
|
|
|
+ // getQuestionGroupList({ subjectCode: dataModel.subject, mainNumber: dataModel.question }).then((res: any) => {
|
|
|
|
+ // // if (!userInfo.value?.markingGroupNumber && res && res[0]) {
|
|
|
|
+ // // changeModelValue('group')(res[0])
|
|
|
|
+ // // }
|
|
|
|
+ // changeModelValue('group')(
|
|
|
|
+ // multGroup && showAllLabel
|
|
|
|
+ // ? groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
|
|
|
|
+ // ? [void 0]
|
|
|
|
+ // : []
|
|
|
|
+ // : void 0
|
|
|
|
+ // )
|
|
|
|
+ // })
|
|
|
|
+ // }
|
|
},
|
|
},
|
|
{ immediate: true }
|
|
{ immediate: true }
|
|
)
|
|
)
|
|
@@ -245,7 +265,12 @@ const useOptions = (
|
|
!userInfo.value?.mainNumber
|
|
!userInfo.value?.mainNumber
|
|
) {
|
|
) {
|
|
if (mainQuestionList.value.length) {
|
|
if (mainQuestionList.value.length) {
|
|
|
|
+ const oldQuestionNumber = dataModel.question
|
|
changeModelValue('question')(mainQuestionList.value[0].value)
|
|
changeModelValue('question')(mainQuestionList.value[0].value)
|
|
|
|
+ if (oldQuestionNumber == mainQuestionList.value[0].value) {
|
|
|
|
+ //防止切换科目前的大题号和切换科目后的大题号相同,watch question监听不执行
|
|
|
|
+ watchQuestionHandle()
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|