Administrator 4 years ago
commit f618d6b484

@ -91,11 +91,20 @@
this.year=key; this.year=key;
this.bar_flag=false; this.bar_flag=false;
this.getZyghPersonCountRecord(); 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){ handleSelectClass:function(key){
this.class=key; this.class=key;
this.bar_flag=false; this.bar_flag=false;
this.getZyghPersonCountRecord(); this.getZyghPersonCountRecord();
}, },
handleSelectKind:function(key){ handleSelectKind:function(key){
this.type=key; this.type=key;

@ -92,6 +92,14 @@
this.year=key; this.year=key;
this.bar_flag=false; this.bar_flag=false;
this.getZyghPersonCountRecord(); 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){ handleSelectClass:function(key){
this.class=key; this.class=key;

@ -2,12 +2,19 @@
<div class="selectSubjectAnalysis"> <div class="selectSubjectAnalysis">
<div style="height: 4rem;line-height: 4rem"> <div style="height: 4rem;line-height: 4rem">
<span style="float: left;">年级</span> <span style="float: left;">年级</span>
<a-select style="width:6rem;float: left;margin: 1rem 1rem 0 0" v-if="gradeFlag" value-key="item.grade_name" :default-value=this.gradeList[0].grade_name <a-select style="width:6rem;float: left;margin: 1rem 1rem 0 0" v-if="gradeFlag" value-key="item.grade_name" :default-value=gradeList[0].grade_name
@change="handleSelectGrade($event)"> @change="handleSelectGrade($event)">
<a-select-option v-for="item in this.gradeList" :key="item.grade_name" :value="item.grade_name" > <a-select-option v-for="item in this.gradeList" :key="item.grade_name" :value="item.grade_name" >
{{ item.grade_name }} {{ item.grade_name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<span v-if="classFlag" style="float: left;line-height: 4rem"></span>
<a-select style="width:8rem;float: left;margin: 1rem 1rem 0 0;" v-if="classFlag" value-key="item.class_name" :default-value=classList[0].class_name
@change="handleSelectClass($event)">
<a-select-option v-for="item in this.classList" :key="item.class_id" :value="item.class_id" >
{{ item.class_name }}
</a-select-option>
</a-select>
</div> </div>
<div> <div>
<a-tabs default-active-key="1" @change="callback"> <a-tabs default-active-key="1" @change="callback">
@ -44,6 +51,8 @@
gradeList:[], gradeList:[],
gradeFlag:false, gradeFlag:false,
lineFlag:false, lineFlag:false,
classFlag:false,
classList:[{class_name: '全部',class_id:""}],
chooseType:1, chooseType:1,
list:[{value:1,name:"学科成绩优势"},{value:2,name:"职业选择与专业限考优势"},{value:3,name:"学科潜能优势"}], list:[{value:1,name:"学科成绩优势"},{value:2,name:"职业选择与专业限考优势"},{value:3,name:"学科潜能优势"}],
selectSubjectAnalysis:{ selectSubjectAnalysis:{
@ -59,6 +68,9 @@
}, },
mounted(){ mounted(){
this.getClassYear(); this.getClassYear();
if(this.BaseConfig.person_info_my.cur_role.role_id===4){
this.classFlag=true;
}
}, },
created(){ created(){
// //
@ -74,6 +86,19 @@
this.year=key; this.year=key;
this.lineFlag=false; this.lineFlag=false;
this.getAdvantageSubjectStatistics(); 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 () { getClassYear:function () {
@ -100,6 +125,9 @@
}else { }else {
this.gradeList=[{grade_name:'暂无数据'}]; this.gradeList=[{grade_name:'暂无数据'}];
} }
if(this.BaseConfig.person_info_my.cur_role.role_id===4){
this.getClassList();
}
this.getAdvantageSubjectStatistics(); this.getAdvantageSubjectStatistics();
} }
}) })
@ -110,7 +138,7 @@
bureau_id:this.BaseConfig.person_info_my.bureau_id, bureau_id:this.BaseConfig.person_info_my.bureau_id,
province_id:this.BaseConfig.person_info_my.sheng_id, province_id:this.BaseConfig.person_info_my.sheng_id,
entrance_year:this.year, entrance_year:this.year,
class_id:"", classId:this.BaseConfig.person_info_my.cur_role.role_id===4?this.class:"",
type: this.chooseType type: this.chooseType
}; };
this.InterfaceConfig.callInterface([{ 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();
}
})
}
}, },
} }

