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

6车间看板数据调整

This commit is contained in:
shijing 2024-01-22 17:07:04 +08:00
parent 5538f8354c
commit 0f15a76945
3 changed files with 517 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/scScrollTable.vue
View File

@ -14,9 +14,10 @@
<tr v-for="(itemy, index) in rowData" class="rollData" ref="con1" :key="itemy"> <tr v-for="(itemy, index) in rowData" class="rollData" ref="con1" :key="itemy">
<td>{{ index + 1 }}</td> <td>{{ index + 1 }}</td>
<td v-for="itemz in itemy" :key="itemz"> <td v-for="itemz in itemy" :key="itemz">
<el-progress v-if="itemz.elType=='progress'" :text-inside="true" :stroke-width="14" :percentage="itemz.value" <el-progress v-if="itemz.elType == 'progress'" :text-inside="true"
:status="getStatus(itemz.value)"/> :stroke-width="14" :percentage="itemz.value" :status="getStatus(itemz.value)" />
<el-tag v-else-if="itemz.elType=='tag'" :type="getTagType(itemz.value)">{{ stateOption[itemz.value] }}</el-tag> <el-tag v-else-if="itemz.elType == 'tag'" :type="getTagType(itemz.value)">{{
stateOption[itemz.value] }}</el-tag>
<span v-else>{{ itemz.value }}</span> <span v-else>{{ itemz.value }}</span>
</td> </td>
</tr> </tr>
@ -27,16 +28,12 @@
<td v-for="itemz in itemy" :key="itemz"> <td v-for="itemz in itemy" :key="itemz">
<!-- <el-progress v-if="itemz.elType=='progress'" :text-inside="true" :stroke-width="14" :percentage="itemz.value" <!-- <el-progress v-if="itemz.elType=='progress'" :text-inside="true" :stroke-width="14" :percentage="itemz.value"
:status="getStatus(itemz.value)"/> --> :status="getStatus(itemz.value)"/> -->
<el-progress <el-progress v-if="itemz.elType == 'progress'" :text-inside="true"
v-if="itemz.elType=='progress'" :stroke-width="16" :percentage="itemz.value" :status="getStatus(itemz.value)">
:text-inside="true"
:stroke-width="16"
:percentage="itemz.value"
:status="getStatus(itemz.value)"
>
<span>{{ itemz.value }}</span> <span>{{ itemz.value }}</span>
</el-progress> </el-progress>
<el-tag v-else-if="itemz.elType=='tag'" :type="getTagType(itemz.value)">{{ stateOption[itemz.value] }}</el-tag> <el-tag v-else-if="itemz.elType == 'tag'" :type="getTagType(itemz.value)">{{
stateOption[itemz.value] }}</el-tag>
<span v-else>{{ itemz.value }}</span> <span v-else>{{ itemz.value }}</span>
</td> </td>
</tr> </tr>
@ -142,6 +139,7 @@
}, },
scrollUp() { scrollUp() {
if (this.$refs[`${this.refValue}`] && this.$refs[`${this.refValue}`].scrollTop) {
let scrollTop = this.$refs[`${this.refValue}`].scrollTop; let scrollTop = this.$refs[`${this.refValue}`].scrollTop;
let scrollHeight = this.$refs[`${this.refValue}`].scrollHeight; let scrollHeight = this.$refs[`${this.refValue}`].scrollHeight;
if (scrollTop >= scrollHeight / 2) { if (scrollTop >= scrollHeight / 2) {
@ -150,6 +148,8 @@
} else { } else {
this.$refs[`${this.refValue}`].scrollTop = scrollTop + 40; this.$refs[`${this.refValue}`].scrollTop = scrollTop + 40;
} }
}
}, },
// 鼠标滑过暂停滚动 // 鼠标滑过暂停滚动
mouseOver() { mouseOver() {
@ -185,6 +185,7 @@
height: 200px; height: 200px;
} }
} }
table { table {
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -193,37 +194,46 @@
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
} }
.title { .title {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
} }
table th { table th {
font-size: 14px; font-size: 14px;
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);
} }
table td { table td {
font-size: 14px; font-size: 14px;
height: 40px; height: 40px;
text-align: center; text-align: center;
color: rgba(255, 255, 255, .8); color: rgba(255, 255, 255, .8);
} }
table th,table td{
table th,
table td {
padding: .1rem 0; padding: .1rem 0;
border-bottom: none !important; border-bottom: none !important;
background: none !important; background: none !important;
} }
.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);
} }

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

