From d263b9ee85b8acb9f2f51f1c449fff73f2b4a171 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 12 Jun 2023 10:38:11 +0800
Subject: [PATCH] youhua

---
 src/assets/css/element.less            | 2 +-
 src/views/components/carouselChart.vue | 8 ++++++--
 src/views/realTimeMonitor/index.vue    | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/assets/css/element.less b/src/assets/css/element.less
index ba702b3..4f04629 100644
--- a/src/assets/css/element.less
+++ b/src/assets/css/element.less
@@ -70,5 +70,5 @@
   font-size: 12px;
 }
 .el-popper[x-placement^="bottom"] {
-  margin-top: 6px !important;
+  margin-top: 2px !important;
 }
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index cb5df2f..0eb9ff8 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -331,7 +331,9 @@ export default {
         .then((res) => {
           console.log(res);
           this.localPoints = res.data.list;
-          this.drawline();
+          if (this.markEnable === 1) {
+            this.drawline();
+          }
         })
         .catch((err) => {});
     },
@@ -354,7 +356,9 @@ export default {
         .then((res) => {
           console.log(res);
           this.localPoints = res.data.list;
-          this.drawline();
+          if (this.markEnable === 1) {
+            this.drawline();
+          }
         })
         .catch((err) => {});
     },
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index dd69570..ba4f263 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -204,7 +204,9 @@
                   <el-dropdown-item command="close">关闭</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
-
+              <el-button type="primary" @click="taggleText">
+                {{ showLineFlag ? "显示线缆" : "隐藏线缆" }}
+              </el-button>
               <!-- <el-button type="primary" @click="handlehistoryPic"
                 >历史图片</el-button
               > -->
@@ -566,6 +568,7 @@ export default {
           break;
       }
     },
+
     handleShowErr() {
       this.$message({
         showClose: true,