diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalLarge.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalLarge.vue index ca1a8b8..9f4c067 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalLarge.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalLarge.vue @@ -91,11 +91,20 @@ this.year=key; this.bar_flag=false; this.getZyghPersonCountRecord(); + if(this.BaseConfig.person_info_my.cur_role.role_id===4){ + if( this.year==="全部"){ + this.year=""; + } + this.classFlag=false; + this.classList[0]=[{class_name: '全部',class_id:""}]; + this.getClassList(); + } }, handleSelectClass:function(key){ this.class=key; this.bar_flag=false; this.getZyghPersonCountRecord(); + }, handleSelectKind:function(key){ this.type=key; diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalSmall.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalSmall.vue index 3270cd7..e760554 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalSmall.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/EvaluationStatisticalSmall.vue @@ -92,6 +92,14 @@ this.year=key; this.bar_flag=false; this.getZyghPersonCountRecord(); + if(this.BaseConfig.person_info_my.cur_role.role_id===4){ + if( this.year==="全部"){ + this.year=""; + } + this.classFlag=false; + this.classList[0]=[{class_name: '全部',class_id:""}]; + this.getClassList(); + } }, handleSelectClass:function(key){ this.class=key; diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/SelectSubjectAnalysis.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/SelectSubjectAnalysis.vue index 1cce456..acac244 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/SelectSubjectAnalysis.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/careerWisdom/SelectSubjectAnalysis.vue @@ -2,12 +2,19 @@
年级: - {{ item.grade_name }} + 班级: + + + {{ item.class_name }} + +
@@ -44,6 +51,8 @@ gradeList:[], gradeFlag:false, lineFlag:false, + classFlag:false, + classList:[{class_name: '全部',class_id:""}], chooseType:1, list:[{value:1,name:"学科成绩优势"},{value:2,name:"职业选择与专业限考优势"},{value:3,name:"学科潜能优势"}], selectSubjectAnalysis:{ @@ -59,6 +68,9 @@ }, mounted(){ this.getClassYear(); + if(this.BaseConfig.person_info_my.cur_role.role_id===4){ + this.classFlag=true; + } }, created(){ // 获取屏幕高度 @@ -74,6 +86,19 @@ this.year=key; this.lineFlag=false; this.getAdvantageSubjectStatistics(); + if(this.BaseConfig.person_info_my.cur_role.role_id===4){ + if( this.year==="全部"){ + this.year=""; + } + this.classFlag=false; + this.classList[0]=[{class_name: '全部',class_id:""}]; + this.getClassList(); + } + }, + handleSelectClass:function(key){ + this.class=key; + this.lineFlag=false; + this.getAdvantageSubjectStatistics(); }, //获取年级 getClassYear:function () { @@ -100,6 +125,9 @@ }else { this.gradeList=[{grade_name:'暂无数据'}]; } + if(this.BaseConfig.person_info_my.cur_role.role_id===4){ + this.getClassList(); + } this.getAdvantageSubjectStatistics(); } }) @@ -110,7 +138,7 @@ bureau_id:this.BaseConfig.person_info_my.bureau_id, province_id:this.BaseConfig.person_info_my.sheng_id, entrance_year:this.year, - class_id:"", + classId:this.BaseConfig.person_info_my.cur_role.role_id===4?this.class:"", type: this.chooseType }; this.InterfaceConfig.callInterface([{ @@ -136,7 +164,41 @@ } }) - }, + }, //获取班级 + getClassList:function () { + let params = { + org_id: this.BaseConfig.person_info_my.bureau_id, + bureau_id: this.BaseConfig.person_info_my.bureau_id, + entrance_year: this.year, + pageSize: 999, + pageNumber: 1, + stage_id: 6, + }; + this.InterfaceConfig.callInterface([{ + url: InterfaceConfig.getClassList.url, + params: params, + method: InterfaceConfig.getClassList.method, + isTestLogin: InterfaceConfig.getClassList.isTestLogin, + isOfficeInterface: false + }], (result) => { + if (result[0].data.success) { + let data = result[0].data.table_List; + this.classFlag = true; + let list = [{class_name: '全部',class_id:""}]; + if (data.length !== 0) { + // this.class = data[0].columns.ENTRANCE_YEAR; + data.forEach((item) => { + list.push({class_name: item.CLASS_NAME,class_id:item.CLASS_ID}) + }); + this.classList = list; + } else { + this.classList = [{class_name: '暂无数据',class_id:""}]; + } + this.getZyghPersonCountRecord(); + + } + }) + } }, } diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/TheCurriculumSmall.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/TheCurriculumSmall.vue index d4108d8..99d4dd3 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/TheCurriculumSmall.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/TheCurriculumSmall.vue @@ -414,7 +414,7 @@ this.courseNumber= this.num; }else{ this.coresetimeData=[]; - this.noData=true; + this.teaNoData=true; } }) }, diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue index 2dc11fb..d121545 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue @@ -66,6 +66,7 @@