bug fix

src/hooks/useDayList.ts

@@ -6,7 +6,7 @@ const useDayOptions = (dataModel: any) => {
   const dayList = ref([])
   const today = getTodayByDay()
   watch([() => dataModel.subject, () => dataModel.question], (a: any, b: any) => {
-    if (a && b) {
+    if (dataModel.subject && dataModel.question) {
       useFetch('getDayList')
         .fetch({ subjectCode: dataModel.subject, questionMainNumber: dataModel.question })
         .then((res: any) => {

src/modules/analysis/personnel-statistics/hooks/useStatisticsFilter.ts

@@ -103,6 +103,7 @@ const useStatisticsFilter = () => {
   const TwoRowSpan8 = defineColumn(_, 'row-2', { span: 8 })
   const TwoRowSpan3 = defineColumn(_, 'row-2', { span: 3 })
   const TwoRowSpan4 = defineColumn(_, 'row-2', { span: 4 })
+  const TwoRowSpan2 = defineColumn(_, 'row-2', { span: 1.3 })
 
   const items = computed<EpFormItem[]>(() => [
     OneRowSpan4({
@@ -197,20 +198,22 @@ const useStatisticsFilter = () => {
         ],
       },
     }),
-    TwoRowSpan3({
+    TwoRowSpan2({
       prop: 'expand',
-      label: '展开明细',
+      label: '',
       slotType: 'checkbox',
+      labelWidth: '15px',
       slot: {
         options: [{ label: '按人员展开' }],
       },
     }),
     TwoRowSpan3({
       prop: 'hasGroupLeaderScore',
-      label: '组长给分',
+      label: '',
       slotType: 'checkbox',
+      labelWidth: '40px',
       slot: {
-        options: [{ label: 'true', slotLabel: '包含' }],
+        options: [{ label: 'true', slotLabel: '包含组长给分' }],
       },
     }),
   ])