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 | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 0afc929..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-23 17:08:42
+ * @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',
@@ -364,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);
}
})
@@ -458,7 +477,6 @@
this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
if(res.code == 200) {
this.dmpList = res.data;
- console.log(this.dmpList,1)
}
})
},
@@ -763,7 +781,7 @@
position: absolute;
right: 10px;
top: -2px;
- color: #3b8e8e;
+ color: #409eff;
cursor: pointer;
}
.status-wrap.align-left, .status-wrap:first-child {
@@ -776,7 +794,7 @@
justify-content: start;
}
.collect-status {
- color: #3b8e8e;
+ color: #409eff;
margin-right: 16px;
font-size: 14px;
}
@@ -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