feat:禅道148减薄车间看板变动
This commit is contained in:
parent
9b73e7eb32
commit
de715b4ae3
|
|
@ -6,9 +6,10 @@
|
|||
</el-header>
|
||||
<el-main>
|
||||
<!-- 减薄 -->
|
||||
<el-row style="height: 30%" :gutter="10">
|
||||
<el-row style="height: 60%" :gutter="10">
|
||||
<el-col :span="12" style="height: 100%">
|
||||
<!-- 设备状态 -->
|
||||
<el-col :span="10" style="height: 100%">
|
||||
<el-col style="height: 50%">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">
|
||||
|
|
@ -36,23 +37,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
<!-- 任务列表 -->
|
||||
<el-col :span="14" style="height: 100%">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">减薄任务列表</div>
|
||||
</div>
|
||||
<div style="height: 2px"></div>
|
||||
<div class="boxmain" id="scrollContainer">
|
||||
<dv-scroll-board :config="configDataTask" style="width:98%;margin:auto" />
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div style="height: 0.3%"></div>
|
||||
<el-row style="height: 30%" :gutter="10">
|
||||
<!-- 库存 -->
|
||||
<el-col :span="10" style="height: 100%">
|
||||
<el-col style="height: 50%">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">
|
||||
|
|
@ -65,41 +51,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
<!-- 交接 -->
|
||||
<el-col :span="14" style="height: 100%">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">减薄交接</div>
|
||||
</div>
|
||||
<div style="height: 2px"></div>
|
||||
<div class="boxmain" id="scrollContainer">
|
||||
<dv-scroll-board :config="configDataHandover" style="width:98%;margin:auto" />
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- 生产统计 分析 -->
|
||||
<div style="height: 0.3%"></div>
|
||||
<el-row style="height: 39%" :gutter="10">
|
||||
<!-- 折线图 日加工数、日合格数、日合格率，近七天数据 -->
|
||||
<el-col :xs="8" :md="8" style="height: 100%;">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">合格数统计</div>
|
||||
</div>
|
||||
<div class="boxmain boxmainbottom" id="chart1"></div>
|
||||
</div>
|
||||
</el-col>
|
||||
<!-- 饼状图 各不合格品 原因占比 -->
|
||||
<el-col :xs="8" :md="8" style="height: 100%;">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">不合格占比统计</div>
|
||||
</div>
|
||||
<div class="boxmain boxmainbottom" id="chart2"></div>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :xs="8" :md="8" style="height: 100%;">
|
||||
<el-col :span="12" style="height: 100%">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">生产数统计</div>
|
||||
|
|
@ -118,7 +71,30 @@
|
|||
<span class="totalStaticItem totalStaticItemNum">{{ sctj.rhgs }}</span>
|
||||
<span class="totalStaticItem totalStaticItemNum">{{ sctj.rbhgs }}</span>
|
||||
</div>
|
||||
<dv-scroll-board :config="configDatas" class="boxmain boxmainbottom" style="width:98%;margin:auto" />
|
||||
<dv-scroll-board :config="configDatas" class="boxmain boxmainTopRight" style="width:98%;margin:auto" />
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div style="height: 0.3%"></div>
|
||||
<!-- 生产统计 分析 -->
|
||||
<div style="height: 0.3%"></div>
|
||||
<el-row style="height: 39%" :gutter="10">
|
||||
<!-- 折线图 日加工数、日合格数、日合格率，近七天数据 -->
|
||||
<el-col :span="12" style="height: 100%;">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">合格数统计</div>
|
||||
</div>
|
||||
<div class="boxmain boxmainbottom" id="chart1"></div>
|
||||
</div>
|
||||
</el-col>
|
||||
<!-- 饼状图 各不合格品 原因占比 -->
|
||||
<el-col :span="12" style="height: 100%;">
|
||||
<div class="box">
|
||||
<div class="boxtitle">
|
||||
<div class="boxlabel">不合格占比统计</div>
|
||||
</div>
|
||||
<div class="boxmain boxmainbottom" id="chart2"></div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -264,7 +240,6 @@ export default {
|
|||
wyx:0,
|
||||
gz:0,
|
||||
},
|
||||
|
||||
sctj:{
|
||||
rtcs:0,
|
||||
rjgs:0,
|
||||
|
|
@ -277,7 +252,7 @@ export default {
|
|||
chartInterval2: null,
|
||||
//库存
|
||||
configDataInm:{
|
||||
header:['物料名称','批次号','数量','生产中数量'],
|
||||
header:['物料名称','批次号','数量','生产中'],
|
||||
headerBGC:'#0a3f44',
|
||||
headerHeight:40,
|
||||
align:'center',
|
||||
|
|
@ -312,6 +287,7 @@ export default {
|
|||
headerHeight:40,
|
||||
data:[]
|
||||
},
|
||||
page:1,
|
||||
currentTime: "",
|
||||
currentDay: "",
|
||||
today: "",
|
||||
|
|
@ -323,6 +299,8 @@ export default {
|
|||
},
|
||||
mounted() {
|
||||
let that = this;
|
||||
that.page = 1;
|
||||
that.configDataInm.data = [];
|
||||
//表格table的高度
|
||||
this.tableHeight = document.getElementById("scrollContainer").clientHeight;
|
||||
this.showTime();
|
||||
|
|
@ -340,7 +318,6 @@ export default {
|
|||
let dayitem = Number(dates[2]);
|
||||
that.daysList.push(dayitem);
|
||||
})
|
||||
console.log('that.daysList',that.daysList);
|
||||
that.today = new Date().toISOString().split('T')[0]
|
||||
// console.log('new Date', new Date().toISOString().split('T'))
|
||||
this.xAxisData = xAxisData;
|
||||
|
|
@ -359,13 +336,14 @@ export default {
|
|||
//设备数据
|
||||
that.getEqState(item.id);
|
||||
//库存统计
|
||||
this.getMaterials(item.id);
|
||||
// this.getMaterials(item.id);
|
||||
//交接列表
|
||||
this.getHandover(item.id);
|
||||
// this.getHandover(item.id);
|
||||
})
|
||||
})
|
||||
this.getMaterials(that.page);
|
||||
//任务进度
|
||||
this.getMtask();
|
||||
// this.getMtask();
|
||||
//投产/生产分析
|
||||
this.getProductLine();
|
||||
this.getCountnotok();
|
||||
|
|
@ -618,19 +596,22 @@ export default {
|
|||
});
|
||||
},
|
||||
//库存统计列表
|
||||
getMaterials() {
|
||||
getMaterials(page) {
|
||||
let that = this;
|
||||
that.$API.wpm.wmaterial.list.req({ page: 0,mgroup__name__in:'减薄A,减薄B' }).then((res) => {
|
||||
that.configDataInm.data = [];
|
||||
if(res.length>0){
|
||||
res.forEach((item) => {
|
||||
that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'减薄A,减薄B' }).then((res) => {
|
||||
if(res.results.length>0){
|
||||
res.results.forEach((item) => {
|
||||
let arr = [];
|
||||
arr[0] = item.material_name;
|
||||
arr[1] = item.batch;
|
||||
arr[2] = item.count;
|
||||
arr[2] = item.count_working;
|
||||
arr[3] = item.count_working;
|
||||
that.configDataInm.data.push(arr);
|
||||
})
|
||||
if(res.count>that.configDataInm.data.length){
|
||||
that.page++;
|
||||
that.getMaterials(that.page);
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
@ -730,6 +711,9 @@ export default {
|
|||
.boxmain.boxmainbottom{
|
||||
height: calc(100% - 38px);
|
||||
}
|
||||
.boxmain.boxmainTopRight{
|
||||
height: calc(100% - 120px);
|
||||
}
|
||||
.lineDiv {
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue