bug fix

src/assets/styles/app.scss

@@ -141,7 +141,7 @@ img {
   }
   .question-info{
     top:10px;
-    left:25px;
+    left:58px;
     z-index:5;
     font-size:14px;
     font-weight:bold;

src/assets/styles/element/custom.scss

@@ -367,4 +367,7 @@ body {
 }
 // .mark-container .mark-content .mark-content-paper img{
 //   max-width: none !important;
-// }
+// }
+.ant-picker-large .ant-picker-input>input{
+  font-size:14px !important;
+}

src/hooks/useOptions.ts

@@ -221,13 +221,19 @@ const useOptions = (
       // resetGroupList()
       // changeModelValue('group')(void 0)
       getQuestionGroupList({ subjectCode: dataModel.subject, mainNumber: dataModel.question }).then((res: any) => {
+        console.log(1)
         changeModelValue('group')(
           multGroup && showAllLabel
-            ? groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
-              ? // ? [void 0]
-                []
+            ? // ? groupList.value?.length && (isAdmin.value || isChief.value || isExpert.value || isLeader.value)
+              //   ? // ? [void 0]
+              //     []
+              //   : []
+              // : void 0
+
+              userInfo.value?.markingGroupNumber
+              ? [userInfo.value?.markingGroupNumber]
               : []
-            : void 0
+            : userInfo.value?.markingGroupNumber
         )
       })
     }
@@ -285,6 +291,7 @@ const useOptions = (
       [groupList, userInfo, isAdmin, isChief],
       () => {
         if (userInfo.value?.markingGroupNumber && !dataModel.question && !(isAdmin.value || isChief.value)) {
+          console.log(2)
           changeModelValue('group')(
             multGroup
               ? userInfo.value?.markingGroupNumber

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

@@ -63,7 +63,7 @@ const useUserManageFilter = () => {
       slot: {
         placeholder: '选择科目',
         // disabled: mainStore.loginInfo?.role === 'CHIEF',
-        disabled: !isExpert.value && !isAdmin,
+        disabled: !isExpert.value && !isAdmin.value,
         options: subjectList.value,
         onChange: changeModelValue('subject'),
         clearable: true,

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

@@ -18,6 +18,7 @@ const useFormFilter = () => {
     onOptionInit,
     isExpert,
     isLeader,
+    isDeputy,
   } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
   const ROLE_OPTION = ref<any[]>([])
   // useFetch('getRoleList')
@@ -136,6 +137,7 @@ const useFormFilter = () => {
         onChange: changeModelValue('group'),
         multiple: true,
         collapseTags: model.markingGroupNumbers?.includes(undefined),
+        disabled: isDeputy.value,
       },
     }),
     OneRowSpan5({

src/modules/analysis/marking-progress/components/GroupProgress.vue

@@ -48,6 +48,7 @@ const {
   onOptionInit,
   isExpert,
   isLeader,
+  isDeputy,
 } = useOptions(['subject', 'question', 'group'])
 
 const model = reactive<ExtractApiParams<'getMarkProgressByMarker'>>({
@@ -110,7 +111,7 @@ const items = computed<EpFormItem[]>(() => [
     label: '小组',
     slotType: 'select',
     prop: 'markingGroupNumber',
-    slot: { options: groupListWithAll.value, onChange: changeModelValue('group') },
+    slot: { options: groupListWithAll.value, onChange: changeModelValue('group'), disabled: isDeputy.value },
   }),
   OneRow8({ slotName: 'operation' }),
 ])

src/modules/analysis/monitoring/index.vue

@@ -102,6 +102,7 @@ const {
   onOptionInit,
   isExpert,
   isLeader,
+  isDeputy,
 } = useOptions(['subject', 'question', 'group'])
 
 const model = reactive<
@@ -164,10 +165,11 @@ const formItems = computed<EpFormItem[]>(() => [
   {
     label: '小组',
     slotType: 'select',
-    prop: 'markingGroupNumbers',
+    prop: 'markingGroupNumber',
     slot: {
       options: groupListWithAll.value,
       onChange: changeModelValue('group'),
+      disabled: isDeputy.value,
     },
   },
   {
@@ -374,8 +376,8 @@ const onRefresh = () => {
   day < 10 && (day = '0' + day)
   if (fetchModel.subjectCode && fetchModel.questionMainNumber) {
     fetch({
-      ...omit(fetchModel, ['refresh', 'markingGroupNumbers']),
-      markingGroupNumbers: [fetchModel.markingGroupNumbers],
+      ...omit(fetchModel, ['refresh', 'markingGroupNumbers', 'markingGroupNumber']),
+      markingGroupNumbers: [fetchModel.markingGroupNumber].filter(Boolean),
       // startTime: `${year}${month}${day}000000`,
       // endTime: `${year}${month}${day}235959`,
       curDay: `${year}${month}${day}`,

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

@@ -14,6 +14,7 @@ const useCompareFilter = () => {
     onOptionInit,
     isExpert,
     isLeader,
+    isDeputy,
   } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
   const curDayRange = getCurDayRange()
   const model = reactive({
@@ -111,6 +112,7 @@ const useCompareFilter = () => {
         onChange: changeModelValue('group'),
         multiple: true,
         collapseTags: model.markingGroupNumber?.includes(undefined),
+        disabled: isDeputy.value,
       },
     }),
 

src/modules/analysis/statistics/index.vue

@@ -65,6 +65,7 @@ const {
   onOptionInit,
   isExpert,
   isLeader,
+  isDeputy,
 } = useOptions(['subject', 'question', 'group'])
 
 const model = reactive<
@@ -136,6 +137,7 @@ const formItems = computed<EpFormItem[]>(() => [
     slot: {
       options: groupListWithAll.value,
       onChange: changeModelValue('group'),
+      disabled: isDeputy.value,
     },
   }),
   // OneRowSpan6({

src/modules/marking/inquiry-result/index.vue

@@ -9,7 +9,7 @@
       <!-- <el-button :disabled="!current?.taskId" class="m-l-base" size="small" type="primary" @click="onEditScore"
         >修改给分</el-button
       > -->
-      <el-button :disabled="!current?.taskId" class="m-l-base" size="small" type="primary" @click="onSendBack"
+      <el-button :disabled="!current?.taskId" class="m-l-base m-r-auto" size="small" type="primary" @click="onSendBack"
         >打回</el-button
       >
       <!-- <el-button

src/modules/marking/inquiry/index.vue

@@ -94,6 +94,7 @@ const {
   changeModelValue,
   isExpert,
   isLeader,
+  isDeputy,
   getMainQuestionList,
   getQuestionGroupList,
 } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
@@ -327,6 +328,7 @@ const items = computed<EpFormItem[]>(() => [
       onChange: changeModelValue('group'),
       multiple: true,
       collapseTags: model.markingGroupNumbers?.includes(undefined),
+      disabled: isDeputy.value,
     },
   }),
   ThreeRow({

src/modules/marking/training-record/index.vue

@@ -18,9 +18,9 @@
           <!-- <right-button class="next-button" @click="checkNext" /> -->
           <div class="flex-1 p-base scroll-auto mark-content-paper img-wrap relative">
             <img :src="dataUrl" alt="" class="paper-img" :style="{ 'background-color': frontColor }" />
-            <p v-if="current" class="absolute question-info">
+            <!-- <p v-if="current" class="absolute question-info">
               {{ current.mainNumber + '-' + current.mainName }}
-            </p>
+            </p> -->
             <p v-if="current" class="absolute mark-score">{{ current?.markScore }}</p>
           </div>
         </pane>

src/modules/monitor/training-monitoring/hooks/useFormFilter.ts

@@ -17,6 +17,7 @@ const useFormFilter = () => {
     changeModelValue,
     isExpert,
     isLeader,
+    isDeputy,
   } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
 
   const { formRef, elFormRef, defineColumn, _ } = useForm()
@@ -180,6 +181,7 @@ const useFormFilter = () => {
           onChange: changeModelValue('group'),
           multiple: true,
           collapseTags: model.markingGroupNumbers?.includes(undefined),
+          disabled: isDeputy.value,
         },
       }),
 

src/modules/quality/ending-check/components/EndCheck.vue

@@ -267,6 +267,7 @@ const {
   changeModelValue,
   isExpert,
   isLeader,
+  isDeputy,
 } = useOptions(['subject', 'question', 'group'])
 
 /** 搜索 */
@@ -334,6 +335,7 @@ const items = computed<EpFormItem[]>(() => [
     slot: {
       options: groupListWithAll.value,
       onChange: changeModelValue('group'),
+      disabled: isDeputy.value,
     },
   }),
   btnRow({

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

@@ -76,6 +76,7 @@ const {
   changeModelValue,
   isExpert,
   isLeader,
+  isDeputy,
 } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
 
 const model = reactive<FormModel & { time: string }>({
@@ -149,6 +150,7 @@ const items = computed<EpFormItem[]>(() => {
         onChange: changeModelValue('group'),
         multiple: true,
         collapseTags: model.markingGroupNumbers?.includes(undefined),
+        disabled: isDeputy.value,
       },
     }),
     OneRowSpan6({