From 3377e93abdc06410ce8bc5f0cd538d089dda34e8 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 26 六月 2024 11:37:52 +0800
Subject: [PATCH] 1
---
src/views/home/widgets/components/mdcEquipmentRun.vue | 3 +--
src/views/home/widgets/index.vue | 16 ++++++++++++----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/views/home/widgets/components/mdcEquipmentRun.vue b/src/views/home/widgets/components/mdcEquipmentRun.vue
index 2ba15fb..f3a3661 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-23 21:52:10
+ * @LastEditTime: 2024-06-24 22:33:49
* @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
-->
@@ -234,7 +234,6 @@
if(res.code == 200) {
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;
var myChart = echarts.init(recordDom);
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index 93d9d19..3cb7f6f 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -39,7 +39,6 @@
<div class="widgets-aside-title"><el-icon><el-icon-circle-plus-filled/></el-icon>娣诲姞閮ㄤ欢</div>
<div class="widgets-aside-close" @click="close()"><el-icon><el-icon-close /></el-icon></div>
</el-header>
- {{grid.layout.join(',')}},xxxx
<el-header style="height:auto">
<div class="selectLayout">
<div class="selectLayout-item item01" :class="{active:grid.layout.join(',')=='12,6,6'}" @click="setLayout([12,6,6])">
@@ -61,6 +60,14 @@
<el-col :span="24"><span></span></el-col>
<el-col :span="24"><span></span></el-col>
<el-col :span="24"><span></span></el-col>
+ </el-row>
+ </div>
+ <div class="selectLayout-item item04" :class="{active:grid.layout.join(',').indexOf('24,12,6,6')>-1}" @click="setLayout([24,12,6,6])">
+ <el-row :gutter="2">
+ <el-col :span="24"><span></span></el-col>
+ <el-col :span="12"><span></span></el-col>
+ <el-col :span="6"><span></span></el-col>
+ <el-col :span="6"><span></span></el-col>
</el-row>
</div>
</div>
@@ -183,8 +190,9 @@
return 1;
}
// 濡傛灉 xcoordinate 涔熺浉鍚岋紝鍒欎笉浜ゆ崲浣嶇疆
- return 0;
+ return 0;
});
+ console.log(cards)
cards.forEach((item,index)=> {
this.$CONFIG.DEFAULT_GRID.copmsList[index] = [item.cardKey];
this.$CONFIG.DEFAULT_GRID.layout[index] = item.cardWide * 2;
@@ -304,8 +312,8 @@
.selectLayout {width: 100%;display: flex;}
.selectLayout-item {width:60px;height:60px;border: 2px solid var(--el-border-color-light);padding:5px;cursor: pointer;margin-right: 15px;}
.selectLayout-item span {display: block;background: var(--el-border-color-light);height:46px;}
- .selectLayout-item.item02 span {height:30px;}
- .selectLayout-item.item02 .el-col:nth-child(1) span {height:14px;margin-bottom: 2px;}
+ .selectLayout-item.item02 span,.selectLayout-item.item04 span {height:30px;}
+ .selectLayout-item.item02 .el-col:nth-child(1) span,.selectLayout-item.item04 .el-col:nth-child(1) span {height:14px;margin-bottom: 2px;}
.selectLayout-item.item03 span {height:14px;margin-bottom: 2px;}
.selectLayout-item:hover {border-color: var(--el-color-primary);}
.selectLayout-item.active {border-color: var(--el-color-primary);}
--
Gitblit v1.9.3