diff --git a/client/src/views/supervisionNew/basicGoalDept.vue b/client/src/views/supervisionNew/basicGoalDept.vue index 1be9175..36d505d 100644 --- a/client/src/views/supervisionNew/basicGoalDept.vue +++ b/client/src/views/supervisionNew/basicGoalDept.vue @@ -67,54 +67,86 @@ goal_key__in:'pgoal_1,pgoal_2,pgoal_3,pgoal_4,pgoal_5', belong_dept__in:'' }, + query:{ + year:'', + dept_type_name:'2级公司' + }, taskList:[], heightTable:null, listLoading:false }; }, mounted(){ - this.getOrgList(); let height = document.getElementsByClassName('app-main')[0].clientHeight; this.heightTable = height-90; + debugger; + if (checkPermission(["record_confirm"])) { + this.getTableData(); + } else { + this.getOrgList(); + } }, methods:{ checkPermission, getOrgList() { - let that = this; - let ids = '' - if (that.checkPermission(["record_confirm"])) { - getOrgList({ can_supervision: true }).then((res) => { - let data = res.data; - debugger; - for(let i=0;i { - let data = res.data; + let that = this; + let ids = '' + getSubOrgList().then((res) => { + let data = res.data; + for(let i=0;i{ - // console.log(res) - // let data = res.data; - // }) - // }, + taskAnalyse(that.query).then(res=>{ + console.log(res) + let data = res.data; + let arr = []; + if(data.length>0){ + let firstObj = {}; + firstObj.year=data[0].年份; + firstObj.dept_name=data[0].单位; + firstObj.pgoal_1=data[0].重大事故数基础值; + let pgoal_2 = data[0].报告证书合格率基础值+''; + let pgoal_3=data[0].报告证书及时率基础值+''; + let pgoal_4=data[0].能力验证满意率基础值+''; + let pgoal_5=data[0].客户投诉处理满意率基础值+''; + firstObj.pgoal_2=pgoal_2.indexOf('.')>-1?pgoal_2:pgoal_2+'.0'; + firstObj.pgoal_3=pgoal_3.indexOf('.')>-1?pgoal_3:pgoal_3+'.0'; + firstObj.pgoal_4=pgoal_4.indexOf('.')>-1?pgoal_4:pgoal_4+'.0'; + firstObj.pgoal_5=pgoal_5.indexOf('.')>-1?pgoal_5:pgoal_5+'.0'; + arr.push(firstObj); + data.forEach(item=>{ + let obj = {}; + obj.year=item.年份; + obj.dept_name=item.单位; + obj.pgoal_1=item.重大事故数设定值; + let pgoal2 = item.报告证书合格率设定值+''; + let pgoal3=item.报告证书及时率设定值+''; + let pgoal4=item.能力验证满意率设定值+''; + let pgoal5=item.客户投诉处理满意率设定值+''; + obj.pgoal_2=pgoal2.indexOf('.')>-1?pgoal2:pgoal2+'.0'; + obj.pgoal_3=pgoal3.indexOf('.')>-1?pgoal3:pgoal3+'.0'; + obj.pgoal_4=pgoal4.indexOf('.')>-1?pgoal4:pgoal4+'.0'; + obj.pgoal_5=pgoal5.indexOf('.')>-1?pgoal5:pgoal5+'.0'; + arr.push(obj); + }) + } + + that.dataList.results = arr; + }) + }, //获取列表 getList(){ let that = this; @@ -133,6 +165,8 @@ let data =data0.filter(item=>{ return item.task2do!==null; }); + debugger; + console.log(data) that.dataList.count = data.length; if(data.length>0){ let alreadyId = ['000']; @@ -193,7 +227,11 @@ this.listQuery.year = year; }, handleFilter(){ - this.getList(); + if (this.checkPermission(["record_confirm"])) { + this.getTableData(); + } else { + this.getList(); + } }, handleExport() { let filename = this.listQuery.year+'部门目标.xlsx' diff --git a/client/src/views/supervisionNew/statisticsGroup.vue b/client/src/views/supervisionNew/statisticsGroup.vue index c68f48f..44f0325 100644 --- a/client/src/views/supervisionNew/statisticsGroup.vue +++ b/client/src/views/supervisionNew/statisticsGroup.vue @@ -114,7 +114,8 @@ formatter:"{value}%" }, scale:true, - min:60, + min:85, + max:105, }, series: [ { diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue index 0db3d7a..4f53866 100644 --- a/client/src/views/supervisionNew/taskdo.vue +++ b/client/src/views/supervisionNew/taskdo.vue @@ -623,7 +623,25 @@ export default { getPgoalDeptList(this.listQuery) .then((res) => { this.listLoading2 = false; - this.recordList = res.data.results; + let data = res.data.results; + for(let i=0;i-1?value_a:value_a+'.0'; + }else{ + data[i].goal_value_a='' + } + if(value_b!='null'){ + data[i].goal_value_b=value_b.indexOf('.')>-1?value_b:value_b+'.0'; + }else{ + data[i].goal_value_b=''; + } + + } + } + this.recordList = data; }) .catch((e) => { this.listLoading2 = false;