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

混料小数点&#117

This commit is contained in:
shijing 2024-01-18 14:58:57 +08:00
parent 1212162a7e
commit b3edf33de9
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/views/bigScreen/index_photon.vue
View File

@ -350,23 +350,26 @@ export default {
that.showTime();
}, 1000);
that.notokTimer = setInterval(() => {
if (that.deptName == '10车间') {
that.deptName = '7车间'
} else {
that.deptName = '10车间'
}
let deptData = [];
if (that.deptName == '7车间') {
deptData = that.dept7Data;
} else {
deptData = that.dept10Data;
}
that.pieoption.series.data = deptData;
let pieoption = that.pieoption;
let pieDom = document.getElementById('pie');
let pieChart = echarts.init(pieDom);
pieChart.clear();
pieChart.setOption(pieoption, true);
if(pieDom){
if (that.deptName == '10车间') {
that.deptName = '7车间'
} else {
that.deptName = '10车间'
}
let deptData = [];
if (that.deptName == '7车间') {
deptData = that.dept7Data;
} else {
deptData = that.dept10Data;
}
that.pieoption.series.data = deptData;
let pieoption = that.pieoption;
let pieChart = echarts.init(pieDom);
pieChart.clear();
pieChart.setOption(pieoption, true);
}
}, 5000);
that.initChart();
@ -1599,9 +1602,19 @@ export default {
this.currentObj.deptName = '';
},
},
beforeUnmount() {
let that = this;
clearInterval(that.timerTime);
clearInterval(that.notokTimer);
that.timerTime = null;
that.notokTimer = null;
},
beforeDestoryed() {
clearInterval(timerTime);
this.timerTime = null;
let that = this;
clearInterval(that.timerTime);
clearInterval(that.notokTimer);
that.timerTime = null;
that.notokTimer = null;
},
}

6
src/views/wpm/mlog_hun.vue
View File

@ -22,6 +22,9 @@
<el-table-column label="数量/桶数" prop="count_real">
</el-table-column>
<el-table-column label="每桶重量/kg" prop="count_real_eweight">
<template #default="scope">
<span v-if="scope.row.count_real_eweight"> {{ scope.row.count_real_eweight.toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="配料人" prop="handle_user_name">
<template #default="scope">
@ -70,6 +73,9 @@
<el-table-column label="数量/桶数" prop="count">
</el-table-column>
<el-table-column label="每桶重量/kg" prop="count_eweight">
<template #default="scope">
<span v-if="scope.row.count_eweight"> {{ scope.row.count_eweight.toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="交送人" prop="send_user_name">
</el-table-column>

6
src/views/wpm/worktask_form.vue
View File

@ -1216,7 +1216,11 @@ export default {
let number = item.number;
let equipment_number = number.substring(number.length - 1);
this.equipment_number = equipment_number;
this.form.batch=this.material_model+'-'+equipment_number+'-'+this.dateNow+'-'+this.form.index;
let index= this.form.index
if(index!==undefined&&index!==''&&index!==null){
index=''
}
this.form.batch=this.material_model+'-'+equipment_number+'-'+this.dateNow+'-'+index;
}
})
},