chenhao 2 лет назад
Родитель
Сommit
554fcafb8d

+ 1 - 1
src/modules/admin-data/export/index.vue

@@ -58,7 +58,7 @@ const items = computed<EpFormItem[]>(() => {
       label: '科目',
       prop: 'subjectCode',
       slotType: 'select',
-      slot: { options: subjectList.value, onChange: changeModelValue('subject'), disabled: true },
+      slot: { options: subjectList.value, onChange: changeModelValue('subject') },
     }),
     OneRowSpan5({ slotName: 'operation', labelWidth: useVW(20) }),
   ]

+ 1 - 1
src/modules/admin-subject/edit-main-question/index.vue

@@ -277,7 +277,7 @@ const onSubmit = async () => {
       }
     })
     if (valid) {
-      const data = { ...model, levelRange: model.levelRange || [] }
+      const data = { ...model, levelRange: model.levelRange || [], category: model.category || void 0 }
       await (isEdit ? editMainQuestion(data) : addMainQuestion(data))
       ElMessage.success('保存成功')
       back()

+ 10 - 8
src/modules/analysis/monitoring/index.vue

@@ -54,7 +54,7 @@
 
 <script setup lang="tsx" name="AnalysisMonitoring">
 /** 决策分析-监控 */
-import { computed, reactive, ref, watch } from 'vue'
+import { computed, reactive, ref, watch, nextTick } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElButton, ElFormItem } from 'element-plus'
 import { omit } from 'lodash-es'
@@ -106,11 +106,15 @@ const { subjectList, mainQuestionList, groupList, dataModel, changeModelValue, i
   'group',
 ])
 
-watch(dataModel, () => {
-  model.subjectCode = dataModel.subject
-  model.questionMainNumber = dataModel.question
-  model.markingGroupNumbers = dataModel.group
-})
+watch(
+  dataModel,
+  () => {
+    model.subjectCode = dataModel.subject
+    model.questionMainNumber = dataModel.question
+    model.markingGroupNumbers = dataModel.group
+  },
+  { immediate: true }
+)
 
 const formItems = computed<EpFormItem[]>(() => [
   {
@@ -119,7 +123,6 @@ const formItems = computed<EpFormItem[]>(() => [
     prop: 'subjectCode',
     slot: {
       options: subjectList.value,
-      onChange: changeModelValue('subject'),
       disabled: true,
     },
   },
@@ -129,7 +132,6 @@ const formItems = computed<EpFormItem[]>(() => [
     prop: 'questionMainNumber',
     slot: {
       options: mainQuestionList.value,
-      onChange: changeModelValue('question'),
       disabled: true,
     },
   },