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

数据看板今日任务改动

This commit is contained in:
shijing 2024-01-23 09:08:08 +08:00
parent c2d09a0fe1
commit e0dcddfec6
3 changed files with 288 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/views/bigScreen/index_10dept.vue
View File

@ -15,9 +15,11 @@
</div> </div>
<div style="height: 4px;"></div> <div style="height: 4px;"></div>
<div class="boxmain bigdata border" style="overflow:scroll"> <div class="boxmain bigdata border" style="overflow:scroll">
<div v-for="item in todayMtask" :key="item.id" style="height: 40px;"> <div v-for="item in todayMtask" :key="item.id"
<span style="font-size:12px">{{item.material_out_.name}}|{{ item.material_out_.specification }}|{{ item.material_out_.model }}</span> style="height: 40px;line-height: 40px;padding: 0 20px;display: flex;justify-content: space-between;">
<span style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont"> <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 }} {{ item.count }}
</span> </span>
</div> </div>
@ -32,7 +34,9 @@
<div style="height: 4px;"></div> <div style="height: 4px;"></div>
<div class="boxmain flex_center bigdata border"> <div class="boxmain flex_center bigdata border">
<span>{{ yesterdayObjet.物料名 }}</span> <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>
</div> </div>
</el-col> </el-col>
@ -45,7 +49,8 @@
<div class="boxmain bigdata border" style="overflow:scroll"> <div class="boxmain bigdata border" style="overflow:scroll">
<div v-for="item in monthobjList" :key="item.id" style="height: 40px;"> <div v-for="item in monthobjList" :key="item.id" style="height: 40px;">
<span style="font-size:12px">{{ item.物料名 }}</span> <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.合格数 }} {{ item.合格数 }}
</span> </span>
</div> </div>
@ -63,8 +68,7 @@
<div style="height: 2px;"></div> <div style="height: 2px;"></div>
<div class="boxmain" id="scrollContainer1"> <div class="boxmain" id="scrollContainer1">
<scScrollTavle v-if="table1Visible" :tableHeight="containerHeight1" <scScrollTavle v-if="table1Visible" :tableHeight="containerHeight1"
:rowData="attendanceData" :titleData="liData1" :refValue="refValue1" :rowData="attendanceData" :titleData="liData1" :refValue="refValue1"></scScrollTavle>
></scScrollTavle>
</div> </div>
</div> </div>
</el-row> </el-row>
@ -76,8 +80,8 @@
</div> </div>
<div style="height: 2px;"></div> <div style="height: 2px;"></div>
<div class="boxmain" id="scrollContainer2"> <div class="boxmain" id="scrollContainer2">
<scScrollTavle v-if="table2Visible" :tableHeight="containerHeight2" <scScrollTavle v-if="table2Visible" :tableHeight="containerHeight2" :rowData="processData"
:rowData="processData" :titleData="liData2" :refValue="refValue2"></scScrollTavle> :titleData="liData2" :refValue="refValue2"></scScrollTavle>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -631,7 +635,7 @@ export default {
let obj = {}; let obj = {};
obj.start_date = this.today; obj.start_date = this.today;
obj.end_date = this.today; obj.end_date = this.today;
obj.belong_dept__name='10车间'; obj.mgroup__belong_dept__name = '10车间';
obj.page = 0; obj.page = 0;
that.$API.pm.mtask.list.req(obj).then((res) => { that.$API.pm.mtask.list.req(obj).then((res) => {
that.todayMtask = res; that.todayMtask = res;
@ -644,15 +648,19 @@ export default {
</script> </script>
<style scoped> <style scoped>
@font-face { @font-face {
font-family: 'myfont'; /* 字体名称 */ font-family: 'myfont';
src: url('../../utils/youShe.ttf'); /* 字体文件相对路径 */ /* 字体名称 */
src: url('../../utils/youShe.ttf');
/* 字体文件相对路径 */
} }
.dashboard { .dashboard {
background-image: url("/public/img/photon_bg.png"); background-image: url("/public/img/photon_bg.png");
color: #fff; color: #fff;
font-family: "Microsoft Yahei" !important; font-family: "Microsoft Yahei" !important;
background-size: cover; background-size: cover;
} }
.header { .header {
background: url("/public/img/photon_header.png"); background: url("/public/img/photon_header.png");
border-bottom: none; border-bottom: none;
@ -665,10 +673,12 @@ export default {
text-align: center; text-align: center;
padding: 12px 0px; padding: 12px 0px;
} }
.box { .box {
background: rgba(10, 63, 68, 0.5); background: rgba(10, 63, 68, 0.5);
height: 100%; height: 100%;
} }
.boxtitle { .boxtitle {
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
@ -676,10 +686,12 @@ export default {
height: 36px; height: 36px;
background: linear-gradient(40deg, rgba(11, 101, 140, 0.451), rgba(0, 34, 48, 0.335), rgba(11, 101, 140, 0.451)); background: linear-gradient(40deg, rgba(11, 101, 140, 0.451), rgba(0, 34, 48, 0.335), rgba(11, 101, 140, 0.451));
} }
.bgimg { .bgimg {
background-image: url('https://cdn-upload.datav.aliyun.com/upload/download/1678762309227-E6RP8z2R.png'); background-image: url('https://cdn-upload.datav.aliyun.com/upload/download/1678762309227-E6RP8z2R.png');
background-size: 140% 100%; background-size: 140% 100%;
} }
.boxlabel { .boxlabel {
margin-left: 6px; margin-left: 6px;
font-size: 18px; font-size: 18px;
@ -695,11 +707,13 @@ export default {
height: 200px; height: 200px;
} }
} }
.flex_center { .flex_center {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center justify-content: center
} }
.border { .border {
border: 1px dashed #49bcf7; border: 1px dashed #49bcf7;
} }
@ -713,17 +727,21 @@ export default {
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
} }
.marquee_top { .marquee_top {
transition: all 0.5s ease-in-out; transition: all 0.5s ease-in-out;
margin-top: -26px; margin-top: -26px;
} }
.totall { .totall {
color: #fff; color: #fff;
background-color: rgb(10, 63, 68); background-color: rgb(10, 63, 68);
} }
.rollData { .rollData {
background-color: rgb(10, 39, 50); background-color: rgb(10, 39, 50);
} }
.rollData:nth-of-type(2n+1) { .rollData:nth-of-type(2n+1) {
background-color: rgb(0, 59, 81); background-color: rgb(0, 59, 81);
} }

37
src/views/bigScreen/index_6dept.vue
View File

@ -14,14 +14,18 @@
</div> </div>
<div style="height: 4px;"></div> <div style="height: 4px;"></div>
<div class="boxmain bigdata border" style="overflow:scroll"> <div class="boxmain bigdata border" style="overflow:scroll">
<div v-for="item in todayUtask" :key="item.id" <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;">
<span style="font-size:12px">{{ item.number }}</span> <div
style="display:flex;justify-content:space-between;border-bottom:1px dashed #eeeeee">
<span style="font-size:12px">{{ item.material_out_name }}</span>
<span <span
style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont"> style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
{{ item.count }} {{ item.count }}
</span> </span>
</div> </div>
</div>
</div> </div>
</div> </div>
</el-row> </el-row>
@ -282,7 +286,12 @@ export default {
refValue2: 'moocBox2', refValue2: 'moocBox2',
liData1: ['序号', '日期', '名称', '型号', '规格', '发货数量'], liData1: ['序号', '日期', '名称', '型号', '规格', '发货数量'],
liData2: ['序号', '工序', '产品名称', '型号', '计划数量', '合格数量', '完成进度', '合格率'], 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: [], saleOutData: [],
processData: [], processData: [],
time: null, time: null,
@ -338,7 +347,7 @@ export default {
this.weekLast = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate(); this.weekLast = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate();
this.getsaleOut(); this.getsaleOut();
this.getMioItem();//发货情况 this.getMioItem();//发货情况
this.getTodayUtask();//今日任务 // this.getTodayMtask();//今日任务
//昨日工序进度 //昨日工序进度
this.getMtask(); this.getMtask();
//时间 //时间
@ -368,17 +377,23 @@ export default {
}, 500) }, 500)
}, },
//今日任务 //今日任务
getTodayUtask() { getTodayMtask() {
let that = this; let that = this;
let obj = {}; let obj = {};
obj.start_date__lte = this.today; obj.start_date = this.today;
obj.end_date__gte = this.today; obj.end_date = this.today;
obj.belong_dept__name = '6车间'; obj.is_count_utask = true;
obj.mgroup__belong_dept__name = '6车间';
obj.page = 0; obj.page = 0;
that.$API.pm.utask.list.req(obj).then((res) => { that.$API.pm.mtask.list.req(obj).then((res) => {
that.todayUtask = res; that.todayMtask = res;
console.log('今日任务:', res); console.log('今日任务:', res);
}); });
// that.$API.pm.utask.list.req(obj).then((res) => {
// that.todayMtask = res;
// console.log('今日任务:', res);
// });
}, },
//发货情况 //发货情况
getMioItem() { getMioItem() {

13
src/views/bigScreen/index_7dept.vue
View File

@ -12,14 +12,18 @@
<div class="boxlabel">今日任务</div> <div class="boxlabel">今日任务</div>
</div> </div>
<div style="height: 4px;"></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" <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="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 }} {{ item.count }}
</span> </span>
</div> </div>
</div>
</div> </div>
</div> </div>
<div style="height: 1%;"></div> <div style="height: 1%;"></div>
@ -537,7 +541,7 @@ export default {
let obj = {}; let obj = {};
obj.start_date = this.today; obj.start_date = this.today;
obj.end_date = this.today; obj.end_date = this.today;
obj.belong_dept__name = '7车间'; obj.mgroup__belong_dept__name = '7车间';
obj.page = 0; obj.page = 0;
that.$API.pm.mtask.list.req(obj).then((res) => { that.$API.pm.mtask.list.req(obj).then((res) => {
that.todayMtask = res; that.todayMtask = res;
@ -616,6 +620,7 @@ export default {
.bigdata { .bigdata {
font-size: 24px; font-size: 24px;
box-sizing: border-box;
} }
.boxlabel { .boxlabel {