修改评价进度页面的内容展示和接口调用

src/api/evaluationProgressComponent.ts

@@ -2,7 +2,7 @@ import request from '../utils/request.js'
 let teacherPrefix = import.meta.env.VITE_API_TEACHER_PRE 
 
 
-// 获取 评价进度统计表统计图数据接口
+// 获取 【评价进度】 统计表 统计图 数据接口
 export const getEvaluationProgressStatisticsApi = (evaluationId:any) => {
     return request({
         url: `${teacherPrefix}/api/v1/progress/queryCodeProgressData/${evaluationId}`,
@@ -10,24 +10,34 @@ export const getEvaluationProgressStatisticsApi = (evaluationId:any) => {
     })
 }
 
-// 评价进度统计表统计图数据接口
-export const getEvaluationAccountUseStatisticsApi = (evaluationId:any) => {
+// 【评价账号】使用统计表统计数据接口
+export const getEvaluationAccountUseStatisticsApi = (data:any) => {
     return request({
-        url: `${teacherPrefix}/api/v1/progress/queryCodeProgressData/${evaluationId}`,
+        url: `${teacherPrefix}/api/v1/progress/queryPageListData`,
+        method: 'post',
+        data
+    })
+}
+
+// 评价账号使用统计——年级下拉数据接口
+export const reviewAccountGradeListApi = (evaluationId:any) => {
+    return request({
+        url: `${teacherPrefix}/api/v1/progress/queryEvaluationGradeListData/${evaluationId}`,
         method: 'get',
     })
 }
 
 
-// 开启关闭 评价任务 —— 评价进度里边的 —— 关闭后不能答题
-export const openOrCloseQuestionnaireReviewTaskApi = (evaluationId:any) => {
+// 评价账号使用统计数据导出接口
+export const reviewAccountDataExportExcelApi = (data:any) => {
     return request({
-        url: `${teacherPrefix}/api/v1/progress/updateProgressStatus/${evaluationId}`,
-        method: 'get',
+        url: `${teacherPrefix}/api/v1/progress/exportEvaluationData`,
+        method: 'post',
+        data
     })
 }
 
-// 调用评价完成接口
+// 评价进度完成接口
 export const finishReviewProgressApi = (evaluationId:any) => {
     return request({
         url: `${teacherPrefix}/api/v1/progress/finishEvaluationProgress/${evaluationId}`,

src/baseComponents/TableRowStatus.vue

@@ -6,12 +6,15 @@
 </template>  
 
 <script setup lang="ts">
+
+type themeClass = 'not_included_icon' | 'no_release_icon' 
+              | 'normal_icon' | 'abnormal_icon' | 'audit_icon' 
+              | 'yes_release_icon' | 'right_icon' | 'ready_close_icon' | 'need_summary_icon' | string
+
 interface statusItm {
   statusFlag:Number | String,
   title:String,
-  themeClass: 'not_included_icon' | 'no_release_icon' 
-              | 'normal_icon' | 'abnormal_icon' | 'audit_icon' 
-              | 'yes_release_icon' | 'right_icon' | 'ready_close_icon' | 'need_summary_icon'
+  themeClass: themeClass
 }
 
 const props = defineProps({

src/store/index.ts

@@ -12,14 +12,14 @@ import { ElMessage } from 'element-plus'
  
 
 interface HorizontalMenuItem {
-  // 当前活跃的步骤 名称
-  currentActiveStepName:string, 
+  currentActiveStepName:string,   // 当前活跃的步骤 名称
   evaluationManageDetailName:string,  // 评价管理任务名称
   evaluationType:string |number,   // 评价方式  0-线上匿名，1-线下答卷，2-线上导入，3-线上实名
 
   isHeadTeacherInvolved:boolean,    //班主任是否参与评价
   isGenerateAccountByGender:boolean,  // 是否按男女生成评价账号
   isGenerateReviewCode:boolean,  //是否已生成评价码
+
   // 各个步骤的完成状态
   isFinishEvaluationData:boolean,  // 评价数据是否完成
   isFinishTeachingRelationship:boolean, // 授课关系是否完成
@@ -28,9 +28,10 @@ interface HorizontalMenuItem {
   isFinishParameterSetting:boolean,   //参数设置是否完成
   isFinishEvaluationProgress:boolean, //评价进度是否完成
   isFinsihGenerateAnalysis:boolean,  //生成分析是否完成
+  
   isAllowDeleteOrEdit:boolean,  //任务是否允许修改或删除
   isUnifyTemplate:boolean,   //是否统一问卷模板
-  isAllowFillQuestionnaire:boolean   //是否允许填写问卷   —— 评价进度里边 的评价状态开关
+  isTaskOpen:boolean,   //评价任务是否开启
 }
 // 定义 RootState 接口（可扩展）
 interface RootState {
@@ -133,7 +134,7 @@ const store = createStore<RootState>({
           isFinsihGenerateAnalysis:Boolean(res.data.analysisStatus),
           isAllowDeleteOrEdit:!Boolean(res.data.status),   // status  0 可以  1 不可以
           isUnifyTemplate:Boolean(res.data.unifyTemplateStatus),  //unifyTemplateStatus 0 不统一   1 统一
-          isAllowFillQuestionnaire:Boolean(res.data.progressAnswerStatus),  // 0 关闭-不允许答题  1 开启—允许答题
+          isTaskOpen:Boolean(res.data.openStatus),     // 0 关  1 开
         }
         commit('updateEvaluationManageStepData',newData)
       }

src/views/reviewManagement/stepComponent/evaluationProgressComponent/EvaluationProgressComponent.vue

@@ -20,13 +20,12 @@
         </div>
         <div class="page_jg_20"></div>
         <div class="diagram_container">
-            <ReviewProcessBarData v-if="defautTabKey == 'reviewProcessBarData'"
-                :gradeBarData="gradeReviewBarData" :classReviewBarData="classReviewBarData">
-            </ReviewProcessBarData>
-            <ReviewProcessTableData v-if="defautTabKey == 'reviewProcessTableData'" 
-                :gradeTableData="gradeReviewBarData?.totalGradeData" :allClassTableData="classReviewBarData">
-            </ReviewProcessTableData>
-            <ReviewAccountTableData v-if="defautTabKey == 'reviewAccountTableData'"></ReviewAccountTableData>
+            <!-- 评价进度统计图 -->
+            <ReviewProcessBarData v-if="defautTabKey == 'reviewProcessBarData'" />
+            <!-- 评价进度统计表 -->
+            <ReviewProcessTableData v-if="defautTabKey == 'reviewProcessTableData'" />
+            <!-- 评价账号使用统计表 -->
+            <ReviewAccountTableData v-if="defautTabKey == 'reviewAccountTableData'" />
         </div>
     </div>
 </template>
@@ -34,7 +33,7 @@
 
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute,useRouter } from 'vue-router';
 import { useStore } from 'vuex';
 
@@ -46,9 +45,9 @@ import ReviewProcessTableData from './ReviewProcessTableData.vue';
 import ReviewAccountTableData from './ReviewAccountTableData.vue';
 import  {tabList} from './tabSearch'
 
-import { getEvaluationProgressStatisticsApi,
-        openOrCloseQuestionnaireReviewTaskApi,finishReviewProgressApi, 
-    } from '@/api/evaluationProgressComponent.js';
+import {finishReviewProgressApi} from '@/api/evaluationProgressComponent.js';
+import {oppenOrCloseQuestionnaireTaskApi } from '@/api/reviewManagement'
+
 import { ElMessage } from 'element-plus';
 
 const route = useRoute()
@@ -56,7 +55,7 @@ const router = useRouter()
 const store= useStore()
 
 const isOpenReviewTask = computed(()=>{
-    return store.state.evaluationManageStepData.isAllowFillQuestionnaire
+    return store.state.evaluationManageStepData.isTaskOpen
 })  //评价状态 开启或关闭
 
 
@@ -65,25 +64,16 @@ const HandleTabChange = (val)=>{
     defautTabKey.value = val
 }
 
-// 年级评价数据
-const gradeReviewBarData = reactive({
-    datax: [],
-    datay: [],
-    totalGradeData:[]
-})
-
-// 班级评价数据
-const classReviewBarData = reactive({})
-
 
 // 处理评价任务的开启或关闭
 const HandleReviewTaskOpenOrClose = async (val)=>{
-    let res = await openOrCloseQuestionnaireReviewTaskApi(route.query.id)
+    // 这里的接口需要进行修改———— 待完善
+    let res = await oppenOrCloseQuestionnaireTaskApi(route.query.id,val ? 1 : 0)
     if(res?.code == 200){
         ElMessage.success(res?.msg)
-        // 更新 state全局 的 evaluationManageStepData.isAllowFillQuestionnaire
+        // 更新 state全局 的 evaluationManageStepData.isTaskOpen
         store.commit('updateEvaluationManageStepData',{
-            isAllowFillQuestionnaire:(Number(res.data) === 0 ? false : true)
+            isTaskOpen:val
         })
     }
 }
@@ -100,33 +90,6 @@ const FinishReviewProgress = async()=>{
         router.push(`generateAnalysis?id=${route.query.id}`)
     }
 }
-onMounted(async ()=>{
-    let res = await getEvaluationProgressStatisticsApi(route.query.id)
-    if(res?.code == 200){
-        gradeReviewBarData.datax = res.data.map(item=>{
-            return item.name+'-'+item.id
-        })
-        gradeReviewBarData.datay = res.data.map(item=>{
-            return item.progress?.slice(0,-1)
-        })
-        gradeReviewBarData.totalGradeData = res.data
-
-
-        res.data.map(item=>{
-            let classDataX = item.classData.map(item=>{
-                return item.name
-            })
-            let classDataY =  item.classData.map(item=>{
-                return item.progress?.slice(0,-1)
-            })
-            classReviewBarData[item.id] = {
-                datax:classDataX,
-                datay:classDataY,
-                totalClassData:item.classData
-            }
-        })
-    }
-})
 </script>
 
 

src/views/reviewManagement/stepComponent/evaluationProgressComponent/ReviewAccountTableData.vue

@@ -12,19 +12,20 @@
                         @searchChange="HandleSearchChange">
                     </FormSearchGroup>
                  
-                    <el-button class="el-button-refresh">导出Excel</el-button>
+                    <el-button class="el-button-refresh" @click="HandleExportExcel">导出Excel</el-button>
                 </div>
             </div>
         </div>
         <Table :currentPage="currentPage" :pageSize="pageSize" 
             :tableColumns="reviewAccountUseTableColumns" 
             :tableData="tableData"
-            :totalNum="totalNum">
+            :totalNum="totalNum"
+            @paginationChange="HandlePaginationChange">
             <template #num="{row,currentIndex}">
                 {{  currentIndex + pageSize * (currentPage - 1) }}
             </template>
-            <template #status="{row}">
-                <TableRowStatus :statusMsg="statusMsg" :useStatus="row.status">
+            <template #evaluationStatus="{row}">
+                <TableRowStatus :statusMsg="statusMsg" :useStatus="row.evaluationStatus">
                 </TableRowStatus>
             </template>
         </Table>
@@ -42,8 +43,7 @@ import FormSearchGroup from '@/baseComponents/FormSearchGroup.vue';
 import {searchList} from './formSearchGroup'
 import TableRowStatus from '@/baseComponents/TableRowStatus.vue';
 
-
-import { getEvaluationAccountUseStatisticsApi } from '@/api/evaluationProgressComponent.js';
+import { getEvaluationAccountUseStatisticsApi, reviewAccountGradeListApi, reviewAccountDataExportExcelApi } from '@/api/evaluationProgressComponent.js';
 
 const route = useRoute()
 
@@ -51,78 +51,7 @@ const currentPage = ref(1)
 const pageSize = ref(20)
 const totalNum = ref(0)
 
-const tableData = ref([
-    {
-        grade: '七年级',    // 年级
-        className: '1班',   // 班级
-        gender: '男',       // 性别
-        code: '272839201',  // 评价码
-        status: '1',        // 状态 1 已提交  0 未使用
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '1',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '1',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '0',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '0',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '1',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '0',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '1',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '1',
-    },
-    {
-        grade: '七年级',
-        className: '1班',
-        gender: '男',
-        code: '272839201',
-        status: '1',
-    }
-])
+const tableData = ref([])
 
 const statusMsg = ref([
     {
@@ -132,25 +61,108 @@ const statusMsg = ref([
     },
     {
         statusFlag:1,
+        title:'已使用',
+        themeClass:'not_included_icon',  
+    },
+    {
+        statusFlag:2,
         title:'已提交',
         themeClass:'normal_icon', 
     },
+
 ])
 
 
-const searchParams = ref({})
-const HandleSearchChange = (params,key)=>{}
+const searchParams = ref({
+    grade:'',
+    status:''
+})
 
+// 处理查询条件的变更
+const HandleSearchChange = async (params,key)=>{
+    console.log('触发的查询参数___',params)
+    searchParams.value = {
+        ...searchParams.value,
+        ...params
+    }
+    await GetEvaluationAccountUseStatistics()
+}
 
-onMounted(async()=>{
-    let res = await getEvaluationAccountUseStatisticsApi(route.query.id)
+// 处理表格分页
+const HandlePaginationChange = async (params)=>{
+    const { type, val } = params
+    if(type == 'currentPage'){
+        currentPage.value = val
+        await GetEvaluationAccountUseStatistics()
+    }
+}
+
+// 获取评价账号使用统计表的数据
+const GetEvaluationAccountUseStatistics = async ()=>{
+    let params = {
+        evaluationId: route.query.id,
+        evaluationGradeId: searchParams.value.grade == 'all' ? '' : searchParams.value.grade,  //年级id
+        pageNum: currentPage.value,
+        pageSize: pageSize.value,
+        evaluationStatus: searchParams.value.status == 'all' ? '' : searchParams.value.status     // 评价码状态
+    }
+    let res = await getEvaluationAccountUseStatisticsApi(params)
+    if(res?.code == 200){
+        tableData.value = res?.data?.records || []
+        totalNum.value = res?.data?.total
+    }
+}
+
+// 获取年级列表
+const GetGradeList = async ()=> {
+    let res = await  reviewAccountGradeListApi(route.query.id)
     if(res?.code == 200){
+        let gradeOption = res.data.map(item=>{
+            return {
+                label:item.evaluationGradeName,
+                value:item.evaluationGradeId
+            }
+        })
+        // 初始化年级下拉
+        searchList.value = searchList.value.map(item=>{
+            if(item.key == 'grade'){
+                item.options = [
+                    {
+                        label:'全部年级',
+                        value:'all'
+                    },
+                    ...gradeOption
+                ]  
+                item.defaultValue = 'all'
+            }
+            return item
+        })
+    }
+}
 
-        // 待完善————————
 
+// 处理excel导出  —— 待完善
+const HandleExportExcel = async ()=>{
+     let params = {
+        evaluationGenderStatus:null,  //性别 必传，值为空
+        evaluationId: route.query.id,
+        evaluationGradeId: searchParams.value.grade == 'all' ? '' : searchParams.value.grade,  //年级id
+        pageNum: currentPage.value,
+        pageSize: pageSize.value,
+        evaluationStatus: searchParams.value.status == 'all' ? '' : searchParams.value.status     // 评价码状态
     }
+    let res = await reviewAccountDataExportExcelApi(params)
 
+    if(res?.code == 200){
+        // 待完善
 
+    }
+
+}
+
+onMounted(async()=>{
+    await GetGradeList()
+    await GetEvaluationAccountUseStatistics()
 })
 </script>
 

src/views/reviewManagement/stepComponent/evaluationProgressComponent/ReviewProcessBarData.vue

@@ -3,12 +3,9 @@
     <div>
         <div class="bar_container">
             <div class="bar_title">年级评价进度</div>
-
-            <MultipleBarCharts :datax="gradeBarData?.datax" :height="375"
-                :datay="gradeBarData?.datay" :tooltipFormater="tooltipFormater"
-                @HandleChartClick="HandleChartClick" :isClick="true"
-            >
-            </MultipleBarCharts>
+            <MultipleBarCharts :datax="gradeReviewBarData?.datax" :height="375" unit="人"
+                :datay="gradeReviewBarData?.datay" :tooltipFormater="tooltipFormater"
+                @HandleChartClick="HandleChartClick" :isClick="true" />
         </div>
 
         <div class="page_jg_20"></div>
@@ -18,46 +15,38 @@
                 <span class="parent_title">年级评价进度 / </span>
                 <span>{{currentClickGrade}}</span>
             </div>
-            <MultipleBarCharts :datax="classReviewAccountData?.datax" :height="375"
-                :datay="classReviewAccountData?.datay" :tooltipFormater="tooltipFormater">
-            </MultipleBarCharts>
+            <MultipleBarCharts :datax="classReviewAccountData?.datax" :height="375" unit="人"
+                :datay="classReviewAccountData?.datay" :tooltipFormater="tooltipFormater" />
         </div>
     </div>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref, watch } from 'vue';
+import { computed, onMounted, reactive, ref } from 'vue';
+import { useRoute } from 'vue-router';
 
 import MultipleBarCharts from '@/baseComponents/MultipleBarCharts.vue';
 
-interface BarData {
-    datax:Array<any>
-    datay:Array<any>
-}
+import { getEvaluationProgressStatisticsApi} from '@/api/evaluationProgressComponent.js';
 
+const route = useRoute()
 
-const props = defineProps({
-    // 年级评价进度柱状图
-    gradeBarData:{
-        type:Object as ()=>BarData,
-    },
-    classReviewBarData:{
-        type:Object,
-    }
-})
 // 年级评价进度数据
 const currentClickGrade = ref('')
 
-
+const gradeReviewBarData = reactive({
+    datax:[],
+    datay:[]
+})
+const classReviewBarData = reactive<Record<string,any>>({})
 
 
 // 班级评价数据
 // 班级评价进度柱状图
 const classReviewAccountData = computed(()=>{
     let gradeId = currentClickGrade.value.split('-')[1]
-
-    console.log('班级评价数据列表----',props.classReviewBarData?.[gradeId])
-    return props.classReviewBarData?.[gradeId]
+    console.log('班级评价数据列表----',classReviewBarData?.[gradeId])
+    return classReviewBarData?.[gradeId]
 })
 
 const tooltipFormater = (params)=>{
@@ -65,16 +54,43 @@ const tooltipFormater = (params)=>{
     return name + '<br/>' + marker + '评价进度' + `<span style=\"margin-left:10px;\">${value}</span>` ;
 }
 
+// 处理柱状图的点击
 const HandleChartClick = (index,xName)=>{
     console.log('当前点击的内容',index,xName)
     currentClickGrade.value = xName
 }
 
-watch([()=>props.gradeBarData,()=>props.classReviewBarData],([newGradeVal,newClassVal])=>{
+// 获取评价进度统计图数据
+const GetReviewProcessBarData = async ()=>{
+    let res = await getEvaluationProgressStatisticsApi(route.query.id)
+    if(res?.code == 200){
+        gradeReviewBarData.datax = res.data.map(item=>{
+            return item.name+'-'+item.id
+        }) || []
+        gradeReviewBarData.datay = res.data.map(item=>{
+            return item.overCodeCount
+        }) || []
+
+        res.data.map(item=>{
+            let classDataX = item.classData.map(item=>{
+                return item.name
+            }) || []
+            let classDataY =  item.classData.map(item=>{
+                return item.overCodeCount
+            }) || []
+            classReviewBarData[item.id] = {
+                datax:classDataX,
+                datay:classDataY,
+                totalClassData:item.classData
+            }
+        })
+    }
+}
 
-    console.log('当前传递的年级数据列表',newGradeVal,'当前传递的班级数据列表',newClassVal)
+onMounted( async()=>{
+    await GetReviewProcessBarData()
+})
 
-},{immediate:true,deep:true})
 </script>
 
 

src/views/reviewManagement/stepComponent/evaluationProgressComponent/ReviewProcessTableData.vue

@@ -12,10 +12,10 @@
                     </div>
                 </div>
             </div>
-            <Table  :currentPage="1" 
-                :pageSize="20" :tableColumns="reviewProcessTableColumns" 
-                :tableData="gradeTableData"
-                :totalNum="0">
+            <Table :hidePagination="true" 
+                :tableColumns="reviewProcessTableColumns" 
+                :tableData="gradeTableData" >
+                <template #num="{currentIndex}">{{ currentIndex }}</template>
             </Table>
         </div>
         
@@ -41,10 +41,10 @@
                     </div>
                 </div>
             </div>
-            <Table  :currentPage="1" 
-                :pageSize="20" :tableColumns="reviewProcessTableColumns" 
-                :tableData="classTableData"
-                :totalNum="0">
+            <Table :hidePagination="true"  
+                :tableColumns="reviewProcessTableColumns" 
+                :tableData="classTableData" >
+                <template #num="{currentIndex}">{{ currentIndex }}</template>
             </Table>
         </div>
     </div>
@@ -52,21 +52,21 @@
 
 <script setup lang="ts">
 import Table from '@/baseComponents/Table.vue';
-import {  ref, watch } from 'vue';
+import {  ref, onMounted, reactive } from 'vue';
+import { useRoute } from 'vue-router';
 
+import { getEvaluationProgressStatisticsApi } from '@/api/evaluationProgressComponent.js';
 import {reviewProcessTableColumns} from  './table'
 
 
-const props = defineProps({
-    gradeTableData:{
-        type:Array,
-        default:[]
-    },
-    allClassTableData:{
-        type:Object,
-    }
+const route = useRoute()
+
+const gradeTableData = ref([])
+
+// 不同年级下的  班级评价数据列表 ——
+const classReviewBarData = reactive<Record<string,any>>({})
+
 
-})
 // 年级评价进度数据
 const gradeSearchId = ref('')  //默认的年级筛选项
 const gradeOptionList = ref([])  //年级下拉项
@@ -77,18 +77,32 @@ const handleSelectChange = (val) =>{
 
 }
 
-watch(()=>props?.gradeTableData,(newVal)=>{
-
-    console.log('全部的班级数据---props.allClassTableData',props.allClassTableData)
-    gradeOptionList.value = newVal.map(item=>{
-        return {
-            label:item.name,
-            value:item.id
-        }
-    })
-    gradeSearchId.value = gradeOptionList.value[0]?.value
-    classTableData.value = props.allClassTableData?.[gradeSearchId.value]?.totalClassData
-},{immediate:true,deep:true})
+// 获取评价进度统计表数据
+const GetReviewProcessTableData = async () =>{
+    let res = await getEvaluationProgressStatisticsApi(route.query.id)
+    if(res?.code == 200){
+        gradeTableData.value = res.data
+
+        gradeOptionList.value = res.data.map(item=>{
+            return {
+                label:item.name,
+                value:item.id
+            }
+        })
+        gradeSearchId.value = gradeOptionList.value[0]?.value
+
+        res.data.map(item=>{
+            classReviewBarData[item.id] = item.classData
+        })
+        classTableData.value = classReviewBarData?.[gradeSearchId.value]
+    }
+}
+
+onMounted(async ()=>{
+    await GetReviewProcessTableData()
+})
+
+
 </script>
 
 

src/views/reviewManagement/stepComponent/evaluationProgressComponent/formSearchGroup.ts

@@ -6,25 +6,8 @@ export const searchList = ref([
         key:'grade',
         type:'select',
         placeholder:'请选择',
-        defaultValue:'1',
-        options:[
-            {
-                label:'一年级',
-                value:'1'
-            },
-            {
-                label:'二年级',
-                value:'2'
-            },
-            {
-                label:'三年级',
-                value:'3'
-            },
-            {
-                label:'四年级',
-                value:'4'
-            },
-        ] 
+        defaultValue:'',
+        options:[] 
     },
     {
         key:'status',
@@ -38,10 +21,14 @@ export const searchList = ref([
             },
             {
                 label:'已提交',
+                value:'2'
+            },
+            {
+                label:'已使用',
                 value:'1'
             },
             {
-                label:'未提交',
+                label:'未使用',
                 value:'0'
             },
         ] 

src/views/reviewManagement/stepComponent/evaluationProgressComponent/table.ts

@@ -85,7 +85,7 @@ export const reviewAccountUseTableColumns = ref([
         hidden: false,
     },
     {
-        name: 'grade',     
+        name: 'evaluationGradeName',     
         label: '年级',
         width: '',
         fixed: '',
@@ -95,7 +95,7 @@ export const reviewAccountUseTableColumns = ref([
         hidden: false,
     },
     {
-        name: 'className',  
+        name: 'evaluationClassName',  
         label: '班级',
         width: '',
         fixed: '',
@@ -115,7 +115,7 @@ export const reviewAccountUseTableColumns = ref([
         hidden: false,
     },
     {
-        name: 'code',       
+        name: 'evaluationCode',       
         label: '评价码',
         width: '120',
         fixed: '',
@@ -125,7 +125,7 @@ export const reviewAccountUseTableColumns = ref([
         hidden: false,
     },
     {
-        name: 'status',     
+        name: 'evaluationStatus',       // 评价状态，0-未使用，1-已使用，2-已提交
         label: '状态',
         width: '',
         fixed: '',