Bläddra i källkod

feat: update useOptions

chenhao 2 år sedan
förälder
incheckning
247fde3871
2 ändrade filer med 3 tillägg och 9 borttagningar
  1. 1 7
      src/hooks/useOptions.ts
  2. 2 2
      src/modules/marking/assess/index.vue

+ 1 - 7
src/hooks/useOptions.ts

@@ -32,13 +32,7 @@ const useOptions = (
     return mainStore?.myUserInfo
     return mainStore?.myUserInfo
   })
   })
 
 
-  const dataModel = reactive<DataModel>(
-    unref(initModel) || {
-      subject: userInfo.value?.subjectCode,
-      question: userInfo.value?.mainNumber,
-      group: userInfo.value?.markingGroupNumber,
-    }
-  )
+  const dataModel = reactive<DataModel>(unref(initModel) || {})
 
 
   if (isRef(initModel)) {
   if (isRef(initModel)) {
     watch(
     watch(

+ 2 - 2
src/modules/marking/assess/index.vue

@@ -152,8 +152,8 @@ const items = computed<EpFormItem[]>(() => {
   ]
   ]
 })
 })
 
 
-onOptionInit(() => {
-  getMarkerTree({ subjectCode: model.subjectCode, mainNumber: model.mainNumber, name: '' })
+onOptionInit((data) => {
+  getMarkerTree({ subjectCode: data?.subject || '', mainNumber: data?.question, name: '' })
 })
 })
 
 
 type MarkerItem = ExtractArrayValue<ExtractArrayValue<ExtractApiResponse<'getMarkerTree'>>['markers']>
 type MarkerItem = ExtractArrayValue<ExtractArrayValue<ExtractApiResponse<'getMarkerTree'>>['markers']>