From 04a7864e1a83e1c6fade38a88547b17b6b248626 Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Thu, 27 Jan 2022 12:39:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bigscreenDesigner/designer/index.vue | 56 +++++--------------
1 file changed, 13 insertions(+), 43 deletions(-)
diff --git a/report-ui/src/views/bigscreenDesigner/designer/index.vue b/report-ui/src/views/bigscreenDesigner/designer/index.vue
index 53365880..a72a81c9 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/index.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/index.vue
@@ -140,36 +140,6 @@
</li>
</ul>
</span>
- <!-- <span class="btn border-left">
- <ul class="nav">
- <li>
- <i class="el-icon-brush"></i><i class="el-icon-arrow-down"></i>
- <ul>
- <li>
- <div>
- <i class="el-icon-full-screen mr10"></i>边框
- <i class="el-icon-arrow-right ml20"></i>
- </div>
- <ul class="three-level">
- <li><a href="#">边框1</a></li>
- <li><a href="#">边框2</a></li>
- <li><a href="#">边框3</a></li>
- </ul>
- </li>
- <li>
- <div>
- <i class="el-icon-magic-stick mr10"></i>装饰<i
- class="el-icon-arrow-right ml20"
- ></i>
- </div>
- <ul class="three-level">
- <li><a href="#">装饰1</a></li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- </span>-->
</div>
<div
class="workbench-container"
@@ -478,9 +448,9 @@ export default {
return {
backgroundColor: (data && data.backgroundColor) || "",
backgroundImage: (data && data.backgroundImage) || "",
- height: (data && data.height) || "",
+ height: (data && data.height) || "1080",
title: (data && data.title) || "",
- width: (data && data.width) || ""
+ width: (data && data.width) || "1920"
};
},
handleInitEchartsData(data) {
@@ -775,21 +745,21 @@ export default {
if (this.screenCode == "screen") {
let newSetup = new Array();
this.dashboard = this.deepClone(val);
- if(this.bigscreenWidth != this.dashboard.width){
- this.bigscreenWidth = this.dashboard.width
+ if (this.bigscreenWidth != this.dashboard.width) {
+ this.bigscreenWidth = this.dashboard.width;
}
- if(this.bigscreenHeight != this.dashboard.height){
- this.bigscreenHeight = this.dashboard.height
+ if (this.bigscreenHeight != this.dashboard.height) {
+ this.bigscreenHeight = this.dashboard.height;
}
this.widgetOptions.setup.forEach(el => {
- if(el.name == 'width'){
- el.value = this.bigscreenWidth
- }else if(el.name == 'height'){
- el.value = this.bigscreenHeight
+ if (el.name == "width") {
+ el.value = this.bigscreenWidth;
+ } else if (el.name == "height") {
+ el.value = this.bigscreenHeight;
}
- newSetup.push(el)
+ newSetup.push(el);
});
- this.widgetOptions.setup = newSetup
+ this.widgetOptions.setup = newSetup;
} else {
for (let i = 0; i < this.widgets.length; i++) {
if (this.widgetIndex == i) {
@@ -964,7 +934,7 @@ export default {
border: 1px solid #3a4659;
background: #282a30;
}
- .tools-item-text{
+ .tools-item-text {
}
}
}
From cb8f3c5d8273e921ebdf8c694a7645ec2e247a45 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Thu, 27 Jan 2022 12:49:12 +0800
Subject: [PATCH 2/2] 0.9.6.1
---
report-ui/src/views/layout/components/Sidebar/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/report-ui/src/views/layout/components/Sidebar/index.vue b/report-ui/src/views/layout/components/Sidebar/index.vue
index 9e311120..44442209 100644
--- a/report-ui/src/views/layout/components/Sidebar/index.vue
+++ b/report-ui/src/views/layout/components/Sidebar/index.vue
@@ -3,7 +3,7 @@
<div class="admin-title" @click="goBigScreen">
<div class="con">
<img src="../../../../../static/logo-dp.png" width="50" />
- <span class="version">V0.9.6</span>
+ <span class="version">V0.9.6.1</span>
</div>
</div>
<el-menu