@ -14,9 +14,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 todayUtask" :key="item.id" style="width:50%;display:inline-block; height: 40px;"> <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> <span style="font-size:12px">{{ item.number }}</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>
@ -33,8 +35,7 @@
<div style="height: 4px;"></div> <div style="height: 4px;"></div>
<div class="boxmain" id="scrollContainer1"> <div class="boxmain" id="scrollContainer1">
<scScrollTavle v-if="table1Visible" :tableHeight="containerHeight1" <scScrollTavle v-if="table1Visible" :tableHeight="containerHeight1"
:rowData="saleOutData" :titleData="liData1" :refValue="refValue1" :rowData="saleOutData" :titleData="liData1" :refValue="refValue1"></scScrollTavle>
></scScrollTavle>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -47,9 +48,8 @@
</div> </div>
<div style="height: 4px;"></div> <div style="height: 4px;"></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" :titleData="liData2" :refValue="refValue2"></scScrollTavle>
></scScrollTavle>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -319,11 +319,19 @@ export default {
this.start_date = start_date; this.start_date = start_date;
this.end_date = end_date; this.end_date = end_date;
this.today = year + '-' + month + '-' + day; this.today = year + '-' + month + '-' + day;
// let yesterday = new Date(date.getTime()-24*60*60*1000); let yesterday = new Date(date.getTime() - 24 * 60 * 60 * 1000);
// this.yesterday = yesterday.getFullYear()+"-" + (yesterday.getMonth()+1) + "-" + yesterday.getDate(); this.yesterday = yesterday.getFullYear() + "-" + (yesterday.getMonth() + 1) + "-" + yesterday.getDate();
let week = date.getDay();//当前时间的week数 let week = yesterday.getDay();//当前时间的week数
console.log(week);
let weekFirst = week - 1;//第一天对应的天数 let weekFirst = week - 1;//第一天对应的天数
let weekLast = 7 - week;//最后一天对应的天数 let weekLast = 7 - week;//最后一天对应的天数
if (week == 0) {
weekFirst = 6;
weekLast = 0;//周日特殊处理
} else {
weekFirst = week - 1;
weekLast = 7 - week;
}
let first = new Date(new Date(date.getTime() - (weekFirst * ondDayTime)));//本周周一 let first = new Date(new Date(date.getTime() - (weekFirst * ondDayTime)));//本周周一
let last = new Date(new Date(date.getTime() + (weekLast * ondDayTime)));//本周周日 let last = new Date(new Date(date.getTime() + (weekLast * ondDayTime)));//本周周日
this.weekFirst = first.getFullYear() + '-' + (first.getMonth() + 1) + '-' + first.getDate(); this.weekFirst = first.getFullYear() + '-' + (first.getMonth() + 1) + '-' + first.getDate();
@ -363,8 +371,8 @@ export default {
getTodayUtask() { getTodayUtask() {
let that = this; let that = this;
let obj = {}; let obj = {};
obj.start_date = this.today; obj.start_date__lte = this.today;
obj.end_date = this.today; obj.end_date__gte = this.today;
obj.belong_dept__name = '6车间'; obj.belong_dept__name = '6车间';
obj.page = 0; obj.page = 0;
that.$API.pm.utask.list.req(obj).then((res) => { that.$API.pm.utask.list.req(obj).then((res) => {
@ -408,37 +416,31 @@ export default {
//本周工序进展 //本周工序进展
getMtask() { getMtask() {
let that = this; let that = this;
let obj ={}; let obj = {
obj.start_date = this.weekFirst; query: { start_date: this.start_date, end_date: this.end_date, dept_name: "6车间" },
obj.end_date = this.weekLast; };
obj.mgroup__belong_dept__name='6车间'; //生产车间按日统计
obj.page=0; that.$API.bi.dataset.exec.req('mgroupWeek', obj).then((res) => {
that.$API.pm.mtask.list.req(obj).then((res) => { let data = res.data2.ds0;
console.log(res); if (data.length > 0) {
if(res.length>0){
let processData = []; let processData = [];
res.forEach(item => { data.forEach(item => {
let arr = [], obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {}, obj5 = {}, obj6 = {}, obj7 = {}, obj8 = {}; let arr = [], obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {}, obj5 = {}, obj6 = {}, obj7 = {}, obj8 = {};
obj1.elType = 'primary'; obj1.elType = 'primary';
obj1.value = item.mgroup_name;//工序 obj1.value = item.工段;//工序
obj2.elType = 'primary'; obj2.elType = 'primary';
obj2.value = item.material_out_.name; obj2.value = item.物料名称;
obj3.elType = 'primary'; obj3.elType = 'primary';
obj3.value = item.material_out_.specification; obj3.value = item.型号;
obj4.elType = 'primary'; obj4.elType = 'primary';
obj4.value = item.count; obj4.value = item.计划数;
obj5.elType = 'primary'; obj5.elType = 'primary';
obj5.value = item.count_ok; obj5.value = item.合格数;
obj6.elType = 'progress'; obj6.elType = 'progress';
let jindu = Math.round((item.count_ok/item.count)*100); let jindu = Math.round((item.完成进度) * 100);
obj6.value = jindu; obj6.value = jindu;
obj7.elType = 'primary'; obj7.elType = 'primary';
let rate = 0; let rate = Math.round((item.合格率) * 100);
if(item.count_real!=0){
rate = Math.round((item.count_ok/item.count_real)*100);
}else{
rate = 0;
}
obj7.value = rate; obj7.value = rate;
arr.push(obj1); arr.push(obj1);
arr.push(obj2); arr.push(obj2);
@ -448,13 +450,60 @@ export default {
arr.push(obj6); arr.push(obj6);
arr.push(obj7); arr.push(obj7);
processData.push(arr); processData.push(arr);
}); });
console.log('processData', processData) console.log('processData', processData)
this.processData = processData; this.processData = processData;
} }
debugger;
}); })
// let obj = {};
// obj.start_date = this.weekFirst;
// obj.end_date = this.weekLast;
// obj.mgroup__belong_dept__name = '6车间';
// obj.page = 0;
// that.$API.pm.mtask.list.req(obj).then((res) => {
// console.log(res);
// if (res.length > 0) {
// let processData = [];
// res.forEach(item => {
// let arr = [], obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {}, obj5 = {}, obj6 = {}, obj7 = {}, obj8 = {};
// obj1.elType = 'primary';
// obj1.value = item.mgroup_name;//工序
// obj2.elType = 'primary';
// obj2.value = item.material_out_.name;
// obj3.elType = 'primary';
// obj3.value = item.material_out_.specification;
// obj4.elType = 'primary';
// obj4.value = item.count;
// obj5.elType = 'primary';
// obj5.value = item.count_ok;
// obj6.elType = 'progress';
// let jindu = Math.round((item.count_ok / item.count) * 100);
// obj6.value = jindu;
// obj7.elType = 'primary';
// let rate = 0;
// if (item.count_real != 0) {
// rate = Math.round((item.count_ok / item.count_real) * 100);
// } else {
// rate = 0;
// }
// obj7.value = rate;
// arr.push(obj1);
// arr.push(obj2);
// arr.push(obj3);
// arr.push(obj4);
// arr.push(obj5);
// arr.push(obj6);
// arr.push(obj7);
// processData.push(arr);
// });
// console.log('processData', processData)
// this.processData = processData;
// }
// debugger;
// });
}, },
//本月生产统计&本月交付统计 //本月生产统计&本月交付统计
getsaleOut() { getsaleOut() {
@ -503,19 +552,7 @@ export default {
chart1Option.xAxis.data = xAxisData1; chart1Option.xAxis.data = xAxisData1;
chart1Option.series[0].data = seriesData11; chart1Option.series[0].data = seriesData11;
chart1Option.series[1].data = seriesData12; chart1Option.series[1].data = seriesData12;
let chart1 = this.setChart("chart1", chart1Option); this.setChart("chart1", chart1Option);
// let index1 = 0
// this.chartInterval1 = setInterval(function () {
// if (index1 < chart1Option.series[0].data.length) {
// chart1.dispatchAction({ type: 'downplay', seriesIndex: 0 });
// chart1.dispatchAction({ type: 'highlight', seriesIndex: 0, dataIndex: index2 });
// chart1.dispatchAction({ type: 'showTip', seriesIndex: 0, dataIndex: index2 });
// index1++;
// } else {
// index1 = 0;
// }
// }, 3000);
// debugger;
}); });
//本月交付统计 //本月交付统计
that.$API.bi.dataset.exec.req('saleOutDay', obj2).then((saleOutRes) => { that.$API.bi.dataset.exec.req('saleOutDay', obj2).then((saleOutRes) => {
@ -560,19 +597,7 @@ export default {
chart2Option.series[1].data = seriesData22; chart2Option.series[1].data = seriesData22;
chart2Option.series[1].label.position = 'top'; chart2Option.series[1].label.position = 'top';
let chart2 = this.setChart("chart2", chart2Option); this.setChart("chart2", chart2Option);
// let index2 = 0
// this.chartInterval2 = setInterval(function () {
// if (index2 < chart2Option.series[0].data.length) {
// chart2.dispatchAction({ type: 'downplay', seriesIndex: 0 });
// chart2.dispatchAction({ type: 'highlight', seriesIndex: 0, dataIndex: index2 });
// chart2.dispatchAction({ type: 'showTip', seriesIndex: 0, dataIndex: index2 });
// index2++;
// } else {
// index2 = 0;
// }
// }, 3000);
// debugger;
}); });
}, },
@ -582,15 +607,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;
background-size: cover; background-size: cover;
font-family: "Microsoft Yahei" !important; font-family: "Microsoft Yahei" !important;
} }
.header { .header {
background: url("/public/img/photon_header.png"); background: url("/public/img/photon_header.png");
border-bottom: none; border-bottom: none;
@ -603,10 +632,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;
@ -614,34 +645,42 @@ 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;
margin-top: 6px margin-top: 6px
} }
.boxmain { .boxmain {
height: calc(100% - 40px); height: calc(100% - 40px);
} }
@media screen and (max-width: 800px) { @media screen and (max-width: 800px) {
.boxmain { .boxmain {
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;
} }
.bigdata { .bigdata {
font-size: 24px; font-size: 24px;
} }
.wrapper { .wrapper {
overflow: hidden; overflow: hidden;
height: 220px; height: 220px;
@ -652,21 +691,26 @@ export default {
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
} }
table th { table th {
font-size: 14px; font-size: 14px;
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);
} }
.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_photon.vue
View File

@ -120,7 +120,10 @@
<div class="border_corner border_right_bottom"></div> <div class="border_corner border_right_bottom"></div>
<p class="title">{{ dialogData.deptName }}</p> <p class="title">{{ dialogData.deptName }}</p>
<div class="infoCantier"> <div class="infoCantier">
<div class="leftBlock"> <div class="leftBlock" v-if="dialogData.deptName == '办公楼'">
<img src="img/gz_logo.png" alt="" style="width:100%">
</div>
<div class="leftBlock" v-else>
<el-progress :width="70" type="circle" color="rgba(54, 217, 187, 1)" :percentage="dialogData.percentage" <el-progress :width="70" type="circle" color="rgba(54, 217, 187, 1)" :percentage="dialogData.percentage"
id="dashbordProcess"> id="dashbordProcess">
<span class="percentage-value" style="font-size: 16px">{{ dialogData.percentage }}%</span> <span class="percentage-value" style="font-size: 16px">{{ dialogData.percentage }}%</span>
@ -129,8 +132,7 @@
</div> </div>
<div class="rightBlock"> <div class="rightBlock">
<div> <div>
<p>昨日产量</p> <p v-if="dialogData.deptName !== '办公楼'">昨日产量</p>
<!-- <p> <span class="numberFont">390</span><span class="numberUnit">件</span></p> -->
</div> </div>
<div class="countWrap"> <div class="countWrap">
<div v-if="dialogData.deptName == '光纤预制管生产车间' || dialogData.deptName == '光学精密加工车间'"> <div v-if="dialogData.deptName == '光纤预制管生产车间' || dialogData.deptName == '光学精密加工车间'">
@ -148,6 +150,10 @@
<p> <span class="numberFont">{{ dialogData.count }}</span><span class="numberUnit">kg</span> <p> <span class="numberFont">{{ dialogData.count }}</span><span class="numberUnit">kg</span>
</p> </p>
</div> </div>
<div v-if="dialogData.deptName == '办公楼'">
<p style="font-size:12px">
公司秉承“善用资源，服务建设”的核心理念，践行“材料创造美好世界”的企业使命，坚持“创新、绩效、和谐、责任”的核心价值观，努力成长为具有创新精神和全球视野的光子材料领先企业。</p>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -160,7 +166,10 @@
<div class="border_corner border_right_bottom"></div> <div class="border_corner border_right_bottom"></div>
<p class="title">{{ currentData.deptName }}</p> <p class="title">{{ currentData.deptName }}</p>
<div class="infoCantier"> <div class="infoCantier">
<div class="leftBlock"> <div class="leftBlock" v-if="currentData.deptName == '办公楼'">
<img src="img/gz_logo.png" alt="" style="margin-top:10px">
</div>
<div class="leftBlock" v-else>
<el-progress :width="100" type="circle" color="rgba(54, 217, 187, 1)" <el-progress :width="100" type="circle" color="rgba(54, 217, 187, 1)"
:percentage="currentData.percentage" id="dashbordProcess"> :percentage="currentData.percentage" id="dashbordProcess">
<span class="percentage-value" style="font-size: 16px">{{ currentData.percentage }}%</span> <span class="percentage-value" style="font-size: 16px">{{ currentData.percentage }}%</span>
@ -169,8 +178,7 @@
</div> </div>
<div class="rightBlock"> <div class="rightBlock">
<div> <div>
<p>昨日产量</p> <p v-if="currentData.deptName !== '办公楼'">昨日产量</p>
<!-- <p> <span class="numberFont">390</span><span class="numberUnit">件</span></p> -->
</div> </div>
<div class="countWrap"> <div class="countWrap">
<div v-if="currentData.deptName == '光纤预制管生产车间' || currentData.deptName == '光学精密加工车间'"> <div v-if="currentData.deptName == '光纤预制管生产车间' || currentData.deptName == '光学精密加工车间'">
@ -190,6 +198,9 @@
<p> <span class="numberFont">{{ currentData.count }}</span><span class="numberUnit">kg</span> <p> <span class="numberFont">{{ currentData.count }}</span><span class="numberUnit">kg</span>
</p> </p>
</div> </div>
<div v-if="currentData.deptName == '办公楼'">
<p>公司秉承“善用资源，服务建设”的核心理念，践行“材料创造美好世界”的企业使命，坚持“创新、绩效、和谐、责任”的核心价值观，努力成长为具有创新精神和全球视野的光子材料领先企业。</p>
</div>
</div> </div>
</div> </div>
<CircleClose class="circleClose" @click="circleClose" /> <CircleClose class="circleClose" @click="circleClose" />
@ -416,7 +427,7 @@ export default {
let cDate = new Date(); let cDate = new Date();
let yesterday = new Date(cDate.getTime() - ondDayTime); let yesterday = new Date(cDate.getTime() - ondDayTime);
let week = yesterday.getDay();//当前时间的week数 let week = yesterday.getDay();//当前时间的week数
console.log(week); // console.log(week);
let weekFirst = week - 1;//第一天对应的天数 let weekFirst = week - 1;//第一天对应的天数
let weekLast = 7 - week;//最后一天对应的天数 let weekLast = 7 - week;//最后一天对应的天数
if (week == 0) { if (week == 0) {
@ -686,7 +697,7 @@ export default {
let countOkDept10 = [0, 0, 0, 0, 0, 0, 0], countRateDept10 = [0, 0, 0, 0, 0, 0, 0]; let countOkDept10 = [0, 0, 0, 0, 0, 0, 0], countRateDept10 = [0, 0, 0, 0, 0, 0, 0];
let countOk_dept10 = 0; let countOk_dept10 = 0;
if (list.length > 0) { if (list.length > 0) {
console.log(this.weekDateList) // console.log(this.weekDateList)
list.forEach(item => { list.forEach(item => {
let index = that.weekDateList.indexOf(item.日); let index = that.weekDateList.indexOf(item.日);
countOkDept10[index] = item.合格数; countOkDept10[index] = item.合格数;
@ -861,7 +872,7 @@ export default {
}); });
} }
that.taskBoard.data = data; that.taskBoard.data = data;
console.log('getMaterialList', data) // console.log('getMaterialList', data)
}) })
}, },
showTime() { showTime() {
@ -1074,7 +1085,7 @@ export default {
const pickResult = scene.pick(scene.pointerX, scene.pointerY); const pickResult = scene.pick(scene.pointerX, scene.pointerY);
if (pickResult.hit) { if (pickResult.hit) {
const mesh = pickResult.pickedMesh; const mesh = pickResult.pickedMesh;
console.log('mesh', mesh) // console.log('mesh', mesh)
if (that.nodesLists[mesh.name]) { if (that.nodesLists[mesh.name]) {
that.getDeptClickData(that.nodesLists[mesh.name]) that.getDeptClickData(that.nodesLists[mesh.name])
hl1Click.removeAllMeshes(); hl1Click.removeAllMeshes();
@ -1119,7 +1130,7 @@ export default {
}, },
getDeptData(name) { getDeptData(name) {
this.infoVisibel = true; this.infoVisibel = true;
console.log('hoverName', name) // console.log('hoverName', name)
if (name == '光学精密加工车间') { //6 if (name == '光学精密加工车间') { //6
this.dialogData = this.dept6Obj; this.dialogData = this.dept6Obj;
} else if (name == '光纤预制棒生产车间') {//7 } else if (name == '光纤预制棒生产车间') {//7
@ -1131,7 +1142,7 @@ export default {
} }
}, },
getDeptClickData(name) { getDeptClickData(name) {
console.log('clickName', name) // console.log('clickName', name)
if (name == '光学精密加工车间') { //6 if (name == '光学精密加工车间') { //6
this.currentData = this.dept6Obj; this.currentData = this.dept6Obj;
} else if (name == '光纤预制棒生产车间') {//7 } else if (name == '光纤预制棒生产车间') {//7
@ -1849,7 +1860,7 @@ export default {
.inforBlock.clickBlock { .inforBlock.clickBlock {
left: 50%; left: 50%;
width: 630px; width: 520px;
height: 225px; height: 225px;
padding: 40px; padding: 40px;
font-size: 16px; font-size: 16px;