From 55900c9b6519dbe3d0f02f914a1cb2b2be22a6a9 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 15 五月 2024 09:45:21 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/station-live.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index ea9c12c..4a63168 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-19 18:26:26
+ * @LastEditTime: 2024-05-15 09:44:50
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -86,7 +86,7 @@
<el-table-column prop="temdata" label="寰呮満"></el-table-column>
<el-table-column prop="temdata" label="鎶ヨ"></el-table-column>
<el-table-column prop="temdata" label="杩愯"></el-table-column>
- <el-table-column prop="perdata" label="绋煎姩鐜�%"></el-table-column>
+ <el-table-column prop="oee" label="绋煎姩鐜�%"></el-table-column>
<el-table-column prop="perdata" label="鎶ヨ鐜�%"></el-table-column>
</el-table>
</div>
@@ -116,6 +116,7 @@
<save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog>
</template>
<script>
+ import moment from 'moment'
import * as echarts from 'echarts';
import saveDialog from './add-station-status'
export default {
@@ -233,7 +234,7 @@
},
xAxis: {
type: 'category',
- data: ['00:00:00', '02:00:00', '04:00:00', '06:00:00', '08:00:00', '10:00:00', '12:00:00', '14:00:00', '18:00:00'],
+ data: [],
},
yAxis: {
type: 'category',
@@ -297,7 +298,7 @@
},
mounted(){
this.newDate(); //鑾峰彇褰撳墠鏃ユ湡
- this.getTreeList();
+ this.getTreeList(this.$route.query.code);
},
components: {
saveDialog
@@ -347,7 +348,6 @@
item.temdata = "00:00:00";
item.perdata = "0";
})
- console.log(res.data,980)
this.recordData = res.data;
}
})
@@ -365,6 +365,24 @@
item.value = 0;
})
this.wcsOptionLog.series[0].data = res.data;
+ //璁＄畻鏃堕棿
+ var startOfDay = moment().startOf('day'); //00:00:00
+ var now = moment(); //褰撳墠鏃堕棿
+ var diffInMilliseconds = now.diff(startOfDay); //鏃堕棿宸�
+ var diffInHours = Math.floor(diffInMilliseconds / (1000 * 60 * 60)); //鏃堕棿宸浆鎹㈡垚灏忔椂
+ //鍒嗗壊
+ var everTime = Math.ceil(diffInHours/8);
+ var arrData = [];
+ for(var i=0;i<=diffInHours;i+=everTime) {
+ if(i<=10) {
+ var num = '0' + i;
+ }else {
+ var num = i;
+ }
+ arrData.push(num + ':00:00');
+ }
+ //璁＄畻鏃堕棿缁撴潫
+ this.wcsOptionLog.xAxis.data = [...arrData,moment().format("HH:mm:ss")];
myChart.setOption(this.wcsOptionLog);
}
})
@@ -425,7 +443,6 @@
})
this.wcsOptionR.series[0].data = res.data;
myChart.setOption(this.wcsOptionR);
- console.log(res.data)
}
})
},
@@ -518,7 +535,7 @@
})
return tree;
},
- getTreeList(flag) {
+ getTreeList(id) {
var obj = {
groupCategory: 1,
groupType: "group_workstation"
@@ -529,10 +546,14 @@
var treeDisabled = this.addTreeDisable(res.data);
this.tableData = this.buildTree(treeDisabled); //浠庢墎骞冲寲鍙樹负鏍戠姸缁撴瀯
this.$nextTick(()=> {
- this.lastLevelId = this.getLastLevelIds(this.tableData).lastLevelId;
+ if(id) {
+ this.lastLevelId = id; //鎸囧畾id
+ }else {
+ this.lastLevelId = this.getLastLevelIds(this.tableData).lastLevelId;
+ }
this.$refs.treeRef.setCurrentKey(this.lastLevelId); //绗竴涓妭鐐圭殑绗竴涓瓙鑺傜偣鏈�鍚庝竴绾ч粯璁ら�変腑
//浠ヤ笅鏄垵濮嬪寲鏁版嵁
- this.getlist(); //娓叉煋鍙嶉鍒楄〃
+ this.getlist(); //娓叉煋璇︽儏鍜�(鐘舵�乴ist)
this.getwcsLcolor(); //宸︿晶鍥捐〃
this.getwcsR(); //鍙充晶鍥炬爣
this.getachievements(); //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
@@ -760,7 +781,7 @@
position: absolute;
right: 10px;
top: -2px;
- color: #3b8e8e;
+ color: #409eff;
cursor: pointer;
}
.status-wrap.align-left, .status-wrap:first-child {
@@ -773,7 +794,7 @@
justify-content: start;
}
.collect-status {
- color: #3b8e8e;
+ color: #409eff;
margin-right: 16px;
font-size: 14px;
}
@@ -791,10 +812,7 @@
}
.status-wrap {
display: flex;
- -ms-flex-wrap: wrap;
flex-wrap: wrap;
- -webkit-box-pack: start;
- -ms-flex-pack: start;
justify-content: start;
}
.status-wrap .status-con {
@@ -803,6 +821,6 @@
flex-wrap: wrap;
}
.status-wrap /deep/ .el-checkbox.el-checkbox--large {
- color: #3b8e8e;
+ color: #409eff;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3