bug fix

server.config.ts

@@ -3,11 +3,11 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      target: 'http://192.168.10.41:8200',
+      // target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.108:8200',
       // target: 'http://cet-test.markingtool.cn',
-      // target: 'http://192.168.10.136:80',
+      target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

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

@@ -85,16 +85,16 @@ const { subjectList, mainQuestionList, groupList, dataModel, changeModelValue }
   'group',
 ])
 
-watch(dataModel, () => {
-  if (model.role !== 'EXPERT' && model.role !== 'SECTION_LEADER') {
-    model.subjectCode = dataModel.subject || ''
-    model.mainNumber = dataModel.question
-    model.markingGroupNumber = dataModel.group
-  }
-  if (model.role === 'SECTION_LEADER') {
-    model.subjectCode = dataModel.subject || '全部'
-  }
-})
+// watch(dataModel, () => {
+//   if (model.role !== 'EXPERT' && model.role !== 'SECTION_LEADER') {
+//     model.subjectCode = dataModel.subject || ''
+//     model.mainNumber = dataModel.question
+//     model.markingGroupNumber = dataModel.group
+//   }
+//   if (model.role === 'SECTION_LEADER') {
+//     model.subjectCode = dataModel.subject || '全部'
+//   }
+// })
 watch(
   () => model.role,
   () => {

src/modules/admin-user/manage/hooks/useUserManageFilter.ts

@@ -20,7 +20,10 @@ const useUserManageFilter = () => {
       })
     })
   const mainStore = useMainStore()
-  const { subjectList, mainQuestionList, changeModelValue, dataModel } = useOptions(['subject', 'question'])
+  const { subjectList, mainQuestionList, changeModelValue, dataModel, onOptionInit } = useOptions([
+    'subject',
+    'question',
+  ])
 
   const { elFormRef, formRef, defineColumn, _ } = useForm()
 
@@ -137,6 +140,7 @@ const useUserManageFilter = () => {
     rows,
     expand,
     toggleExpand,
+    onOptionInit,
   }
 }
 

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

@@ -190,7 +190,7 @@ watch(
   },
   { deep: true }
 )
-const { formRef, model, items: formItems, rows, expand, toggleExpand } = useUserManageFilter()
+const { formRef, model, items: formItems, rows, expand, toggleExpand, onOptionInit } = useUserManageFilter()
 
 const {
   pagination,
@@ -308,7 +308,8 @@ function onDisableUser(row: ExtractMultipleApiResponse<'getUserList'>) {
   row.id && toggleFetch({ enable: !row.enable, ids: [row.id] }).then(fetchTable)
 }
 
-onSearch()
+onOptionInit(onSearch)
+// onSearch()
 </script>
 
 <style scoped lang="scss">

src/modules/marking/assess/index.vue

@@ -142,6 +142,7 @@ watch(
   () => {
     if ((model.subjectCode, model.mainNumber)) {
       getForceCheckGroupList({ subjectCode: model.subjectCode, mainNumber: model.mainNumber })
+      getMarkerTree({ subjectCode: model.subjectCode, mainNumber: model.mainNumber, name: '' })
     }
   },
   { immediate: true }