Kaynağa Gözat

重命名文件名

lm 1 ay önce
ebeveyn
işleme
34762e7f8f

+ 0 - 0
src/api/step1Component.ts → src/api/evaluationDataComponent.ts


+ 0 - 0
src/api/step3Component.ts → src/api/questionnaireTemplateComponent.ts


+ 0 - 0
src/api/step2Component.ts → src/api/teachingRelationshipComponent.ts


+ 14 - 14
src/components/ReviewManagementDetailSideBar.vue

@@ -12,12 +12,12 @@
       <ul class="nav_list">
         <!-- 激活状态的步骤 -->
         <li v-for="stepItm in stepMsgs" :key="stepItm.setpNum" 
-          :class="['nav_item', {'active_item':currentActiveStep == stepItm.stepNum}]"
+          :class="['nav_item', {'active_item':currentActiveStep == stepItm.stepName}]"
           @click="HandleChangeStep(stepItm)"
         >
           <div class="step_header_title">
             <i  v-if="stepItm.isFinish" class="hjx-dui iconfont"></i>
-            <span v-else class="step_num">{{ stepItm.stepNum }}</span>
+            <span v-else class="step_num">{{ stepItm.stepName }}</span>
             <span class="step_title">{{stepItm.title}}</span>
           </div>
 
