From 9c094a1fe3e1ae3dadef6433f8401818fe2b8304 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 21 六月 2024 10:53:43 +0800
Subject: [PATCH] 1
---
src/views/home/widgets/components/mdcRunning.vue | 6 +++++-
src/views/home/widgets/components/mdcEquipmentRun.vue | 10 +++-------
src/views/home/widgets/index.vue | 5 +----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/views/home/widgets/components/mdcEquipmentRun.vue b/src/views/home/widgets/components/mdcEquipmentRun.vue
index 584fc2b..040c9cf 100644
--- a/src/views/home/widgets/components/mdcEquipmentRun.vue
+++ b/src/views/home/widgets/components/mdcEquipmentRun.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-16 15:22:46
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-21 10:24:23
+ * @LastEditTime: 2024-06-21 10:49:01
* @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
-->
@@ -217,6 +217,8 @@
})
},
getRunData(type) {
+ this.isSearch = false;
+ return;
if(type != "search") {
var ids = this.extractLastLevelIds(this.parentData);
this.selectedIds = ids;
@@ -231,17 +233,11 @@
}
this.$HTTP.post(`/api/blade-visual/status/oee-top`,obj).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);
}
diff --git a/src/views/home/widgets/components/mdcRunning.vue b/src/views/home/widgets/components/mdcRunning.vue
index 8fe21e8..558578f 100644
--- a/src/views/home/widgets/components/mdcRunning.vue
+++ b/src/views/home/widgets/components/mdcRunning.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-16 15:22:46
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-21 09:54:33
+ * @LastEditTime: 2024-06-21 10:53:10
* @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
-->
@@ -37,6 +37,7 @@
:data="parentData"
:props="{ label: 'title' }"
style="width:80%;"
+ :default-checked-keys="selectedIds"
:render-after-expand="false" />
</div>
<div>
@@ -76,6 +77,7 @@
description: "蹇�熸煡鐪嬭澶囪繍琛屾椂闀挎帓鍚�",
data() {
return {
+ selectedIds: [],
parentData: {},
list: [],
timeLevelList: [],
@@ -211,6 +213,8 @@
if(item.cardKey == "mdcRunning") {
if(item.apiResource == "") return;
this.apiResource = JSON.parse(item.apiResource);
+ this.selectedIds = this.apiResource.workStationIdList;
+ this.search.workStationIdList = this.apiResource.workStationIdList;
this.timeLevel = this.apiResource.timeLevel;
this.top = this.apiResource.top;
if(this.apiResource.workStationIdList.length > 0) {
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index ead9fad..d7cebf5 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -21,10 +21,7 @@
<template #item="{ element }">
<div class="widgets-item">
<component :is="allComps[element]"></component>
- <div v-if="customizing" class="customize-overlay">
- <el-button class="close" type="danger" plain icon="el-icon-close" size="small" @click="remove(element)"></el-button>
- <label><el-icon><component :is="allComps[element].icon" /></el-icon>{{ allComps[element].title }}</label>
- </div>
+
</div>
</template>
</draggable>
--
Gitblit v1.9.3