diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index 3174e795..f57791c7 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -69,7 +69,8 @@
- {{ percentage }}%
+ {{ percentage }}%
+
工厂模型加载中
@@ -124,8 +125,8 @@
-
+
{{ dialogData.percentage }}%
完成进度
@@ -137,12 +138,14 @@
光纤预制管
-
{{ dialogData.count_guan }}件
+
{{ dialogData.count_guan }}件
光纤预制棒
-
{{ dialogData.count_bang }}件
+
{{ dialogData.count_bang }}件
@@ -152,7 +155,8 @@
- 公司秉承“善用资源,服务建设”的核心理念,践行“材料创造美好世界”的企业使命,坚持“创新、绩效、和谐、责任”的核心价值观,努力成长为具有创新精神和全球视野的光子材料领先企业。
+ 公司秉承“善用资源,服务建设”的核心理念,践行“材料创造美好世界”的企业使命,坚持“创新、绩效、和谐、责任”的核心价值观,努力成长为具有创新精神和全球视野的光子材料领先企业。
+
@@ -195,11 +199,13 @@
配粉重量
-
{{ currentData.count }}kg
+
{{ currentData.count }}kg
-
公司秉承“善用资源,服务建设”的核心理念,践行“材料创造美好世界”的企业使命,坚持“创新、绩效、和谐、责任”的核心价值观,努力成长为具有创新精神和全球视野的光子材料领先企业。
+
公司秉承“善用资源,服务建设”的核心理念,践行“材料创造美好世界”的企业使命,坚持“创新、绩效、和谐、责任”的核心价值观,努力成长为具有创新精神和全球视野的光子材料领先企业。
+
@@ -256,10 +262,10 @@ export default {
initialBeta: Math.PI / 2,
initialRadius: 2.5,
initialTarget: null,
- scene: null,
- myui: null,
+ // scene: null,
+ // myui: null,
resizeTimeout: null,
- engine: null,
+ // engine: null,
loadedPercent: 0,
currentLightMesh: null,
infoVisibel: false,
@@ -387,8 +393,36 @@ export default {
this.blockTableHeight = height1 + 'px';
document.getElementById('scrollTable').style.height = height1 + 'px'
this.showTime();
- this.getDeptDetail();
+ //一天的毫秒数
+ const ondDayTime = 86400000
+ let cDate = new Date();
+ let yesterday = new Date(cDate.getTime() - ondDayTime);
+ let week = yesterday.getDay();//当前时间的week数
+ // console.log(week);
+ let weekFirst = week - 1;//第一天对应的天数
+ let weekLast = 7 - week;//最后一天对应的天数
+ if (week == 0) {
+ weekFirst = 6;
+ weekLast = 0;//周日特殊处理
+ } else {
+ weekFirst = week - 1;
+ weekLast = 7 - week;
+ }
+ let first = new Date(new Date(yesterday.getTime() - (weekFirst * ondDayTime)));//本周周一
+ let last = new Date(new Date(yesterday.getTime() + (weekLast * ondDayTime)));//本周周日
+ let dateArr = [];
+ for (let i = 0; i < 7; i++) {
+ let itemDate = new Date(first.getTime() + i * ondDayTime);
+ let item = itemDate.getDate();
+ dateArr.push(item);
+ }
+ this.weekDateList = dateArr;
+ this.start_date = first.getFullYear() + '-' + (first.getMonth() + 1) + '-' + first.getDate();
+ this.end_date = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate();
+ this.yesterday = yesterday.getFullYear() + "-" + (yesterday.getMonth() + 1) + "-" + yesterday.getDate();
+
this.$nextTick(() => {
+ this.getDeptDetail();
that.getsaleOut();
that.initDomStyle();
that.initFactory();
@@ -422,35 +456,6 @@ export default {
}, 60000);
that.initChart();
})
- //一天的毫秒数
- const ondDayTime = 86400000
- let cDate = new Date();
- let yesterday = new Date(cDate.getTime() - ondDayTime);
- let week = yesterday.getDay();//当前时间的week数
- // console.log(week);
- let weekFirst = week - 1;//第一天对应的天数
- let weekLast = 7 - week;//最后一天对应的天数
- if (week == 0) {
- weekFirst = 6;
- weekLast = 0;//周日特殊处理
- } else {
- weekFirst = week - 1;
- weekLast = 7 - week;
- }
- let first = new Date(new Date(yesterday.getTime() - (weekFirst * ondDayTime)));//本周周一
- let last = new Date(new Date(yesterday.getTime() + (weekLast * ondDayTime)));//本周周日
- let dateArr = [];
- for (let i = 0; i < 7; i++) {
- let itemDate = new Date(first.getTime() + i * ondDayTime);
- let item = itemDate.getDate();
- dateArr.push(item);
- }
- this.weekDateList = dateArr;
- this.start_date = first.getFullYear() + '-' + (first.getMonth() + 1) + '-' + first.getDate();
- this.end_date = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate();
- this.yesterday = yesterday.getFullYear() + "-" + (yesterday.getMonth() + 1) + "-" + yesterday.getDate();
-
- this.getsaleOut();
this.getPlanRate();
this.getMaterialList();
},