diff --git a/README.md b/README.md
index 06988840..64d4c4e1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
## 在线体验
-#### 电脑在线体验: [https://report.anji-plus.com/index.html](https://report.anji-plus.com//index.html "链接") 体验账号:guest 密码:guest
+#### 电脑在线体验: [https://report.anji-plus.com/index.html](https://report.anji-plus.com/index.html "链接") 体验账号:guest 密码:guest
#### 在线文档: [https://report.anji-plus.com/report-doc/](https://report.anji-plus.com/report-doc/ "doc")
#### 在线提问: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue")
diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue
index a5288d2f..5a5ce275 100644
--- a/report-ui/src/views/report/bigscreen/designer/index.vue
+++ b/report-ui/src/views/report/bigscreen/designer/index.vue
@@ -153,6 +153,7 @@
}"
@click.self="setOptionsOnClickScreen"
>
+
@@ -242,6 +244,7 @@ export default {
},
data() {
return {
+ grade: false,
layerWidget: [],
widgetTools: widgetTools, // 左侧工具栏的组件图标,将js变量加入到当前作用域
widthLeftForTools: 200, // 左侧工具栏宽度
@@ -355,6 +358,10 @@ export default {
// 如果是新的设计工作台
this.initEchartData();
this.widgets = [];
+
+ window.addEventListener("mouseup", () => {
+ this.grade = false;
+ });
},
methods: {
handlerLayerWidget(val) {
@@ -378,8 +385,6 @@ export default {
if (code != 200) return;
const processData = this.handleInitEchartsData(data);
const screenData = this.handleBigScreen(data.dashboard);
- console.log(screenData);
- console.log(processData);
this.widgets = processData;
this.dashboard = screenData;
},
@@ -618,6 +623,10 @@ export default {
}
}
this.setOptionsOnClickWidget(index);
+ this.grade = true;
+ },
+ widgetsMouseup(e) {
+ this.grade = false;
},
handleMouseDown() {
const draggableArr = this.$refs.widgets;
@@ -888,6 +897,20 @@ export default {
margin: 0;
padding: 0;
}
+ .bg-grid {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-size: 30px 30px, 30px 30px;
+ background-image: linear-gradient(
+ hsla(0, 0%, 100%, 0.1) 1px,
+ transparent 0
+ ),
+ linear-gradient(90deg, hsla(0, 0%, 100%, 0.1) 1px, transparent 0);
+ // z-index: 2;
+ }
}
}
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
index 729a5044..ef4627da 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
@@ -12,6 +12,7 @@
:top="widgetsTop"
ref="draggable"
:index="index"
+ :z-index="-1"
@focus="handleFocus"
@blur="handleBlur"
>
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue
index bab0c0ce..ee257739 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetImage.vue
@@ -57,7 +57,6 @@ export default {
watch: {
value: {
handler(val) {
- console.log(val);
this.options = val;
},
deep: true