From acae91f698a0473f9eab1571a9ab554fb2f31ebb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Dec 2021 14:36:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Adiagram=20=E5=9B=BE=E7=89=87=20?=
 =?UTF-8?q?=E5=AE=BD=E9=AB=98=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartGauge.vue        |  8 --------
 .../src/components/chart/chart/chartUrl.vue          |  8 +++++---
 nezha-fronted/src/components/chart/panelChart.vue    |  2 +-
 .../src/components/common/ChartDiagram/diagram.vue   | 12 ++++++------
 .../src/components/common/mixin/routerPathParams.js  |  1 -
 .../src/components/common/project/topologyL5.vue     |  8 ++++----
 .../common/rightBox/chart/chartRightBox.vue          |  1 -
 nezha-fronted/src/components/common/timePicker.vue   |  1 -
 .../src/components/page/config/template/index.vue    |  1 -
 9 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartGauge.vue b/nezha-fronted/src/components/chart/chart/chartGauge.vue
index 1e8396804..4fb45ed0b 100644
--- a/nezha-fronted/src/components/chart/chart/chartGauge.vue
+++ b/nezha-fronted/src/components/chart/chart/chartGauge.vue
@@ -47,14 +47,6 @@ import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
 export default {
   name: 'chart-guage',
   mixins: [chartMixin, chartFormat],
-  watch: {
-    isFullscreen: {
-      immediate: true,
-      handler (n) {
-        console.log(n)
-      }
-    }
-  },
   data () {
     return {
       gaugeData: [],
diff --git a/nezha-fronted/src/components/chart/chart/chartUrl.vue b/nezha-fronted/src/components/chart/chart/chartUrl.vue
index 1fbb04246..6b55a4fa1 100644
--- a/nezha-fronted/src/components/chart/chart/chartUrl.vue
+++ b/nezha-fronted/src/components/chart/chart/chartUrl.vue
@@ -1,12 +1,14 @@
 <template>
-  <div style="width: 100%;height: 100%" :id="'chartUrl' + chartInfo.id" class="mt-10 url-container" v-show="firstShow">
-    <iframe :id="'urlContainer' + chartInfo.id" frameborder="0" width="100%" height="100%" name="showHere" scrolling=auto style="z-index:5000;padding-bottom:6px;"></iframe>
+  <div style="width: 100%;height: 100%" :id="'chartUrl' + chartId" class="mt-10 url-container" v-show="firstShow">
+    <iframe :id="'urlContainer' + chartId" frameborder="0" width="100%" height="100%" name="showHere" scrolling=auto style="z-index:5000;padding-bottom:6px;"></iframe>
   </div>
 </template>
 
 <script>
+import chartMixin from '@/components/chart/chartMixin'
 export default {
   name: 'chart-url',
+  mixins: [chartMixin],
   props: {
     chartInfo: {},
     chartData: {}
@@ -20,7 +22,7 @@ export default {
     setLoadFrame (data) {
       const that = this
       this.$nextTick(() => {
-        const iframe = document.querySelector('#urlContainer' + this.chartInfo.id)
+        const iframe = document.querySelector('#urlContainer' + this.chartId)
         // 处理兼容行问题
         if (iframe.attachEvent) {
           iframe.attachEvent('onload', function () {
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 4a437654f..75e8d08d9 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -312,7 +312,7 @@ export default {
           }
         }
       } catch (e) {
-        console.log(e)
+        console.info(e)
         this.loading = false
       }
     },
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index cc6954fb2..6ea7b8465 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -1763,8 +1763,8 @@ export default {
                     imageId: item.id,
                     unit: item.unit,
                     rect: {
-                      width: res2[index].width,
-                      height: res2[index].height
+                      width: res2[index].width === -1 ? 100 : res2[index].width,
+                      height: res2[index].height === -1 ? 100 : res2[index].height
                     }
                   }
                 })
@@ -1780,8 +1780,8 @@ export default {
                       imageId: item.id,
                       unit: item.unit,
                       rect: {
-                        width: res2[index].width,
-                        height: res2[index].height
+                        width: res2[index].width === -1 ? 100 : res2[index].width,
+                        height: res2[index].height === -1 ? 100 : res2[index].height
                       }
                     }
                   }]
@@ -1835,8 +1835,8 @@ export default {
                 data: ('data:image/jpeg;base64,' + res.data),
                 // width: res.headers.width === -1 ? 100 : (res.headers.width > 900 ? 900 : res.headers.width),
                 // height: res.headers.height === -1 ? 100 : (res.headers.height > 900 ? 900 : res.headers.height)
-                width: res.headers.width === -1 ? 100 : Number(res.headers.width),
-                height: res.headers.height === -1 ? 100 : Number(res.headers.height)
+                width: (res.headers.width === -1 || res.headers.width === 0) ? 100 : Number(res.headers.width),
+                height: (res.headers.height === -1 || res.headers.height === 0) ? 100 : Number(res.headers.height)
               }
               if (imageInfo.width > 900 || imageInfo.height > 900) {
                 if (imageInfo.height > imageInfo.width) {
diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js
index 124364573..08109041c 100644
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -30,7 +30,6 @@ export default {
     },
     // 更新path，包含请求参数
     updatePath (param, path) {
-      console.log(param)
       const params = lodash.cloneDeep(param)
       Object.keys(params).forEach(key => {
         if (!params[key]) {
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 0e133fc19..7be05fced 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -1739,8 +1739,8 @@ export default {
                     imageId: item.id,
                     unit: item.unit,
                     rect: {
-                      width: res2[index].width,
-                      height: res2[index].height
+                      width: res2[index].width === -1 ? 100 : res2[index].width,
+                      height: res2[index].height === -1 ? 100 : res2[index].height
                     }
                   }
                 })
@@ -1756,8 +1756,8 @@ export default {
                       imageId: item.id,
                       unit: item.unit,
                       rect: {
-                        width: res2[index].width,
-                        height: res2[index].height
+                        width: res2[index].width === -1 ? 100 : res2[index].width,
+                        height: res2[index].height === -1 ? 100 : res2[index].height
                       }
                     }
                   }]
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index d78f22625..1fd86936e 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -243,7 +243,6 @@ export default {
       })
     },
     selectPanel (panel) {
-      console.log(panel)
       this.panelName = panel.name
       this.editChart.panelName = panel.name
       this.panelId = panel.id
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index cb38c761a..da0f22412 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -175,7 +175,6 @@ export default {
     setCustomTime (timeGroup, timeRange) {
       if (timeGroup) {
         this.showTime = this.nowTimeType = this.timeData.find(item => item.id == timeGroup.id)
-        console.log(this.showTime)
         if (this.showTime) {
           this.showTime = Object.assign({}, this.showTime)
           this.$set(this.searchTime, 0, timeGroup.start_time)
diff --git a/nezha-fronted/src/components/page/config/template/index.vue b/nezha-fronted/src/components/page/config/template/index.vue
index 0f3620b35..7eddf5dd9 100644
--- a/nezha-fronted/src/components/page/config/template/index.vue
+++ b/nezha-fronted/src/components/page/config/template/index.vue
@@ -49,7 +49,6 @@ export default {
     }
   },
   created () {
-    console.log(this.$route.query)
     this.switchTab = this.$route.query.switchTab || 'exprTemp'
   },
   mounted () {