Bladeren bron

fix: change evaluate

DESKTOP-USV654P\pc 3 maanden geleden
bovenliggende
commit
19670f46ce

+ 1 - 1
Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: change multiple select"
+	git commit --no-verify -m "fix: change evaluate"
 
 checkPre:
 	git checkout pre

+ 1 - 1
src/services/apis/EvaluateResultController.ts

@@ -25,6 +25,6 @@ export async function postEvaluateResultExportQuery(params:API.ResultViewingExce
 export async function getEvaluateResultIndexPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.EvaluateResultIndexPageVo>>
         ({url: '/evaluate/evaluateResult/index-page', params:params},{errorMessageMode:mode});}
 /** 结果查看(分页) GET /evaluate/evaluateResult/result-viewing-page */
-export async function getEvaluateResultResultViewingPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.ResultViewingPageVo>>
+export async function getEvaluateResultResultViewingPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.ResultViewingPageVo[]>
         ({url: '/evaluate/evaluateResult/result-viewing-page', params:params},{errorMessageMode:mode});}
             

+ 7 - 11
src/services/typing.d.ts

@@ -9580,6 +9580,8 @@ orgName?: string;
 semesterName?: string;
 /** 开始时间 */
 startTime?: string;
+/** 状态(-1:未发布,1:进行中,0,暂停) */
+status?: number;
 }
 
 type EvaluateResultSaveDto = {
@@ -13025,14 +13027,6 @@ total?: number;
 totalPage?: number;
 }
 
-type PageOutput<ResultViewingPageVo> = {
-currentPage?: number;
-list?: ResultViewingPageVo[];
-pageSize?: number;
-total?: number;
-totalPage?: number;
-}
-
 type PageOutput<RoomBedCheckRecordPageVo> = {
 currentPage?: number;
 list?: RoomBedCheckRecordPageVo[];
@@ -14645,14 +14639,16 @@ objectIdCN?: string;
 planExecuterNum?: number;
 /** 题目名称 */
 problem?: string;
+/** 状态(2:已评分,0:未评分) */
+status?: number;
 /** 单个被评对象的每一道题的平均得分 */
-sumScore?: number;
+sumScore?: string;
 /** 单个被评对象的综合平均得分 */
-synthesisScore?: number;
+synthesisScore?: string;
 /** 标题名称 */
 topic?: string;
 /** 单个被评对象的每个标题的平均得分 */
-topicScore?: number;
+topicScore?: string;
 }
 
 type RoomBedCheckRecordEchoVo = {

+ 1 - 0
src/views/evaluate/maintenance/index.vue

@@ -19,6 +19,7 @@
               {
                 label: '删除',
                 color: 'error',
+                disabled: record.useStatus === 1,
                 onClick: handleDelete.bind(null, record),
               },
             ]"

+ 1 - 3
src/views/evaluate/result/components/resultView.vue

@@ -35,9 +35,7 @@
     bordered: true,
     immediate: false,
     canResize: true,
-    pagination: {
-      pageSize: 100,
-    },
+    pagination: false,
     afterFetch: (t) => {
       const dataList = sortBy(t, ['objectIdCN', 'topic', 'problem'], ['asc', 'asc', 'asc']);
       let topic = '';