Prechádzať zdrojové kódy

bug fix: 1.雷同卷筛选全部显示与实际不符,筛选是或者否都会显示结果;2.样卷重新给分以后 也需要刷新页面分值;3.间隔分为0.5时,悬浮窗口显示有误

Liu.Yang5 2 rokov pred
rodič
commit
dbf3e72128

+ 1 - 1
src/api/api-types/marking.d.ts

@@ -286,7 +286,7 @@ export namespace Marking {
   type GetSimilarPaperList = BaseDefine<
     MultipleQuery<{
       mainNumber?: number
-      status: 'INITIAL' | 'NOT_SAME' | 'SAME'
+      status: 'INITIAL' | 'NOT_SAME' | 'SAME' | '' | null
     }>,
     MultipleResult<SamePaperListItem>
   >

+ 2 - 1
src/components/shared/ScoringPanel.vue

@@ -4,7 +4,7 @@
     draggable
     title="键盘给分"
     modal-class="no-mask"
-    :width="useVW(490)"
+    :width="useVW(550)"
     :modal="false"
     @close="onToggleClick"
   >
@@ -146,5 +146,6 @@ const onToggleClick = () => {
 <style scoped lang="scss">
 .modal-box {
   max-height: 50vh;
+  min-height: 8vw;
 }
 </style>

+ 3 - 3
src/components/shared/ScoringPanelItem.vue

@@ -261,9 +261,9 @@ const onToggleClick = () => {
     font-size: $BaseFont;
 
     .score-span {
-      width: 32px;
-      height: 32px;
-      line-height: 32px;
+      width: 46px;
+      height: 46px;
+      line-height: 46px;
       text-align: center;
       border-radius: 4px;
       border: 1px solid #e5e5e5;

+ 2 - 1
src/components/shared/ScoringPanelWithConfirm.vue

@@ -77,7 +77,8 @@ watch(submitModalVisible, () => {
 
 /** 总分 */
 const totalScore = computed(() => {
-  return add(...modelScore.value)
+  let value = modelScore.value[0] as any
+  return value === '' || value === undefined ? add(0) : add(...modelScore.value)
 })
 
 const questionInfo = ref<ExtractApiResponse<'getQuestionStruct'>>()

+ 3 - 2
src/modules/marking/similar/index.vue

@@ -78,7 +78,7 @@ const onOperationClick: OperationClick = ({ type, value }) => {
 
 const formModel = reactive<ExtractApiParams<'getSimilarPaperList'>>({
   mainNumber: void 0,
-  status: 'INITIAL',
+  status: '',
   pageNumber: 1,
   pageSize: 9999999,
 })
@@ -109,7 +109,7 @@ const formItems = computed<EpFormItem[]>(() => [
     slotType: 'select',
     slot: {
       options: [
-        { label: '全部', value: 'INITIAL' },
+        { label: '全部', value: '' },
         { label: '是', value: 'SAME' },
         { label: '否', value: 'NOT_SAME' },
       ],
@@ -146,6 +146,7 @@ const {
 } = useTableCheck(similarPaperList)
 
 const onSearch = async () => {
+  formModel.status === '' && (formModel.status = null)
   getSimilarPaperList(formModel)
 }