Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
This commit is contained in:
commit
965dfdb670
|
@ -91,6 +91,15 @@
|
|||
this.deptData = data;
|
||||
});
|
||||
},
|
||||
getTableData(){
|
||||
let that = this;
|
||||
let obj = {
|
||||
query: { start_date: this.start_date, end_date: this.end_date, dept_name: "6车间" },
|
||||
};
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((doInRes) => {
|
||||
|
||||
});
|
||||
},
|
||||
handleQuery(){
|
||||
if(this.monthV!=''){
|
||||
this.query.year = this.monthV.getFullYear();
|
||||
|
|
|
@ -58,7 +58,8 @@
|
|||
<el-table-column label="合格数" prop="count_ok"> </el-table-column>
|
||||
<el-table-column label="完成率" prop="count">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.count != 0">{{ (scope.row.count_ok / scope.row.count) * 100 }}</span>
|
||||
<span v-if="scope.row.count != 0&&scope.row.count_ok!= 0">{{ Math.floor((scope.row.count_ok / scope.row.count) * 100) }}%</span>
|
||||
<span v-else>0</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="150">
|
||||
|
|
|
@ -56,9 +56,10 @@
|
|||
<el-table-column label="计划完工时间" prop="end_date" width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="count_ok"> </el-table-column>
|
||||
<el-table-column label="完成率" prop="count">
|
||||
<el-table-column label="完成率">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.count != 0">{{ (scope.row.count_ok / scope.row.count) * 100 }}</span>
|
||||
<span v-if="scope.row.count != 0&&scope.row.count_ok != 0">{{ Math.floor(scope.row.count_ok / scope.row.count*100) }}%</span>
|
||||
<span v-else>0</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="150">
|
||||
|
|
|
@ -111,7 +111,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="count">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.count_ok / scope.row.count_real }}</span>
|
||||
<span>{{ Math.floor(scope.row.count_ok / scope.row.count_real*100) }}%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="不合格原因及数量" align="center">
|
||||
|
|
|
@ -110,7 +110,8 @@
|
|||
<el-table-column label="合格量" prop="count_ok"> </el-table-column>
|
||||
<el-table-column label="合格率" prop="count">
|
||||
<template #default="scope">
|
||||
<span>{{ (scope.row.count_ok / scope.row.count_real) * 100 }}</span>
|
||||
<span>{{ Math.floor(scope.row.count_ok / scope.row.count_real * 100)
|
||||
}}%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="不合格原因及数量" align="center">
|
||||
|
|
Loading…
Reference in New Issue