Преглед на файлове

修改全局数据管理方式

lm преди 1 месец
родител
ревизия
6b18b1f4d5

+ 29 - 22
src/components/ReviewManagementDetailSideBar.vue

@@ -2,7 +2,7 @@
     <!-- 左侧导航栏 -->
     <div class="left_nav">
       <div class="nav_header">
-        {{ evaluationManageData.evaluationManageDetailName }}
+        {{ store.state.evaluationManageStepData.evaluationManageDetailName }}
       </div>
       
       <div class="back_btn">
@@ -39,15 +39,14 @@
 
 
 <script setup lang="ts">
-import { onMounted, ref,inject, computed } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
+import { useStore } from 'vuex';
 import backIcon from '@/assets/icon/left_back_arrow_.png'
 import router from '@/router';
 
-const evaluationManageData = inject('commonStepData')
-// evaluationManageData.evaluationType   // 评价方式  0-线上匿名,1-线下答卷,2-线上导入,3-线上实名
-
 const route = useRoute()
+const store = useStore()  //store.state.evaluationManageStepData.evaluationType,   // 评价方式  0-线上匿名,1-线下答卷,2-线上导入,3-线上实名
 
 const currentActiveStep = ref(1)
 const stepMsgs = computed(()=>[
@@ -58,7 +57,8 @@ const stepMsgs = computed(()=>[
     desc:'评价覆盖的年级、班级、对应科目基础信息',
     route:'evaluationData',
     show:true,
-    isFinish:evaluationManageData.isFinishEvaluationData,
+    isFinish:store.state.evaluationManageStepData.isFinishEvaluationData,
+
   },
   {
     stepNum:2,
@@ -67,7 +67,8 @@ const stepMsgs = computed(()=>[
     desc:'年级、班级、科目匹配对应的任课教师',
     route:'teachingRelationship',
     show:true,
-    isFinish:evaluationManageData.isFinishTeachingRelationship,
+    isFinish:store.state.evaluationManageStepData.isFinishTeachingRelationship,
+
   },
 
 // ==================================
@@ -78,7 +79,7 @@ const stepMsgs = computed(()=>[
     title: '编号对应',
     desc: '绑定年级、班级与专属编号',
     route: 'numberMapping',
-    show:evaluationManageData.evaluationType === 1 ? true : false,
+    show:store.state.evaluationManageStepData.evaluationType === 1 ? true : false,
     isFinish:null,
   },
   {
@@ -87,7 +88,7 @@ const stepMsgs = computed(()=>[
     title: '模板设置',
     desc: '框选问卷各答题区域完成线上模板配置',
     route: 'templateSetting',
-    show:evaluationManageData.evaluationType === 1 ? true : false,
+    show:store.state.evaluationManageStepData.evaluationType === 1 ? true : false,
     isFinish:null,
   },
   {
@@ -96,7 +97,7 @@ const stepMsgs = computed(()=>[
       title: '分数设置',
       desc: '设置每道题及各个选项对应得分',
       route: 'scoreSetting',
-      show:evaluationManageData.evaluationType === 1 ? true : false,
+      show:store.state.evaluationManageStepData.evaluationType === 1 ? true : false,
       isFinish:null,
   },
   {
@@ -105,7 +106,7 @@ const stepMsgs = computed(()=>[
       title: '扫描问卷',
       desc: '批量扫描学生纸质问卷,处理异常',
       route: 'scanQuestionnaire',
-      show:evaluationManageData.evaluationType === 1 ? true : false,
+      show:store.state.evaluationManageStepData.evaluationType === 1 ? true : false,
       isFinish:null,
   },
   // =================================
@@ -118,8 +119,9 @@ const stepMsgs = computed(()=>[
     title:'问卷模版',
     desc:'为不同科目选定适配的评价问卷模板',
     route:'questionnaireTemplate',
-    show:evaluationManageData.evaluationType === 0 ? true : false,
-    isFinish:evaluationManageData.isFinishQuestionnaireTemplate,
+    show:store.state.evaluationManageStepData.evaluationType === 0 ? true : false,
+    isFinish:store.state.evaluationManageStepData.isFinishQuestionnaireTemplate,
+
   },
   {
     stepNum:4,
@@ -127,23 +129,27 @@ const stepMsgs = computed(()=>[
     title:'评价账号',
     desc:'批量生成对应数量的学生评价登录账号',
     route:'reviewAccount',
-    show:evaluationManageData.evaluationType === 0 ? true : false,
+    show:store.state.evaluationManageStepData.evaluationType === 0 ? true : false,
     childrenRoute:[
       'generateReviewCode',
     ],
-    isFinish:evaluationManageData.isFinishReviewAccount,
-    isGenerateReviewCode:evaluationManageData.isGenerateReviewCode,  //是否已生成评价码
+    isFinish:store.state.evaluationManageStepData.isFinishReviewAccount,
+
+
+    
+    isGenerateReviewCode:store.state.evaluationManageStepData.isGenerateReviewCode,  //是否已生成评价码
   },
   // ^^^^^ =========================
 
+  
   {
-    stepNum: evaluationManageData.evaluationType === 1  ? 7 : (evaluationManageData.evaluationType === 0 ?  5 : '') ,  // 线上匿名 5   线下答卷 7
+    stepNum: store.state.evaluationManageStepData.evaluationType === 1  ? 7 : (store.state.evaluationManageStepData.evaluationType === 0 ?  5 : '') ,  // 线上匿名 5   线下答卷 7
     stepName:'parameterSetting',
     title:'参数设置',
     desc:'统一配置本次评价任务的评分分值规则',
     route:'parameterSetting',
     show:true,
-    isFinish:evaluationManageData.isFinishParameterSetting,
+    isFinish:store.state.evaluationManageStepData.isFinishParameterSetting,
   },
   {
     // 线上匿名的内容
@@ -152,18 +158,19 @@ const stepMsgs = computed(()=>[
     title:'评价进度',
     desc:'实时查看学生完成评价的填报进度',
     route:'evaluationProgress',
-    show:evaluationManageData.evaluationType === 0 ? true : false,
-    isFinish:evaluationManageData.isFinishEvaluationProgress,
+    show:store.state.evaluationManageStepData.evaluationType === 0 ? true : false,
+    isFinish:store.state.evaluationManageStepData.isFinishEvaluationProgress,
+
   },
 
   {
-    stepNum:evaluationManageData.evaluationType === 1 ? 8 : (evaluationManageData.evaluationType === 0 ? 7 : '' ),   // 线上匿名 7   线下答卷 8
+    stepNum:store.state.evaluationManageStepData.evaluationType === 1 ? 8 : (store.state.evaluationManageStepData.evaluationType === 0 ? 7 : '' ),   // 线上匿名 7   线下答卷 8
     stepName:'generateAnalysis',
     title:'生成分析',
     desc:'汇总数据并生成、发布评价分析报告',
     route:'generateAnalysis',
     show:true,
-    isFinish:evaluationManageData.isFinsihGenerateAnalysis,
+    isFinish:store.state.evaluationManageStepData.isFinsihGenerateAnalysis,
 
   },
 ])

+ 1 - 4
src/layout/components/AppMain.vue

@@ -29,7 +29,7 @@ export default {
 </script>
 
 <script setup>
-  import { provide, reactive } from 'vue';
+  import {  reactive } from 'vue';
 
   // 评价管理 的 步骤公共信息 下发
   const evaluationManageStepData  = reactive({
@@ -50,9 +50,6 @@ export default {
     isFinishEvaluationProgress:null, //评价进度是否完成
     isFinsihGenerateAnalysis:null,  //生成分析是否完成
   })
-  provide('commonStepData', evaluationManageStepData);
-
-
 
 </script>
 

+ 66 - 2
src/store/index.ts

@@ -1,13 +1,44 @@
+import { useRoute } from 'vue-router'
+
 import { createStore } from 'vuex'
+
 // import { ActionContext } from 'vuex'
 import type { App } from 'vue'
 
+import {
+    getEvaluationTaskDetailApi,
+} from '@/api/evaluationDataComponent'
+import { ElMessage } from 'element-plus'
+ 
+
+interface HorizontalMenuItem {
+  evaluationManageDetailName:string,  // 评价管理任务名称
+  evaluationType:string |number,   // 评价方式  0-线上匿名,1-线下答卷,2-线上导入,3-线上实名
 
+  isHeadTeacherInvolved:boolean,    //班主任是否参与评价
+  isGenerateAccountByGender:boolean,  // 是否按男女生成评价账号
+  isGenerateReviewCode:boolean,  //是否已生成评价码
+  // 各个步骤的完成状态
+  isFinishEvaluationData:boolean,  // 评价数据是否完成
+  isFinishTeachingRelationship:boolean, // 授课关系是否完成
+  isFinishQuestionnaireTemplate:boolean,  //问卷模板是否完成
+  isFinishReviewAccount:boolean,  //评价账号是否完成
+  isFinishParameterSetting:boolean,   //参数设置是否完成
+  isFinishEvaluationProgress:boolean, //评价进度是否完成
+  isFinsihGenerateAnalysis:boolean,  //生成分析是否完成
+
+}
 // 定义 RootState 接口(可扩展)
 interface RootState {
-  count: number
+  count: number,
+  horizontalMenuItems:any[]
+  evaluationManageStepData:HorizontalMenuItem
+
 }
 
+const route = useRoute()
+
+
 // type StoreActionContext = ActionContext<RootState, RootState>
 // 创建 store 实例
 const store = createStore<RootState>({
@@ -39,18 +70,50 @@ const store = createStore<RootState>({
         route:`/main/personalCenter`,
         childrenRoute:[]
       },
-    ]
+    ],
+    evaluationManageStepData:{}  //评价管理详情 全局数据
 
   }),
   mutations: {
     increment(state: RootState) {
       state.count++
+    },
+    updateEvaluationManageStepData(state,newData){  //更新评价管理详情的数据
+      state.evaluationManageStepData = {
+        ...state.evaluationManageStepData,
+        ...newData
+      }
     }
   },
   actions: {
     increment({ commit }) {
       commit('increment')
     },
+    async updateEvaluationManageStepData({commit},evaluationManagementId){
+      console.log('路由参数',evaluationManagementId)
+      if(!evaluationManagementId){
+        ElMessage.warning('请传参')
+        return
+      }
+      let res = await getEvaluationTaskDetailApi(evaluationManagementId)
+      if(res?.code === 200){
+        let newData = {
+          evaluationManageDetailName:res.data.evaluationName,
+          evaluationType:res.data.evaluationType,
+          isHeadTeacherInvolved:Boolean(res.data.classMasterStatus),
+          isGenerateAccountByGender:Boolean(res.data.genderStatus),
+          isGenerateReviewCode:Boolean(res.data.evaluationCodeStatus),
+          isFinishEvaluationData:Boolean(res.data.evaluationDataStatus),
+          isFinishTeachingRelationship:Boolean(res.data.teachingRelationStatus),
+          isFinishQuestionnaireTemplate:Boolean(res.data.assessmentTemplateStatus),
+          isFinishReviewAccount:Boolean(res.data.evaluationAccountStatus),
+          isFinishParameterSetting:Boolean(res.data.paramSetupStatus),
+          isFinishEvaluationProgress:Boolean(res.data.evaluationProgressStatus),
+          isFinsihGenerateAnalysis:Boolean(res.data.analysisStatus),
+        }
+        commit('updateEvaluationManageStepData',newData)
+      }
+    }
   },
   getters: {
     count: (state: RootState) => state.count,
@@ -59,6 +122,7 @@ const store = createStore<RootState>({
           return item
       })
     },
+    getEvaluationManageStepData:(state)=>state.evaluationManageStepData
   }
 })
 

+ 7 - 26
src/views/reviewManagement/ReviewManagementDetail.vue

@@ -7,11 +7,12 @@
 
 <script setup lang="ts">
 import { useRoute,useRouter } from 'vue-router';
-import { computed, onMounted,inject } from 'vue';
-import {
-    getEvaluationTaskDetailApi,
-} from '@/api/evaluationDataComponent'
- 
+import { computed, onMounted } from 'vue';
+import { useStore } from 'vuex'
+
+const store = useStore()
+
+
 import EvaluationDataComponent from './stepComponent/evaluationDataComponent/EvaluationDataComponent.vue';
 import TeachingRelationshipComponent from './stepComponent/teachingRelationshipComponent/TeachingRelationshipComponent.vue';
 import QuestionnaireTemplateComponent from './stepComponent/questionnaireTemplateComponent/QuestionnaireTemplateComponent.vue';
@@ -21,7 +22,6 @@ import ParameterSettingComponent from './stepComponent/parameterSettingComponent
 import EvaluationProgressComponent from './stepComponent/evaluationProgressComponent/EvaluationProgressComponent.vue';
 import GenerateAnalysisComponent from './stepComponent/generateAnalysisComponent/GenerateAnalysisComponent.vue';
 
-const evaluationManageData = inject('commonStepData');
 
 
 const route = useRoute()
@@ -60,27 +60,8 @@ const curentComponent = computed(()=>{
   }
 })
 
-// 查询评价管理 任务详情
-const GetEvaluationTaskDetail = async ()=>{
-  let res = await getEvaluationTaskDetailApi(route.query.id)
-    if(res?.code === 200){
-      evaluationManageData.evaluationManageDetailName = res.data.evaluationName
-      evaluationManageData.evaluationType = res.data.evaluationType
-      evaluationManageData.isHeadTeacherInvolved = Boolean(res.data.classMasterStatus)
-      evaluationManageData.isGenerateAccountByGender = Boolean(res.data.genderStatus)
-      evaluationManageData.isGenerateReviewCode = Boolean(res.data.evaluationCodeStatus)
-      evaluationManageData.isFinishEvaluationData = Boolean(res.data.evaluationDataStatus)
-      evaluationManageData.isFinishTeachingRelationship = Boolean(res.data.teachingRelationStatus)
-      evaluationManageData.isFinishQuestionnaireTemplate = Boolean(res.data.assessmentTemplateStatus)
-      evaluationManageData.isFinishReviewAccount = Boolean(res.data.evaluationAccountStatus)
-      evaluationManageData.isFinishParameterSetting = Boolean(res.data.paramSetupStatus)
-      evaluationManageData.isFinishEvaluationProgress = Boolean(res.data.evaluationProgressStatus)
-      evaluationManageData.isFinsihGenerateAnalysis = Boolean(res.data.analysisStatus)
-    }
-}
-
 onMounted( async ()=>{
-  await GetEvaluationTaskDetail()
+  await store.dispatch('updateEvaluationManageStepData',route.query.id)
 })
 </script>
 

+ 33 - 26
src/views/reviewManagement/stepComponent/evaluationDataComponent/EvaluationDataComponent.vue

@@ -4,7 +4,8 @@
       <div class="page_search">
         <div class="search_content">
           <div class="content_left">
-            <el-checkbox v-model="evaluationManageData.isHeadTeacherInvolved" >班主任参与评价</el-checkbox>
+            <!-- 线上匿名 展示; 线下答卷 隐藏 -->
+            <el-checkbox v-if="store.state.evaluationManageStepData.evaluationType === 0 " v-model="store.state.evaluationManageStepData.isHeadTeacherInvolved" >班主任参与评价</el-checkbox>
           </div>
           <div class="content_right">
             <el-button  class="button_border"  @click="OpenAddGradeForm">新增年级</el-button>
@@ -28,23 +29,26 @@
                     {{ gradeOpt.gradeName }} (共{{ gradeOpt.subjectCount }}科)
                   </div>
 
-                  <el-checkbox v-model="gradeOpt.selectionStatus" >选科</el-checkbox>
-                  <div class="selection_params" v-if="gradeOpt.selectionStatus">
-                    <span class="param_text">一共 </span>
-                    <el-input type="number" 
-                      :max="gradeOpt.subjectCount" :min="1" 
-                      v-model="gradeOpt.selectionCount"
-                      @blur="HandleInputBlur(gradeOpt.subjectCount,gradeOpt,'selectionCount')">
-                    </el-input>
-                    <span class="param_text"> 科,需要选择 </span>
-                    <el-input type="number" 
-                      :max="gradeOpt.subjectCount" :min="1"  
-                      v-model="gradeOpt.needCount" 
-                      @blur="HandleInputBlur(gradeOpt.selectionCount,gradeOpt,'needCount')">
-                    </el-input>
-                    <span class="param_text"> 科</span>
-                </div>
-                  
+                  <!-- 线上匿名 展示; 线下答卷 隐藏 -->
+                  <template  v-if="store.state.evaluationManageStepData.evaluationType === 0 ">
+                    <el-checkbox v-model="gradeOpt.selectionStatus" >选科</el-checkbox>
+                    <div class="selection_params" v-if="gradeOpt.selectionStatus">
+                      <span class="param_text">一共 </span>
+                      <el-input type="number" 
+                        :max="gradeOpt.subjectCount" :min="1" 
+                        v-model="gradeOpt.selectionCount"
+                        @blur="HandleInputBlur(gradeOpt.subjectCount,gradeOpt,'selectionCount')">
+                      </el-input>
+                      <span class="param_text"> 科,需要选择 </span>
+                      <el-input type="number" 
+                        :max="gradeOpt.subjectCount" :min="1"  
+                        v-model="gradeOpt.needCount" 
+                        @blur="HandleInputBlur(gradeOpt.selectionCount,gradeOpt,'needCount')">
+                      </el-input>
+                      <span class="param_text"> 科</span>
+                    </div>
+                  </template>
+
                 </div>
                 <div class="content_right table_row_option">
                   <span class="button_delete" @click="HandleDeleteOpen(gradeOpt,'grade')"> 删除</span>
@@ -85,8 +89,9 @@
               </el-form-item>
           
               <!-- 选科 -->
+              <!-- 线上匿名 展示; 线下答卷 隐藏 -->
               <el-form-item 
-                v-if="gradeOpt.selectionStatus"
+                v-if="gradeOpt.selectionStatus && store.state.evaluationManageStepData.evaluationType === 0 "
                 label="选科:"
                 prop="selectSubjectData"
                 :rules="[]"
@@ -239,8 +244,10 @@
 
 
 <script setup lang="ts">
-import { ref,onMounted, inject } from 'vue';
+import { ref,onMounted } from 'vue';
 import { useRoute } from 'vue-router';
+import { useStore } from 'vuex';
+
 import FormDialog from '@/baseComponents/FormDialog.vue';
 import TreeList from '@/baseComponents/TreeList.vue';
 import {addGradeFormItemList, addSubjectFormItemList} from './formDialog'
@@ -283,12 +290,10 @@ interface treeDataItm {
 }
 
 const route = useRoute();
-
-
+const store= useStore()
 //1.查询评价任务详情 信息
-// 班主任是否参与评价  evaluationManageData.isHeadTeacherInvolved
-const evaluationManageData = inject('commonStepData');
-
+// 班主任是否参与评价  store.state.evaluationManageStepData.isHeadTeacherInvolved 
+// store.state.evaluationManageStepData.evaluationType // 评价方式  0-线上匿名,1-线下答卷,2-线上导入,3-线上实名
 
 
 //2. 获取评价数据详情
@@ -679,7 +684,7 @@ const HandleDeleteOpen = (row: any,type) => {
 const SaveEvaluationData = async ()=>{
   let params = {
     evaluationId: route.query.id,
-    classMasterStatus: evaluationManageData.isHeadTeacherInvolved ? 1 : 0,
+    classMasterStatus: store.state.evaluationManageStepData.isHeadTeacherInvolved ? 1 : 0,
     gradeData: gradeOptions.value.map(item=>{
       if(item.selectionStatus){
         return {
@@ -704,6 +709,8 @@ const SaveEvaluationData = async ()=>{
   let res = await saveEvaluationDataDetailApi(params)
   if(res?.code == 200){
     ElMessage.success(res?.msg)
+    // 完成后,重新查询 任务管理基础信息,并跳到下一步
+
     await GetEvaluationDataDetail()
   }
 

+ 8 - 1
src/views/reviewManagement/stepComponent/parameterSettingComponent/ParameterSettingComponent.vue

@@ -94,6 +94,9 @@
 import { onMounted, ref } from 'vue';
 import { useRoute,useRouter } from 'vue-router';
 
+import { useStore } from 'vuex';
+
+
 import Table from '@/baseComponents/Table.vue';
 import Form from '@/baseComponents/Form.vue';
 import FormDialog from '@/baseComponents/FormDialog.vue';
@@ -111,6 +114,7 @@ import Dialog from '@/baseComponents/Dialog.vue';
 
 const route = useRoute()
 const router = useRouter()
+const store = useStore()
 
 // 1. 参数设置 表单
 const defaultParamsConfigFormData = ref({})
@@ -326,8 +330,11 @@ const FinishParamaterSetting = async ()=>{
     let res = await finishParamaterSettingApi(params)
     if(res?.code == 200){
         isEdit.value = false
+        // 触发重新查询,并跳到下一步
         ElMessage.success(res?.msg)
-        await GetParamaterSetting()
+        await store.dispatch('updateEvaluationManageStepData',route.query.id)
+        router.push(`evaluationProgress?id=${route.query.id}`)
+        // await GetParamaterSetting()
     }
 }
 

+ 5 - 5
src/views/reviewManagement/stepComponent/reviewAccountComponent/GenerateReviewCode.vue

@@ -38,7 +38,8 @@
 
 
 <script setup lang="ts">
-import { ref,inject,watch } from 'vue';
+import { ref,watch } from 'vue';
+import { useStore } from 'vuex';
 
 import { useRoute,useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus';
@@ -61,9 +62,8 @@ import { onMounted } from 'vue';
 const router = useRouter()
 const route = useRoute()
 
-// evaluationManageData.isGenerateAccountByGender // //按男女生成
-const evaluationManageData = inject('commonStepData')
-
+// store.state.evaluationManageStepData.isGenerateAccountByGender // //按男女生成
+const store = useStore()
 const GoToReviewAccountConfig = ()=>{
    router.push(`reviewAccount?id=${route.query.id}`)
 }
@@ -226,7 +226,7 @@ const FinishReviewAccount = async()=>{
 }
 
 // 根据是否按照性别生成评价码 控制 表格项和搜索项的显隐
-watch(()=>evaluationManageData.isGenerateAccountByGender,(newVal)=>{
+watch(()=>store.state.evaluationManageStepData.isGenerateAccountByGender,(newVal)=>{
     generateCodeTableColumns.value = generateCodeTableColumns.value.map(item=>{
         if(item.name == 'genderName'){
             item.hidden = newVal ? false :true

+ 10 - 10
src/views/reviewManagement/stepComponent/reviewAccountComponent/ReviewAccountComponent.vue

@@ -3,7 +3,7 @@
         <div class="page_search">
             <div class="search_content">
                 <div class="content_left">
-                    <el-checkbox v-model="evaluationManageData.isGenerateAccountByGender"  
+                    <el-checkbox v-model="store.state.evaluationManageStepData.isGenerateAccountByGender"  
                         @change="(val)=>GenerateAccountByGenderOrNot(val)" >
                         按男女生成
                     </el-checkbox>
@@ -82,7 +82,7 @@
 
 
             <template #footerRight="{formRef}">
-                <div v-if="!evaluationManageData.isGenerateAccountByGender" class="batch_num">
+                <div v-if="!store.state.evaluationManageStepData.isGenerateAccountByGender" class="batch_num">
                     <span>数量:<el-input  type="number"  v-model="batchAccountNum"   placeholder="请输入"/></span>
                 </div>
                 <div v-else class="group_batch_num">
@@ -98,8 +98,8 @@
 
 
 <script setup lang="ts">
-import { onMounted, inject,ref,watch } from 'vue';
-
+import { onMounted,ref,watch } from 'vue';
+import { useStore } from 'vuex';
 import { useRoute,useRouter } from 'vue-router';
 
 import Table from '@/baseComponents/Table.vue';
@@ -114,8 +114,8 @@ import { ElMessage } from 'element-plus';
 const route = useRoute()
 const router = useRouter()
 
-// evaluationManageData.isGenerateAccountByGender // //按男女生成
-const evaluationManageData = inject('commonStepData')
+const store = useStore()
+// store.state.evaluationManageStepData.isGenerateAccountByGender    //按男女生成
 
 
 
@@ -203,7 +203,7 @@ const GetReviewAccountList = async ()=>{
         }).flat()
 
         //初次赋值,要检查 上一次生成账号是否按男女生成 
-        ChangeHeaderShowItem(evaluationManageData.isGenerateAccountByGender)
+        ChangeHeaderShowItem(store.state.evaluationManageStepData.isGenerateAccountByGender)
 
         // 表行赋值
         Object.values(gradeMsg)?.map(grade=>{
@@ -253,7 +253,7 @@ const ChangeHeaderShowItem = (isGenerateByGender:Boolean)=>{
     }
 }
 
-watch(()=>evaluationManageData.isGenerateAccountByGender,(val)=>{
+watch(()=>store.state.evaluationManageStepData.isGenerateAccountByGender,(val)=>{
     ChangeHeaderShowItem(val)   
 })
 
@@ -316,7 +316,7 @@ const SaveBatchEditForm = (params:any)=>{
                         tableData.value[index] = {}
                     }
                     // 当前年级下  某个班级 的行赋值
-                    if(evaluationManageData.isGenerateAccountByGender){
+                    if(store.state.evaluationManageStepData.isGenerateAccountByGender){
                         // 按男女生成
                         tableData.value[index][`num_${gradeId}`] = Number(batchMaleNum.value) + Number(batchFemaleNum.value)
                         tableData.value[index][`male_${gradeId}`] = batchMaleNum.value
@@ -416,7 +416,7 @@ const GoToGenerateCodePage = ()=>{
 
     let params = {
         evaluationId: route.query.id,
-        genderStatus: evaluationManageData.isGenerateAccountByGender ?  1 : 0, 
+        genderStatus: store.state.evaluationManageStepData.isGenerateAccountByGender ?  1 : 0, 
         accounts
     }