zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
TianyangZhang 2025-11-07 15:40:37 +08:00
parent 80f329c617 1836b7b84b
commit 3863159a3b
2 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/statistics/bxerp/defect.vue
View File

@ -41,8 +41,8 @@
</el-table-column> </el-table-column>
<el-table-column label="总数"> <el-table-column label="总数">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.总生产数">{{ scope.row.总生产数 }}</span>
<span v-if="scope.row.总切片数">{{ scope.row.总切片数 }}</span> <span v-if="scope.row.总切片数">{{ scope.row.总切片数 }}</span>
<span v-else>{{ scope.row.总生产数 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="剪切"> <el-table-column label="剪切">
@ -52,36 +52,30 @@
</el-table-column> </el-table-column>
<el-table-column label="剪切加功率"> <el-table-column label="剪切加功率">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'])/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row['剪切￠18.3mm不合格']">{{ (((scope.row.总切片数-scope.row['剪切￠18.3mm不合格'].含)/scope.row.总切片数)*100).toFixed(2) }}%</span>
<span v-else>100%</span> <span v-else>100%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="暗点"> <el-table-column label="暗点">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.暗点合格">{{((scope.row.暗点合格/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row.暗点合格">{{((scope.row.暗点合格.含/scope.row.总切片数)*100).toFixed(2) }}%</span>
<span v-else>0%</span> <span v-else>0%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="长点率"> <el-table-column label="长点率">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.暗点不合格">{{((scope.row.暗点不合格/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row.暗点不合格">{{((scope.row.暗点不合格.含/scope.row.总切片数)*100).toFixed(2) }}%</span>
<span v-else>0%</span> <span v-else>0%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加功率"> <el-table-column label="加功率">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.可加工数">{{((scope.row.可加工数/scope.row.总切片数)*100).toFixed(2) }}%</span> <span v-if="scope.row.总切片合格数">{{((scope.row.总切片合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
</template>
</el-table-column>
<el-table-column label="不合格数">
<template #default="scope">
<span v-if="scope.row.不合格数">{{((scope.row.不合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" prop="合格率"> <el-table-column label="合格率" prop="合格率">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row['剪切￠18.3mm可加工']">{{ scope.row['剪切￠18.3mm不合格']?scope.row.总切片数 - scope.row['剪切￠18.3mm可加工']- scope.row['剪切￠18.3mm不合格']+scope.row.暗点合格:scope.row.总切片数 - scope.row['剪切￠18.3mm可加工']+scope.row.暗点合格}}</span> <span v-if="scope.row.总切片完全合格数">{{((scope.row.总切片完全合格数/scope.row.总切片数)*100).toFixed(2) }}%</span>
<span v-else>{{ scope.row['剪切￠18.3mm不合格']?scope.row.总切片数 - scope.row['剪切￠18.3mm不合格']+scope.row.暗点合格:scope.row.总切片数}}</span>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -134,34 +128,18 @@ export default {
item.可加工数 = 0; item.可加工数 = 0;
if(item['剪切￠18.3mm不合格']){ if(item['剪切￠18.3mm不合格']){
if(item['剪切￠18.3mm可加工']){ if(item['剪切￠18.3mm可加工']){
item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工']- item['剪切￠18.3mm不合格']; item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含;
}else{ }else{
item.剪切合格 = item.总切片数 - item['剪切￠18.3mm不合格']; item.剪切合格 = item.总切片数 - item['剪切￠18.3mm不合格'].含;
}
if(item.暗点不合格){
item.不合格数 = item['剪切￠18.3mm不合格'] + item.暗点不合格;
item.可加工数 = item.总切片数 - item['剪切￠18.3mm不合格'] - item.暗点不合格;
}else{
item.不合格数 = item['剪切￠18.3mm不合格'];
item.可加工数 = item.总切片数 - item['剪切￠18.3mm不合格'];
} }
}else{ }else{
if(item['剪切￠18.3mm可加工']){ if(item['剪切￠18.3mm可加工']){
item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工']; item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含;
}else{ }else{
item.剪切合格 = item.总切片数; item.剪切合格 = item.总切片数;
} }
if(item.暗点不合格){
item.不合格数 = item.暗点不合格;
item.可加工数 = item.总切片数 - item.暗点不合格;
}else{
item.不合格数 = 0;
item.可加工数 = item.总切片数;
}
} }
}) })
console.log('data',data)
that.tableData = data; that.tableData = data;
}); });
}, },

46
src/views/statistics/bxerp/workerTimes.vue
View File

@ -3,19 +3,19 @@
<el-header> <el-header>
<div class="left-panel"></div> <div class="left-panel"></div>
<div class="right-panel"> <div class="right-panel">
<el-cascader <!-- <el-cascader
v-model="query.dept_name" v-model="query.dept_name"
:options="group" :options="group"
:props="groupsProps" :props="groupsProps"
clearable clearable
:show-all-levels="false" :show-all-levels="false"
@change="deptChange"> @change="deptChange">
</el-cascader> </el-cascader> -->
<!-- <el-input v-model="query.user_name" <el-input v-model="query.user_name"
placeholder="姓名" placeholder="姓名"
clearable clearable
style="width: 200px;" style="width: 200px;"
></el-input> --> ></el-input>
<el-date-picker <el-date-picker
v-model="query.start_date" v-model="query.start_date"
type="date" type="date"
@ -45,23 +45,20 @@
stripe stripe
> >
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="工段" prop="工段"> <el-table-column label="日期" prop="日期" width="120">
</el-table-column> </el-table-column>
<el-table-column label="日期" prop="日期"> <el-table-column label="操作人" prop="操作人" width="120">
</el-table-column>
<el-table-column v-for="item in lists" :key="item" :label="item" :prop="item">
<template #default="scope"> <template #default="scope">
{{ scope.row.年}}-{{ scope.row.月}}-{{ scope.row.日}} {{ scope.row[item] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" prop="操作人"> <!-- <el-table-column label="生产数" prop="生产数">
</el-table-column> <template #default="scope">
<el-table-column label="生产数" prop="生产数"> <span v-for="item in scope.row.list" :key="item">{{ item.text }}:{{ item.value }}、</span>
</el-table-column> </template>
<el-table-column label="合格数" prop="合格数"> </el-table-column> -->
</el-table-column>
<el-table-column label="不合格数" prop="不合格数">
</el-table-column>
<el-table-column label="合格率" prop="合格率">
</el-table-column>
</scTable> </scTable>
</el-main> </el-main>
</el-container> </el-container>
@ -78,7 +75,7 @@ export default {
dept_name:'', dept_name:'',
start_date:'', start_date:'',
}, },
group: [], mgroups: [],
tableData:[], tableData:[],
groupsProps: { groupsProps: {
value: "name", value: "name",
@ -107,8 +104,17 @@ export default {
let that = this; let that = this;
let params = {}; let params = {};
params.query = that.query; params.query = that.query;
that.$API.bi.dataset.exec.req('performance', params).then((res) => { that.$API.bi.dataset.exec.req('lineDay_p', params).then((res) => {
that.tableData = res.data2.ds0; let data = res.data2.ds0;
that.lists = [];
data.forEach(item=>{
let obj = JSON.parse(item.工段物料生产数);
for(let key in obj){
item[key]= obj[key];
if(that.lists.indexOf(key)>-1){}else{that.lists.push(key)}
}
})
that.tableData = data;
}); });
}, },
deptChange(){ deptChange(){