@ -414,7 +414,7 @@
this.courseNumber= this.num; this.courseNumber= this.num;
}else{ }else{
this.coresetimeData=[]; this.coresetimeData=[];
this.noData=true; this.teaNoData=true;
} }
}) })
}, },

@ -66,6 +66,7 @@
<script> <script>
import TabComp from '../common/tabComp.vue'; import TabComp from '../common/tabComp.vue';
import DateChoose from '../common/dateChoose.vue'; import DateChoose from '../common/dateChoose.vue';
import OfficeMenuConfig from '../../../../../../../../src/utils/officeMenuConfig';
import {Spin,Progress,Modal,Icon} from 'ant-design-vue'; import {Spin,Progress,Modal,Icon} from 'ant-design-vue';
import interConfig from './interConfig'; import interConfig from './interConfig';
import moment from 'moment'; import moment from 'moment';
@ -78,7 +79,7 @@
showLoading: true, showLoading: true,
tabArr: [ tabArr: [
{title: "我的日程"}, {title: "我的日程"},
{title: "部门日程"} // {title: ""}
], ],
tabIndex: 0, tabIndex: 0,
begin_date: null, begin_date: null,
@ -98,9 +99,15 @@
showPanel:false, showPanel:false,
depId:this.BaseConfig.person_info_my.dep_id, depId:this.BaseConfig.person_info_my.dep_id,
depName:this.BaseConfig.person_info_my.dep_name, depName:this.BaseConfig.person_info_my.dep_name,
depAdmin:false,
} }
}, },
created(){ created(){
//
this.depAdmin = OfficeMenuConfig.menuIsExist(["daliyOffice", "newSchedule", "schedule_statistics", "dept"]);
if (this.depAdmin) {
this.tabArr.push({title: "部门日程"});
}
this.getNowTime(); this.getNowTime();
}, },
computed:{ computed:{

@ -78,7 +78,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="!showLoading" class="only-show-no-read-div"><span v-on:click="onlyShowNoRead()"></span></div> <div v-if="!showLoading" class="only-show-no-read-div"><span v-on:click="onlyShowNoRead()">{{only_no_view == 1?'':''}}</span></div>
<div class="bottom-div"> <div class="bottom-div">
<div v-if="!showLoading" class="summary-progress-div"> <div v-if="!showLoading" class="summary-progress-div">
<div class="progress-title">提交进度</div> <div class="progress-title">提交进度</div>
@ -260,6 +260,7 @@
this.summaryList = []; this.summaryList = [];
if (this.tabIndex > 0) { if (this.tabIndex > 0) {
this.dateType = "day"; this.dateType = "day";
this.only_no_view = 0;
this.getNowTime(); this.getNowTime();
} else { } else {
this.dateType = "month"; this.dateType = "month";
@ -291,7 +292,7 @@
isTestLogin: interConfig.listSuperfusionWorkSummary.isTestLogin, isTestLogin: interConfig.listSuperfusionWorkSummary.isTestLogin,
}], (result) => { }], (result) => {
this.showLoading = false; this.showLoading = false;
this.only_no_view = 0; //this.only_no_view = 0;
let resData = result[0].data; let resData = result[0].data;
if (result[0].status === 200) { if (result[0].status === 200) {
if (resData.code === 2000) { if (resData.code === 2000) {
@ -446,6 +447,7 @@
this.dateType = "year"; this.dateType = "year";
} }
}else { }else {
this.only_no_view = 0;
this.getListSuperfusionWorkSummary(); this.getListSuperfusionWorkSummary();
} }
} }
@ -454,7 +456,8 @@
if (this.yearMonth != value) { if (this.yearMonth != value) {
this.yearMonth = value; this.yearMonth = value;
if(this.tabIndex > 0){ if(this.tabIndex > 0){
this.currentDate = this.yearMonth this.only_no_view = 0;
this.currentDate = this.yearMonth;
this.getListSuperfusionWorkSummary(); this.getListSuperfusionWorkSummary();
} }
} }
@ -477,7 +480,7 @@
this.getListSuperfusionWorkSummary(); this.getListSuperfusionWorkSummary();
}, },
onlyShowNoRead:function () { onlyShowNoRead:function () {
this.only_no_view = 1; this.only_no_view = this.only_no_view == 0?1:0;
this.getListSuperfusionWorkSummary(); this.getListSuperfusionWorkSummary();
} }
}, },

Loading…
Cancel
Save