From 698bbdfcbbe4939b0427c022eea67e45f58fd253 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 15:51:21 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/home/widgets/components/mdcEquipmentRun.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/views/home/widgets/components/mdcEquipmentRun.vue b/src/views/home/widgets/components/mdcEquipmentRun.vue
index 584fc2b..0cdf4a5 100644
--- a/src/views/home/widgets/components/mdcEquipmentRun.vue
+++ b/src/views/home/widgets/components/mdcEquipmentRun.vue
@@ -1,8 +1,8 @@
<!--
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-16 15:22:46
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-21 10:24:23
+ * @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
+ * @LastEditTime: 2025-11-18 12:36:09
* @FilePath: /CPSnew/smart-web/src/views/home/widgets/components/mdcDeviceStatus.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -191,7 +191,7 @@
return newData
},
getParentData() {
- this.$HTTP.post('/api/blade-cps/group/groupWorkstation/type', {
+ this.$HTTP.post('/api/smis/group/groupWorkstation/type', {
groupCategory: 1,
groupType: "group_workstation"
}).then(({ code, data }) => {
@@ -199,6 +199,11 @@
this.data = this.formatData(data)
this.$nextTick(() => {
this.parentData = this.data;
+ var ids = this.extractLastLevelIds(this.parentData);
+ this.selectedIds = ids;
+ this.search.workStationIdList = ids;
+ this.search.top = 5; //24灏忔椂鍐呭墠5鍚�
+ this.search.timeLevel = 24; //24灏忔椂鍐呭墠5鍚�
this.getList();
})
}
@@ -217,6 +222,7 @@
})
},
getRunData(type) {
+ this.isSearch = false;
if(type != "search") {
var ids = this.extractLastLevelIds(this.parentData);
this.selectedIds = ids;
@@ -229,19 +235,12 @@
top: 7,
workStationIdList: ids
}
- this.$HTTP.post(`/api/blade-visual/status/oee-top`,obj).then(res=> {
+ this.$HTTP.post(`/api/blade-visual/status/oee-top`,this.search).then(res=> {
if(res.code == 200) {
- // if(res.data.categories.length == 0) {
-
- // return;
- // }
- this.isSearch = false;
var recordDom = document.getElementById('equipment');
this.option.yAxis.data = res.data.categories;
- console.log(this.option.yAxis.data,'this.option.yAxis.data')
this.option.series[0].data = res.data.series[0].data;
this.oeeTitle = res.data.series[0].name;
- console.log(this.oeeTitle,'this.oeeTitle')
var myChart = echarts.init(recordDom);
myChart.setOption(this.option);
}
--
Gitblit v1.9.3