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

fix:光芯大屏任务产量展示二次超洗数量，精雕改为倒角

This commit is contained in:
shijing 2025-06-12 13:48:24 +08:00
parent 7eff9f3505
commit c5fd2ee402
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/bigScreen/index_gx.vue
View File

@ -170,7 +170,7 @@
</div> </div>
</div> </div>
<div class="flexItem3"> <div class="flexItem3">
<div class="flexItem3_title">精雕</div> <div class="flexItem3_title">倒角</div>
<div class="flexItem3Body"> <div class="flexItem3Body">
<dv-scroll-board <dv-scroll-board
:config="configData2" :config="configData2"
@ -245,7 +245,7 @@ const baseOption={
}, },
grid:{ grid:{
top: '20%', top: '20%',
bottom: '10%', bottom: 0,
}, },
xAxis:{ xAxis:{
type: 'category', type: 'category',
@ -265,21 +265,22 @@ const baseOption={
yAxis:[ yAxis:[
{ {
type: 'value', type: 'value',
name: '数量', // name: '数量',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#fff', color: '#fff',
} }
}, },
axisLabel: { axisLabel: {
fontSize: 10, fontSize: 8,
color: '#fff', color: '#fff',
top: 10,
}, },
}, },
{ {
type: "value", type: "value",
name: "合格率", // name: "合格率",
position: "right", position: "right",
alignTicks: true, alignTicks: true,
offset: 0, offset: 0,
@ -299,7 +300,7 @@ const baseOption={
itemWidth: 12, itemWidth: 12,
itemHeight: 12, itemHeight: 12,
left: 'center', left: 'center',
bottom: '0.5%', top: '0.5%',
textStyle: { textStyle: {
color: '#fff', color: '#fff',
fontSize: 10, fontSize: 10,
@ -694,7 +695,7 @@ export default {
let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth; let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
let day = that.currentDay>9?that.currentDay:'0'+that.currentDay; let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
let current_date = that.currentYear+'-'+month+'-'+day; let current_date = that.currentYear+'-'+month+'-'+day;
let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'三次超洗'}}; let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'二次超洗'}};
that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => { that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => {
if(res0.data2.ds0&&res0.data2.ds0.length>0){ if(res0.data2.ds0&&res0.data2.ds0.length>0){
that.count_day = res0.data2.ds0[0].生产数; that.count_day = res0.data2.ds0[0].生产数;
@ -708,7 +709,7 @@ export default {
let first = new Date(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一 let first = new Date(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一
let last = new Date(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日 let last = new Date(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日
let objWeek = {query:{ let objWeek = {query:{
start_date:first,end_date:last,mgroup_name:'三次超洗', start_date:first,end_date:last,mgroup_name:'二次超洗',
group_bys_date:',月,周',order_bys_date:',月,周', group_bys_date:',月,周',order_bys_date:',月,周',
select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月,EXTRACT(WEEK FROM mlog.work_end_time) AS 周' select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月,EXTRACT(WEEK FROM mlog.work_end_time) AS 周'
}}; }};
@ -720,7 +721,7 @@ export default {
let start_month = that.currentYear+'-'+month+'-01'; let start_month = that.currentYear+'-'+month+'-01';
let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate(); let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate();
let objMonth = {query:{ let objMonth = {query:{
start_date:start_month,end_date:end_month,mgroup_name:'三次超洗', start_date:start_month,end_date:end_month,mgroup_name:'二次超洗',
group_bys_date:',月',order_bys_date:',月', group_bys_date:',月',order_bys_date:',月',
select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月' select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月'
}}; }};
@ -884,7 +885,7 @@ export default {
}else if(data[i].name=='减薄A'){ }else if(data[i].name=='减薄A'){
that.getProcessDatas(data[i].name,1); that.getProcessDatas(data[i].name,1);
that.getProcessCount(data[i].name,1); that.getProcessCount(data[i].name,1);
}else if(data[i].name=='精雕'){ }else if(data[i].name=='倒角'){
that.getProcessDatas(data[i].name,2); that.getProcessDatas(data[i].name,2);
that.getProcessCount(data[i].name,2); that.getProcessCount(data[i].name,2);
}else if(data[i].name=='成品抛'){ }else if(data[i].name=='成品抛'){
@ -913,12 +914,12 @@ export default {
// let current_date = that.currentYear+'-'+month+'-'+day; // let current_date = that.currentYear+'-'+month+'-'+day;
// let obj = {query:{current_date:current_date,mgroup_name:name}}; // let obj = {query:{current_date:current_date,mgroup_name:name}};
// that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => { // that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => {
let keys = 'configData'+index;
that[keys] = that.deepCopy(configData);
that[keys].data = [];
that.$API.wpm.ana.batchwork.req({mgroup_name:name}).then((res) => { that.$API.wpm.ana.batchwork.req({mgroup_name:name}).then((res) => {
if(res.length>0){ if(res.length>0){
//根据工段名称分组 //根据工段名称分组
let keys = 'configData'+index;
that[keys] = that.deepCopy(configData);
that[keys].data = [];
res.forEach((item) => { res.forEach((item) => {
let arr = []; let arr = [];
arr[0] = item.batch; arr[0] = item.batch;