diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue index 81a0445..476c356 100644 --- a/client/src/views/supervisionNew/mytask.vue +++ b/client/src/views/supervisionNew/mytask.vue @@ -234,15 +234,73 @@ - + + + +
+ 外部监督检查信息 +
+ 无记录 + 导入 + + 导出 +
+
+ + + + + + + + + + + + +
+ + +
+
- 不准确报告 + 不准确报告/证书
无记录 导入 + 导出
@@ -278,15 +337,16 @@
- +
- 超期报告 + 超期报告/证书
无记录 导入 + 导出
@@ -329,7 +390,7 @@ >
- +
@@ -338,6 +399,7 @@ 无记录 导入 + 导出
@@ -390,15 +453,16 @@ >
- +
- 客户投诉 + 客户投诉信息
无记录 导入 + 导出
@@ -447,15 +512,16 @@ >
- +
- 风险识别 + 风险识别信息
无记录 导入 + 导出
@@ -506,61 +573,7 @@ >
- - - -
- 外部监督检查 -
- 无记录 - 导入 - -
-
- - - - - - - - - - - - -
- - -
+
{ let obj = item; + let goal_value_a = item.goal_value_a+''; + if(item.goal_name=='重大质量事故'){ + }else{ + if(goal_value_a.indexOf('.')>-1){}else{ + goal_value_a = goal_value_a+'.0'; + obj.goal_value_a = goal_value_a; + } + } obj.fileLists = []; if(item.goal_file!==null){ let file = {}; diff --git a/client/src/views/supervisionNew/statistics.vue b/client/src/views/supervisionNew/statistics.vue index 13d808a..0032732 100644 --- a/client/src/views/supervisionNew/statistics.vue +++ b/client/src/views/supervisionNew/statistics.vue @@ -618,131 +618,139 @@ let data = res.data.filter(item=>{ return item.task2_.type==20 }); - data.forEach(element => { - let obj = element; - if(element.num_issue!==null&&element.num_error!==null&&element.num_issue!==0){ - let rate1 = ((element.num_issue-element.num_error)/element.num_issue).toFixed(4) - obj.rate1 = parseFloat(Number(rate1)*100).toFixed(2); - }else{ - obj.rate1 = '' - } - if(element.num_expect!==null&&element.num_issue!==null&&element.num_expect!==0){ - let rate2 = (element.num_issue/element.num_expect).toFixed(4) - obj.rate2 = parseFloat(Number(rate2)*100).toFixed(2); - } - else{ - obj.rate2 = '' - } - if(element.num_pt!==null&&element.num_pt_10!==null&&element.num_pt!==0){ - let rate3 = (element.num_pt_10/element.num_pt).toFixed(4) - obj.rate3 = parseFloat(Number(rate3)*100).toFixed(2); - } - else{ - obj.rate3 = '' - } - if(element.num_complaint!==null&&element.num_complaint_10!==null&&element.num_complaint!==0){ - let rate4 = (element.num_complaint_10/element.num_complaint).toFixed(4) - obj.rate4 = parseFloat(Number(rate4)*100).toFixed(2); - } - else{ - obj.rate4 = '' - } - let ind = element.task2_.cycle-1; - that.tableData1[ind] = obj; - }); - for (let i = 0; i < that.tableData1.length; i++) { - let item = that.tableData1[i]; - if(item!==undefined){ - for(let j = 0; j < that.tableDatas.length; j++){ - that.tableDatas[j][i] = - j==0?item.num_acc: - j==1?item.num_issue: - j==2?item.num_error: - j==3?item.rate1: - j==4?item.num_expect: - j==5?item.num_issue: - j==6?item.rate2: - j==7?item.num_pt: - j==8?item.num_pt_10: - j==9?item.rate3: - j==10?item.num_complaint: - j==11?item.num_complaint_10: - item.rate4; - } - } - } - that.timeStamp++; - for(let k=0;k0){ + data.forEach(element => { + let obj = element; + let sjwc = null; + if(element.num_expect!==null){ + if(element.num_overdue!==null){ + sjwc = element.num_expect-element.num_overdue; + }else{ + sjwc = element.num_expect; + } }else{ - that.tableDatas[k][6] = num; + sjwc = null; } - }else{ - that.tableDatas[k][6] = '' + obj.sjwc = sjwc ; + let rate1= 1, rate2= 1, rate3= 1, rate4= 1; + try{ + rate1 = (element.num_issue-element.num_error)/element.num_issue; + }catch{} + try{ + rate2 = sjwc/element.num_expect; + }catch{} + try{ + rate3 = element.num_pt_10/element.num_pt; + }catch{} + try{ + rate4 = element.num_complaint_10/element.num_complaint; + }catch{} + console.log(rate1,rate2,rate3,rate4) + rate1 = isNaN(rate1)?'':rate1; + rate2 = isNaN(rate2)?'':rate2; + rate3 = isNaN(rate3)?'':rate3; + rate4 = isNaN(rate4)?'':rate4; + obj.rate1 = rate1!==''?parseFloat(Number(rate1.toFixed(4))*100).toFixed(2):''; + obj.rate2 = rate2!==''?parseFloat(Number(rate2.toFixed(4))*100).toFixed(2):''; + obj.rate3 = rate3!==''?parseFloat(Number(rate3.toFixed(4))*100).toFixed(2):''; + obj.rate4 = rate4!==''?parseFloat(Number(rate4.toFixed(4))*100).toFixed(2):''; + let ind = element.task2_.cycle-1; + that.tableData1[ind] = obj; + }); + for (let i = 0; i < that.tableData1.length; i++) { + let item = that.tableData1[i]; + if(item!==undefined){ + for(let j = 0; j < that.tableDatas.length; j++){ + that.tableDatas[j][i] = + j==0?item.num_acc: + j==1?item.num_issue: + j==2?item.num_error: + j==3?item.rate1: + j==4?item.num_expect: + j==5?item.sjwc: + j==6?item.rate2: + j==7?item.num_pt: + j==8?item.num_pt_10: + j==9?item.rate3: + j==10?item.num_complaint: + j==11?item.num_complaint_10: + item.rate4; + } + } } + that.timeStamp++; + for(let k=0;k