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-subject/struct/index.vue

@@ -54,9 +54,9 @@
       </base-form>
     </base-dialog>
     <base-dialog v-model="showSyncTaskDialog" destroy-on-close :width="400" title="同步任务">
-      <div class="dialog-text">
+      <!-- <div class="dialog-text">
         待同步任务：<span class="red">{{ syncCount?.count }}</span>
-      </div>
+      </div> -->
       <div class="dialog-text">是否确认从关联大题中 <b>同步人机仲裁</b> 任务</div>
       <template #footer>
         <div class="flex justify-center">
@@ -156,13 +156,13 @@ function recovery(row: any) {
 }
 const curRow = ref<any>()
 function syncTask(row: any) {
-  getSyncCount({
-    mainNumber: row.mainNumber,
-    subjectCode: subjectInfo.value.code,
-  }).then(() => {
-    showSyncTaskDialog.value = true
-    curRow.value = row
-  })
+  // getSyncCount({
+  //   mainNumber: row.mainNumber,
+  //   subjectCode: subjectInfo.value.code,
+  // }).then(() => {
+  showSyncTaskDialog.value = true
+  curRow.value = row
+  // })
 }
 const { fetch: syncFetch, loading: syncLoading } = useFetch('syncSubmit')
 const syncSubmit = () => {

src/modules/analysis/group-monitoring/hooks/useFormFilter.ts

@@ -16,7 +16,7 @@ const useFormFilter = () => {
     onOptionInit,
     isExpert,
     isLeader,
-  } = useOptions(['subject', 'question', 'group'])
+  } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
   const ROLE_OPTION = ref<any[]>([])
   useFetch('getRoleList')
     .fetch()
@@ -58,7 +58,29 @@ const useFormFilter = () => {
   })
 
   const OneRowSpan5 = defineColumn(_, 'row-1', { span: 4 })
-
+  const customGroupChange = (v: any) => {
+    if (groupListWithAll.value.find((item: any) => item.value == undefined)) {
+      if (model.markingGroupNumbers.includes(undefined)) {
+        model.markingGroupNumbers = [void 0]
+        changeModelValue('group')(model.markingGroupNumbers)
+      } else {
+        changeModelValue('group')(v)
+      }
+    } else {
+      changeModelValue('group')(v)
+    }
+  }
+  const transGroupOptions = computed(() => {
+    return (model.markingGroupNumbers || []).includes(undefined)
+      ? (groupListWithAll.value || []).map((item: any) => {
+          item.value != undefined && (item.disabled = true)
+          return item
+        })
+      : groupListWithAll.value.map((item: any) => {
+          item.disabled = false
+          return item
+        })
+  })
   const items = computed<EpFormItem[]>(() => [
     OneRowSpan5({
       label: '科目',
@@ -85,8 +107,8 @@ const useFormFilter = () => {
       label: '小组',
       slotType: 'select',
       slot: {
-        options: groupListWithAll.value,
-        onChange: changeModelValue('group'),
+        options: transGroupOptions.value,
+        onChange: customGroupChange,
         multiple: true,
       },
     }),

src/modules/analysis/personnel-compare/hooks/useCompareFilter.ts

@@ -53,6 +53,29 @@ const useCompareFilter = () => {
   const OneRowSpan4 = defineColumn(_, 'row-1', { span: 4 })
   const OneRowSpan3 = defineColumn(_, 'row-1', { span: 3 })
   const OneRowSpan2 = defineColumn(_, 'row-1', { span: 2 })
+  const customGroupChange = (v: any) => {
+    if (groupListWithAll.value.find((item: any) => item.value == undefined)) {
+      if (model.markingGroupNumber.includes(undefined)) {
+        model.markingGroupNumber = [void 0]
+        changeModelValue('group')(model.markingGroupNumber)
+      } else {
+        changeModelValue('group')(v)
+      }
+    } else {
+      changeModelValue('group')(v)
+    }
+  }
+  const transGroupOptions = computed(() => {
+    return (model.markingGroupNumber || []).includes(undefined)
+      ? (groupListWithAll.value || []).map((item: any) => {
+          item.value != undefined && (item.disabled = true)
+          return item
+        })
+      : groupListWithAll.value.map((item: any) => {
+          item.disabled = false
+          return item
+        })
+  })
 
   const items = computed(() => [
     OneRowSpan4({
@@ -83,8 +106,8 @@ const useCompareFilter = () => {
       slotType: 'select',
       labelWidth: '52px',
       slot: {
-        options: groupListWithAll.value,
-        onChange: changeModelValue('group'),
+        options: transGroupOptions.value,
+        onChange: customGroupChange,
         multiple: true,
       },
     }),

src/modules/quality/self-check/index.vue

@@ -75,9 +75,10 @@ const {
   changeModelValue,
   isExpert,
   isLeader,
-} = useOptions(['subject', 'question', 'group'])
+} = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
 
-const model = reactive<FormModel & { time: string }>({
+// const model = reactive<FormModel & { time: string }>({
+const model = reactive<any>({
   time: '',
   subjectCode: dataModel.subject || '',
   questionMainNumber: dataModel.question,
@@ -94,6 +95,31 @@ const { defineColumn, _ } = useForm()
 
 const OneRowSpan4 = defineColumn(_, 'row-1', { span: 4 })
 const OneRowSpan6 = defineColumn(_, 'row-1', { span: 6 })
+
+const customGroupChange = (v: any) => {
+  if (groupListWithAll.value.find((item: any) => item.value == undefined)) {
+    if (model.markingGroupNumbers.includes(undefined)) {
+      model.markingGroupNumbers = [void 0]
+      changeModelValue('group')(model.markingGroupNumbers)
+    } else {
+      changeModelValue('group')(v)
+    }
+  } else {
+    changeModelValue('group')(v)
+  }
+}
+const transGroupOptions = computed(() => {
+  return (model.markingGroupNumbers || []).includes(undefined)
+    ? (groupListWithAll.value || []).map((item: any) => {
+        item.value != undefined && (item.disabled = true)
+        return item
+      })
+    : groupListWithAll.value.map((item: any) => {
+        item.disabled = false
+        return item
+      })
+})
+
 const items = computed<EpFormItem[]>(() => {
   return [
     OneRowSpan4({
@@ -117,7 +143,7 @@ const items = computed<EpFormItem[]>(() => {
       label: '小组',
       slotType: 'select',
       prop: 'markingGroupNumbers',
-      slot: { options: groupListWithAll.value, onChange: changeModelValue('group'), multiple: true },
+      slot: { options: transGroupOptions.value, onChange: customGroupChange, multiple: true },
     }),
     OneRowSpan6({
       label: '时间',