Merge branch 'release_1.0.1' of http://git.qmth.com.cn/marking-cet/marking-cet-web into dev_1.0.1

src/hooks/useOptions.ts

@@ -179,13 +179,18 @@ const useOptions = (
 
   watch(
     // [() => 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 })
+        getQuestionGroupList({ subjectCode: dataModel.subject, mainNumber: dataModel.question }).then((res: any) => {
+          // if (!userInfo.value?.markingGroupNumber && res && res[0]) {
+          //   changeModelValue('group')(res[0])
+          // }
+          changeModelValue('group')(void 0)
+        })
       }
     },
     { immediate: true }

src/modules/admin-user/manage/index.vue

@@ -163,7 +163,7 @@ import useFetch from '@/hooks/useFetch'
 import useUserManageFilter from './hooks/useUserManageFilter'
 import useUserManageTable from './hooks/useUserManageTable'
 import useUploadFile from '@/hooks/useUploadFile'
-
+import useMainStore from '@/store/main'
 import useVW from '@/hooks/useVW'
 import bus from '@/utils/bus'
 import type { ExtractMultipleApiResponse } from '@/api/api'
@@ -174,6 +174,7 @@ const { fetch: importUsersFile, loading: importUsersLoading } = useFetch('import
 const importUsersModel = reactive<any>({
   file: void 0,
 })
+const mainStore = useMainStore()
 watch(
   fileList,
   () => {
@@ -308,8 +309,11 @@ function onDisableUser(row: ExtractMultipleApiResponse<'getUserList'>) {
   row.id && toggleFetch({ enable: !row.enable, ids: [row.id] }).then(fetchTable)
 }
 
-onOptionInit(onSearch)
-// onSearch()
+if (mainStore.myUserInfo?.role === 'ADMIN') {
+  onSearch()
+} else {
+  onOptionInit(onSearch)
+}
 </script>
 
 <style scoped lang="scss">

src/modules/analysis/monitoring/index.vue

@@ -144,6 +144,7 @@ const formItems = computed<EpFormItem[]>(() => [
     slot: {
       options: mainQuestionList.value,
       disabled: !isExpert.value && !isLeader.value,
+      onChange: changeModelValue('question'),
     },
   },
   {