数据看板今日任务改动
This commit is contained in:
parent
c2d09a0fe1
commit
e0dcddfec6
|
|
@ -15,9 +15,11 @@
|
|||
</div>
|
||||
<div style="height: 4px;"></div>
|
||||
<div class="boxmain bigdata border" style="overflow:scroll">
|
||||
<div v-for="item in todayMtask" :key="item.id" style="height: 40px;">
|
||||
<span style="font-size:12px">{{item.material_out_.name}}|{{ item.material_out_.specification }}|{{ item.material_out_.model }}</span>
|
||||
<span style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
|
||||
<div v-for="item in todayMtask" :key="item.id"
|
||||
style="height: 40px;line-height: 40px;padding: 0 20px;display: flex;justify-content: space-between;">
|
||||
<span style="font-size:12px">{{ item.material_out_name }}</span>
|
||||
<span
|
||||
style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
|
||||
{{ item.count }}
|
||||
</span>
|
||||
</div>
|
||||
|
|
@ -32,7 +34,9 @@
|
|||
<div style="height: 4px;"></div>
|
||||
<div class="boxmain flex_center bigdata border">
|
||||
<span>{{ yesterdayObjet.物料名 }}</span>
|
||||
<span style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">{{yesterdayObjet.合格数}}</span>
|
||||
<span
|
||||
style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">{{
|
||||
yesterdayObjet.合格数 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
|
|
@ -45,7 +49,8 @@
|
|||
<div class="boxmain bigdata border" style="overflow:scroll">
|
||||
<div v-for="item in monthobjList" :key="item.id" style="height: 40px;">
|
||||
<span style="font-size:12px">{{ item.物料名 }}</span>
|
||||
<span style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
|
||||
<span
|
||||
style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
|
||||
{{ item.合格数 }}
|
||||
</span>
|
||||
</div>
|
||||
|
|
@ -63,8 +68,7 @@
|
|||
<div style="height: 2px;"></div>
|
||||
<div class="boxmain" id="scrollContainer1">
|
||||
<scScrollTavle v-if="table1Visible" :tableHeight="containerHeight1"
|
||||
:rowData="attendanceData" :titleData="liData1" :refValue="refValue1"
|
||||
></scScrollTavle>
|
||||
:rowData="attendanceData" :titleData="liData1" :refValue="refValue1"></scScrollTavle>
|
||||
</div>
|
||||
</div>
|
||||
</el-row>
|
||||
|
|
@ -76,8 +80,8 @@
|
|||
</div>
|
||||
<div style="height: 2px;"></div>
|
||||
<div class="boxmain" id="scrollContainer2">
|
||||
<scScrollTavle v-if="table2Visible" :tableHeight="containerHeight2"
|
||||
:rowData="processData" :titleData="liData2" :refValue="refValue2"></scScrollTavle>
|
||||
<scScrollTavle v-if="table2Visible" :tableHeight="containerHeight2" :rowData="processData"
|
||||
:titleData="liData2" :refValue="refValue2"></scScrollTavle>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
|
|
@ -631,7 +635,7 @@ export default {
|
|||
let obj = {};
|
||||
obj.start_date = this.today;
|
||||
obj.end_date = this.today;
|
||||
obj.belong_dept__name='10车间';
|
||||
obj.mgroup__belong_dept__name = '10车间';
|
||||
obj.page = 0;
|
||||
that.$API.pm.mtask.list.req(obj).then((res) => {
|
||||
that.todayMtask = res;
|
||||
|
|
@ -644,15 +648,19 @@ export default {
|
|||
</script>
|
||||
<style scoped>
|
||||
@font-face {
|
||||
font-family: 'myfont'; /* 字体名称 */
|
||||
src: url('../../utils/youShe.ttf'); /* 字体文件相对路径 */
|
||||
font-family: 'myfont';
|
||||
/* 字体名称 */
|
||||
src: url('../../utils/youShe.ttf');
|
||||
/* 字体文件相对路径 */
|
||||
}
|
||||
|
||||
.dashboard {
|
||||
background-image: url("/public/img/photon_bg.png");
|
||||
color: #fff;
|
||||
font-family: "Microsoft Yahei" !important;
|
||||
background-size: cover;
|
||||
}
|
||||
|
||||
.header {
|
||||
background: url("/public/img/photon_header.png");
|
||||
border-bottom: none;
|
||||
|
|
@ -665,10 +673,12 @@ export default {
|
|||
text-align: center;
|
||||
padding: 12px 0px;
|
||||
}
|
||||
|
||||
.box {
|
||||
background: rgba(10, 63, 68, 0.5);
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.boxtitle {
|
||||
color: #fff;
|
||||
font-size: 16px;
|
||||
|
|
@ -676,10 +686,12 @@ export default {
|
|||
height: 36px;
|
||||
background: linear-gradient(40deg, rgba(11, 101, 140, 0.451), rgba(0, 34, 48, 0.335), rgba(11, 101, 140, 0.451));
|
||||
}
|
||||
|
||||
.bgimg {
|
||||
background-image: url('https://cdn-upload.datav.aliyun.com/upload/download/1678762309227-E6RP8z2R.png');
|
||||
background-size: 140% 100%;
|
||||
}
|
||||
|
||||
.boxlabel {
|
||||
margin-left: 6px;
|
||||
font-size: 18px;
|
||||
|
|
@ -695,11 +707,13 @@ export default {
|
|||
height: 200px;
|
||||
}
|
||||
}
|
||||
|
||||
.flex_center {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center
|
||||
}
|
||||
|
||||
.border {
|
||||
border: 1px dashed #49bcf7;
|
||||
}
|
||||
|
|
@ -713,17 +727,21 @@ export default {
|
|||
line-height: 40px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.marquee_top {
|
||||
transition: all 0.5s ease-in-out;
|
||||
margin-top: -26px;
|
||||
}
|
||||
|
||||
.totall {
|
||||
color: #fff;
|
||||
background-color: rgb(10, 63, 68);
|
||||
}
|
||||
|
||||
.rollData {
|
||||
background-color: rgb(10, 39, 50);
|
||||
}
|
||||
|
||||
.rollData:nth-of-type(2n+1) {
|
||||
background-color: rgb(0, 59, 81);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,18 @@
|
|||
</div>
|
||||
<div style="height: 4px;"></div>
|
||||
<div class="boxmain bigdata border" style="overflow:scroll">
|
||||
<div v-for="item in todayUtask" :key="item.id"
|
||||
style="width:50%;display:inline-block; height: 40px;">
|
||||
<span style="font-size:12px">{{ item.number }}</span>
|
||||
<div v-for="item in todayMtask" :key="item.id"
|
||||
style="width:50%;display:inline-block;height: 40px;line-height:40px;padding:0 20px;">
|
||||
<div
|
||||
style="display:flex;justify-content:space-between;border-bottom:1px dashed #eeeeee">
|
||||
<span style="font-size:12px">{{ item.material_out_name }}</span>
|
||||
<span
|
||||
style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
|
||||
{{ item.count }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-row>
|
||||
|
|
@ -282,7 +286,12 @@ export default {
|
|||
refValue2: 'moocBox2',
|
||||
liData1: ['序号', '日期', '名称', '型号', '规格', '发货数量'],
|
||||
liData2: ['序号', '工序', '产品名称', '型号', '计划数量', '合格数量', '完成进度', '合格率'],
|
||||
todayUtask: [],
|
||||
todayMtask: [
|
||||
{ material_out_name: '光纤预制棒|33*470|ZJ2|棒料成型', count: 300 },
|
||||
{ material_out_name: '光纤预制棒|33*470|ZJ2|棒料成型', count: 300 },
|
||||
{ material_out_name: '光纤预制棒|33*470|ZJ2|棒料成型', count: 300 },
|
||||
{ material_out_name: '光纤预制棒|33*470|ZJ2|棒料成型', count: 300 },
|
||||
],
|
||||
saleOutData: [],
|
||||
processData: [],
|
||||
time: null,
|
||||
|
|
@ -338,7 +347,7 @@ export default {
|
|||
this.weekLast = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate();
|
||||
this.getsaleOut();
|
||||
this.getMioItem();//发货情况
|
||||
this.getTodayUtask();//今日任务
|
||||
// this.getTodayMtask();//今日任务
|
||||
//昨日工序进度
|
||||
this.getMtask();
|
||||
//时间
|
||||
|
|
@ -368,17 +377,23 @@ export default {
|
|||
}, 500)
|
||||
},
|
||||
//今日任务
|
||||
getTodayUtask() {
|
||||
getTodayMtask() {
|
||||
let that = this;
|
||||
let obj = {};
|
||||
obj.start_date__lte = this.today;
|
||||
obj.end_date__gte = this.today;
|
||||
obj.belong_dept__name = '6车间';
|
||||
obj.start_date = this.today;
|
||||
obj.end_date = this.today;
|
||||
obj.is_count_utask = true;
|
||||
obj.mgroup__belong_dept__name = '6车间';
|
||||
obj.page = 0;
|
||||
that.$API.pm.utask.list.req(obj).then((res) => {
|
||||
that.todayUtask = res;
|
||||
that.$API.pm.mtask.list.req(obj).then((res) => {
|
||||
that.todayMtask = res;
|
||||
console.log('今日任务:', res);
|
||||
});
|
||||
|
||||
// that.$API.pm.utask.list.req(obj).then((res) => {
|
||||
// that.todayMtask = res;
|
||||
// console.log('今日任务:', res);
|
||||
// });
|
||||
},
|
||||
//发货情况
|
||||
getMioItem() {
|
||||
|
|
|
|||
|
|
@ -12,14 +12,18 @@
|
|||
<div class="boxlabel">今日任务</div>
|
||||
</div>
|
||||
<div style="height: 4px;"></div>
|
||||
<div class="boxmain bigdata border" style="overflow:scroll">
|
||||
<div class="boxmain bigdata border" style="overflow:scroll;padding:5px;">
|
||||
<div v-for="item in todayMtask" :key="item.id"
|
||||
style="width:50%;display:inline-block; height: 40px;">
|
||||
style="width:50%;display:inline-block;height: 40px;line-height:40px;padding:0 20px;">
|
||||
<div style="display:flex;justify-content:space-between;border-bottom:1px dashed #eeeeee">
|
||||
<span style="font-size:12px">{{ item.material_out_name }}</span>
|
||||
<span style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
|
||||
<span
|
||||
style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
|
||||
{{ item.count }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 1%;"></div>
|
||||
|
|
@ -537,7 +541,7 @@ export default {
|
|||
let obj = {};
|
||||
obj.start_date = this.today;
|
||||
obj.end_date = this.today;
|
||||
obj.belong_dept__name = '7车间';
|
||||
obj.mgroup__belong_dept__name = '7车间';
|
||||
obj.page = 0;
|
||||
that.$API.pm.mtask.list.req(obj).then((res) => {
|
||||
that.todayMtask = res;
|
||||
|
|
@ -616,6 +620,7 @@ export default {
|
|||
|
||||
.bigdata {
|
||||
font-size: 24px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.boxlabel {
|
||||
|
|
|
|||
Loading…
Reference in New Issue