@@ -49,28 +49,28 @@ const route = useRoute()
 const currentActiveStep = ref(1)
 const stepMsgs = computed(()=>[
   {
-    stepNum:1,
+    stepName:'evaluationData',
     title:'评价数据',
     desc:'评价覆盖的年级、班级、对应科目基础信息',
     route:'evaluationData',
     isFinish:evaluationManageData.isFinishEvaluationData,
   },
   {
-    stepNum:2,
+    stepName:'teachingRelationship',
     title:'授课关系',
     desc:'年级、班级、科目匹配对应的任课教师',
     route:'teachingRelationship',
     isFinish:evaluationManageData.isFinishTeachingRelationship,
   },
   {
-    stepNum:3,
+    stepName:'questionnaireTemplate',
     title:'问卷模版',
     desc:'为不同科目选定适配的评价问卷模板',
     route:'questionnaireTemplate',
     isFinish:evaluationManageData.isFinishQuestionnaireTemplate,
   },
   {
-    stepNum:4,
+    stepName:'reviewAccount',
     title:'评价账号',
     desc:'批量生成对应数量的学生评价登录账号',
     route:'reviewAccount',
@@ -81,21 +81,21 @@ const stepMsgs = computed(()=>[
     isGenerateReviewCode:evaluationManageData.isGenerateReviewCode,  //是否已生成评价码
   },
   {
-    stepNum:5,
+    stepName:'parameterSetting',
     title:'参数设置',
     desc:'统一配置本次评价任务的评分分值规则',
     route:'parameterSetting',
     isFinish:evaluationManageData.isFinishParameterSetting,
   },
   {
-    stepNum:6,
+    stepName:'evaluationProgress',
     title:'评价进度',
     desc:'实时查看学生完成评价的填报进度',
     route:'evaluationProgress',
     isFinish:evaluationManageData.isFinishEvaluationProgress,
   },
   {
-    stepNum:7,
+    stepName:'generateAnalysis',
     title:'生成分析',
     desc:'汇总数据并生成、发布评价分析报告',
     route:'generateAnalysis',
@@ -105,8 +105,8 @@ const stepMsgs = computed(()=>[
 ])
 
 const HandleChangeStep=(currentStep)=>{
-  currentActiveStep.value = currentStep.stepNum
-  if(currentStep.stepNum  === 4){
+  currentActiveStep.value = currentStep.stepName
+  if(currentStep.stepName  == 'reviewAccount'){
     if(currentStep.isGenerateReviewCode){
       // 已经生成评价码,跳转到评价码生成页面
       router.push(`generateReviewCode?id=${route.query.id}`)
@@ -120,12 +120,12 @@ const HandleChangeStep=(currentStep)=>{
 
 
 onMounted(()=>{
-  let stepName = route.params.stepName
+  let stepRoute = route.params.stepRoute
   let matchRes = stepMsgs.value.find(item=>{
-    return item.route === stepName || item.childrenRoute?.includes(stepName)
+    return item.route === stepRoute || item.childrenRoute?.includes(stepRoute)
   })
   if(matchRes){
-    currentActiveStep.value = matchRes.stepNum
+    currentActiveStep.value = matchRes.stepName
   }
 })
 </script>

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

@@ -34,10 +34,13 @@ export default {
   // 评价管理 的 步骤公共信息 下发
   const evaluationManageStepData  = reactive({
     evaluationManageDetailName:'',  // 评价管理任务名称
+    
+    evaluationType:null,   // 评价方式  0-线上匿名,1-线下答卷,2-线上导入,3-线上实名
+
+
     isHeadTeacherInvolved:null,    //班主任是否参与评价
     isGenerateAccountByGender:null,  // 是否按男女生成评价账号
     isGenerateReviewCode:null,  //是否已生成评价码
-    
     // 各个步骤的完成状态
     isFinishEvaluationData:null,  // 评价数据是否完成
     isFinishTeachingRelationship:null, // 授课关系是否完成

+ 1 - 1
src/router/index.ts

@@ -43,7 +43,7 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@/views/reviewManagement/ReviewManagement.vue')
       },
       {
-        path: 'reviewManagementDetail/:stepName',
+        path: 'reviewManagementDetail/:stepRoute',
         name: 'reviewManagementDetail',   //评价管理详情页
         component: () => import('@/views/reviewManagement/ReviewManagementDetail.vue'),
       },

+ 9 - 8
src/views/reviewManagement/ReviewManagementDetail.vue

@@ -10,11 +10,11 @@ import { useRoute,useRouter } from 'vue-router';
 import { computed, onMounted,inject } from 'vue';
 import {
     getEvaluationTaskDetailApi,
-} from '@/api/step1Component.ts'
+} from '@/api/evaluationDataComponent'
  
-import Step1Component from './stepComponent/step1Component/Step1Component.vue';
-import Step2Component from './stepComponent/step2Component/Step2Component.vue';
-import Step3Component from './stepComponent/step3Component/Step3Component.vue';
+import EvaluationDataComponent from './stepComponent/evaluationDataComponent/EvaluationDataComponent.vue';
+import TeachingRelationshipComponent from './stepComponent/teachingRelationshipComponent/TeachingRelationshipComponent.vue';
+import QuestionnaireTemplateComponent from './stepComponent/questionnaireTemplateComponent/QuestionnaireTemplateComponent.vue';
 import Step4Component from './stepComponent/step4Component/Step4Component.vue';
 import GenerateReviewCode from './stepComponent/step4Component/GenerateReviewCode.vue';
 import Step5Component from './stepComponent/step5Component/Step5Component.vue';
@@ -28,13 +28,13 @@ const route = useRoute()
 const router = useRouter()
 
 const curentComponent = computed(()=>{
-  switch(route.params.stepName){
+  switch(route.params.stepRoute){
     case 'evaluationData':
-      return Step1Component
+      return EvaluationDataComponent
     case 'teachingRelationship':
-      return Step2Component
+      return TeachingRelationshipComponent
     case 'questionnaireTemplate':
-      return Step3Component
+      return QuestionnaireTemplateComponent
     case 'reviewAccount':
       return Step4Component
     case 'generateReviewCode':
@@ -56,6 +56,7 @@ 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)

+ 1 - 1
src/views/reviewManagement/stepComponent/step1Component/Step1Component.vue → src/views/reviewManagement/stepComponent/evaluationDataComponent/EvaluationDataComponent.vue

@@ -254,7 +254,7 @@ import {
     deleteGradeApi,deleteCustomSubjectApi,
     getGradeListApi,getSubjectDataApi,getSubjectSelectedDataApi,
     saveEvaluationDataDetailApi
-} from '@/api/step1Component.ts'
+} from '@/api/evaluationDataComponent.ts'
 import { ElMessage } from 'element-plus';
 
 interface subjectOrClassDataItm {

+ 0 - 0
src/views/reviewManagement/stepComponent/step1Component/formDialog.ts → src/views/reviewManagement/stepComponent/evaluationDataComponent/formDialog.ts


+ 1 - 1
src/views/reviewManagement/stepComponent/step3Component/Step3Component.vue → src/views/reviewManagement/stepComponent/questionnaireTemplateComponent/QuestionnaireTemplateComponent.vue

@@ -58,7 +58,7 @@ import { useRoute,useRouter } from 'vue-router';
 import Table from '@/baseComponents/Table.vue';
 import {tableColumns} from './table'
 
-import { getQuestionnaireTemplateListApi,saveQuestionnaireTemplateListApi} from '@/api/step3Component'
+import { getQuestionnaireTemplateListApi,saveQuestionnaireTemplateListApi} from '@/api/questionnaireTemplateComponent'
 import {getAllQuestionnaireListApi} from   '@/api/surveyManagement'
 import { ElMessage } from 'element-plus';
 

+ 0 - 0
src/views/reviewManagement/stepComponent/step3Component/table.ts → src/views/reviewManagement/stepComponent/questionnaireTemplateComponent/table.ts


+ 1 - 1
src/views/reviewManagement/stepComponent/step7Component/Step7Component.vue

@@ -30,7 +30,7 @@
                 </div>
             </div>
             <div class="score_progress">
-                <span class="span_title">发布进度:</span>
+                <span class="span_title">生成进度:</span>
                 <el-progress :percentage="percentage" :stroke-width="34" :color="customColor" :show-text="false"></el-progress>
                 <span class="span_progress">{{percentage}}%</span>
             </div>

+ 2 - 2
src/views/reviewManagement/stepComponent/step2Component/Step2Component.vue → src/views/reviewManagement/stepComponent/teachingRelationshipComponent/TeachingRelationshipComponent.vue

@@ -156,9 +156,9 @@ import {
   getTeachingRelationshipTableDataApi,  getTeacherListDataApi,  
   saveTeachingRelationshipApi,  deleteTeachingRelationshipApi,  
   finishTeachingRelationshipApi,clearTeachingRelationshipApi
-} from '@/api/step2Component'
+} from '@/api/teachingRelationshipComponent'
 
-import {getEvaluationDataDetailApi} from '@/api/step1Component'
+import {getEvaluationDataDetailApi} from '@/api/evaluationDataComponent'
 
 import {administrativeClassTableColumns,teacherTableColumns,teachingClassTableColumns} from './table'
 import { ElMessage } from 'element-plus';

+ 0 - 0
src/views/reviewManagement/stepComponent/step2Component/table.ts → src/views/reviewManagement/stepComponent/teachingRelationshipComponent/table.ts