From d510b62ff5c5d1a8246ca5faf7c1a9c5cc961b91 Mon Sep 17 00:00:00 2001
From: h7ml <h7ml@qq.com>
Date: Thu, 23 Jun 2022 11:41:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E4=BA=91=E5=8E=8B=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复压测界面全屏问题
---
 CHANGELOG.EN.md                     |  1 +
 CHANGELOG.ZH.md                     |  1 +
 CHANGELOG.md                        |  1 +
 src/views/CloudPressure/grafana.vue | 39 ++++++++++++++++++++++++-----
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.EN.md b/CHANGELOG.EN.md
index b1b5db2a46..9b972c1a82 100644
--- a/CHANGELOG.EN.md
+++ b/CHANGELOG.EN.md
@@ -3,6 +3,7 @@
 
 ### Bug Fixes
 
+* **components:** 设备列表 ([7a5b59b](https://github.com/dgiot/dgiot-dashboard/commit/7a5b59b9bbbd9163e5df359224f5b6b433b2432e))
 * **components:** 设备列表 ([a9dd45c](https://github.com/dgiot/dgiot-dashboard/commit/a9dd45ca5044fa0532807a114feab6d8125d625b))
 * **components:** 设备列表 ([36e2951](https://github.com/dgiot/dgiot-dashboard/commit/36e29513ec2e8a88ccb586e1779800f81aa4b771))
 * **other:** 修復设备列表订阅 ([27115ef](https://github.com/dgiot/dgiot-dashboard/commit/27115ef44de12c4986a98002173d385eb5593b54))
diff --git a/CHANGELOG.ZH.md b/CHANGELOG.ZH.md
index b1b5db2a46..9b972c1a82 100644
--- a/CHANGELOG.ZH.md
+++ b/CHANGELOG.ZH.md
@@ -3,6 +3,7 @@
 
 ### Bug Fixes
 
+* **components:** 设备列表 ([7a5b59b](https://github.com/dgiot/dgiot-dashboard/commit/7a5b59b9bbbd9163e5df359224f5b6b433b2432e))
 * **components:** 设备列表 ([a9dd45c](https://github.com/dgiot/dgiot-dashboard/commit/a9dd45ca5044fa0532807a114feab6d8125d625b))
 * **components:** 设备列表 ([36e2951](https://github.com/dgiot/dgiot-dashboard/commit/36e29513ec2e8a88ccb586e1779800f81aa4b771))
 * **other:** 修復设备列表订阅 ([27115ef](https://github.com/dgiot/dgiot-dashboard/commit/27115ef44de12c4986a98002173d385eb5593b54))
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1b5db2a46..9b972c1a82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 ### Bug Fixes
 
+* **components:** 设备列表 ([7a5b59b](https://github.com/dgiot/dgiot-dashboard/commit/7a5b59b9bbbd9163e5df359224f5b6b433b2432e))
 * **components:** 设备列表 ([a9dd45c](https://github.com/dgiot/dgiot-dashboard/commit/a9dd45ca5044fa0532807a114feab6d8125d625b))
 * **components:** 设备列表 ([36e2951](https://github.com/dgiot/dgiot-dashboard/commit/36e29513ec2e8a88ccb586e1779800f81aa4b771))
 * **other:** 修復设备列表订阅 ([27115ef](https://github.com/dgiot/dgiot-dashboard/commit/27115ef44de12c4986a98002173d385eb5593b54))
diff --git a/src/views/CloudPressure/grafana.vue b/src/views/CloudPressure/grafana.vue
index 59135ff2c5..d755de18da 100644
--- a/src/views/CloudPressure/grafana.vue
+++ b/src/views/CloudPressure/grafana.vue
@@ -12,13 +12,18 @@
 <template>
   <div class="grafana-container">
     <div class="grafana">
-      <iframe frameborder="0" :src="iframeSrc"></iframe>
+      <iframe
+        :id="theme.layout == 'horizontal' ? 'fm100' : ''"
+        :class="collapse ? '' : 'iframe'"
+        frameborder="0"
+        :src="iframeSrc"
+      ></iframe>
     </div>
   </div>
 </template>
 
 <script>
-  import { mapMutations } from 'vuex'
+  import { mapMutations, mapGetters } from 'vuex'
   export default {
     name: 'Grafana',
     components: {},
@@ -28,11 +33,27 @@
         iframeSrc:
           process.env.NODE_ENV !== 'development'
             ? location.protocol + '//' + location.hostname + ':3000'
-            : 'http://101.32.99.133:3000/login',
+            : 'http://43.128.230.212:3000/login',
       }
     },
-    computed: {},
-    watch: {},
+    computed: {
+      ...mapGetters({
+        collapse: 'settings/collapse',
+        theme: 'settings/theme',
+      }),
+    },
+    watch: {
+      theme: {
+        handler(theme) {
+          console.log(
+            theme,
+            'themethemethemethemethemethemethemethemethemethemethemethemethemethemetheme'
+          )
+        },
+        deep: true,
+        immediate: true,
+      },
+    },
     created() {},
     mounted() {
       this.setTreeFlag(false)
@@ -50,9 +71,15 @@
   .grafana-container {
     width: 100%;
     heigth: 100%;
+    .iframe {
+      width: 88vw !important;
+    }
+    #fm100 {
+      width: 98vw !important;
+    }
     iframe {
       display: block; /* iframes are inline by default */
-      width: 100vw;
+      width: 94vw;
       height: 100vh; /* Viewport-relative units */
       background: #000;
       border: none; /* Reset default border */