From ad78583ccc49477a0ae3e530e89f3b7cc7cbc352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <523037378@qq.com>
Date: Tue, 11 Feb 2020 11:30:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20project-query=E5=92=8Cmetric=20preview?=
 =?UTF-8?q?=E9=87=8C=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=A1=A8=E5=90=8E=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95=E9=AB=98=E4=BA=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/header.vue     |  9 +++++++--
 nezha-fronted/src/components/page/asset/asset.vue  |  2 ++
 .../src/components/page/dashboard/chartBox.vue     |  4 ++--
 .../src/components/page/dashboard/metricSet.vue    |  2 +-
 .../src/components/page/project/project.vue        | 14 ++++++++------
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 1563a465d..c4e2ca52b 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -122,6 +122,7 @@
 </template>
 
 <script>
+  import bus from '../../libs/bus';
   export default {
     name: "Header",
     data() {
@@ -424,6 +425,10 @@
       // 刷新后有高亮
       let activePath = this.$route.path.slice(1);
       this.activeIndex = activePath;
+      bus.$on("menu-change", (menu) => {
+        console.info(menu);
+        this.activeIndex = menu;
+      });
     },
     computed: {
       projectListReloadWatch() {
@@ -433,8 +438,8 @@
         return this.$store.state.assetDcList;
       },
       getAssetDcData() {
-        return this.$store.state.assetData
-      },
+        return this.$store.state.assetData;
+      }
     },
     watch: {
       getAssetDcData: {
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 96177dfca..13a76cc92 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -176,6 +176,7 @@
 </template>
 
 <script>
+  import bus from "../../../libs/bus";
   export default {
     name: "asset",
     data() {
@@ -467,6 +468,7 @@
       },
       jumpToAlertMsg(assetId) {
         this.$store.commit('assetForAlertListChange', assetId);
+        bus.$emit("menu-change", 'alertList');
         this.$router.push({
           path: "/alertList",
           query: {
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index ab7ee7d27..c398523bc 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -435,7 +435,7 @@
             this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
             this.$refs.chartForm.resetFields();//清空表单
             let panel = this.panelData.find(p => p.id === this.panelId);
-            console.info("panel", panel)
+            //console.info("panel", panel)
             this.$emit('on-create-success', 'create', response.data,params, panel);
           } else {
             this.$message.error(response.msg);
@@ -572,7 +572,7 @@
               let dSet = this.$refs.chartTag;
               this.$nextTick(() => {
                 dSet.forEach((item, index) => {
-                  console.info('bbb', elementInfo.elements[index])
+                  //console.info('bbb', elementInfo.elements[index])
                   item.setMdata(elementInfo.elements[index]);
                 });
               });
diff --git a/nezha-fronted/src/components/page/dashboard/metricSet.vue b/nezha-fronted/src/components/page/dashboard/metricSet.vue
index dd733c2ed..d068f454e 100644
--- a/nezha-fronted/src/components/page/dashboard/metricSet.vue
+++ b/nezha-fronted/src/components/page/dashboard/metricSet.vue
@@ -200,7 +200,7 @@ export default {
         cancelButtonText: this.$t("tip.no"),
         type: 'success'
       }).then(() => {
-        //this.$store.state.assetData.moduleData = 'panel';
+        bus.$emit("menu-change", 'panel');
         this.$store.state.showPanel.id = panel.id;
         this.$store.state.showPanel.name = panel.name;
         this.$router.push({
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index f5db7b70f..f2062478b 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -255,6 +255,8 @@
 <script>
   import echarts from 'echarts';
   import chartBox from "../dashboard/chartBox";
+  import bus from "../../../libs/bus";
+
   export default {
     name: "project2",
     components: {
@@ -513,8 +515,8 @@
             tooltip:{
               show:true,
               formatter:function(params){
-                console.log("params")
-                console.log(params);
+                //console.log("params")
+                //console.log(params);
                 return `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal'> ${params.name}</div>`;
               },
             },
@@ -601,7 +603,7 @@
         this.$refs.addChartModal.show(true);
         let metricInfo = {};
         metricInfo.elements = [];
-        console.info("aaa", this.selectedEndpoints)
+        //console.info("aaa", this.selectedEndpoints)
         for(let i = 0; i < this.selectedEndpoints.length; i++) {
           let type = '';
           if (this.selectedEndpoints[i].type == '1') {
@@ -619,7 +621,7 @@
           cancelButtonText: this.$t("tip.no"),
           type: 'success'
         }).then(() => {
-          //this.$store.state.assetData.moduleData = 'panel';
+          bus.$emit("menu-change", 'panel');
           this.$store.state.showPanel.id = panel.id;
           this.$store.state.showPanel.name = panel.name;
           this.$router.push({
@@ -674,7 +676,7 @@
                   response.data.list[i].paramObj.push({key: k, value: tempObj[k]})
                 }
               } catch (err) {
-                console.info(response.data.list[i], err);
+                console.error(response.data.list[i], err);
               }
             }
             this.endpointTableData = response.data.list;
@@ -923,7 +925,7 @@
         this.showEndpoint();
       },
       pickTime:function(){
-        console.log(this.formatTime)
+        //console.log(this.formatTime)
         this.showEndpoint();
       },
       getTime:function(size,unit){//计算时间