From 25276590b69e1c6547f7c09a869364aff540c812 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 30 Nov 2020 14:34:26 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE=20=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=20aler=20rule=E7=9A=84=E6=A0=B9=E6=8D=AE=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E6=95=B0=E9=87=8F=E6=8E=92=E5=BA=8F=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss     |  4 +++
 .../src/components/common/js/tools.js         |  1 +
 .../common/project/overViewTopology.vue       | 11 ++++++++
 .../src/components/page/alert/config.vue      |  3 ++-
 .../src/components/page/alert/list.vue        |  4 ++-
 .../page/dashboard/overview/overview2.scss    |  2 +-
 .../page/dashboard/overview/overview2.vue     | 25 ++++++++++++-------
 7 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 3af0e2484..595ed0829 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -676,6 +676,10 @@ li{
   right: calc(100% - 440px) !important;
   /*transform: translateX(100%);*/
 }
+.config .top-tool-main-right-to-left {
+  right: calc(100% - 492px) !important;
+  /*transform: translateX(100%);*/
+}
 .top-tool-main-right-to-left {
   right: calc(100% - 390px) !important;
   /*transform: translateX(100%);*/
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 0b376462f..b6b288bc6 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -532,6 +532,7 @@ export const tableSet = {
       case 'alertName':
       case 'threshold':
       case 'idc':
+      case 'alertNum':
         return'custom';
       case 'state':
         if( from === 'operationlog'){
diff --git a/nezha-fronted/src/components/common/project/overViewTopology.vue b/nezha-fronted/src/components/common/project/overViewTopology.vue
index 42b3f32ac..4118c568d 100644
--- a/nezha-fronted/src/components/common/project/overViewTopology.vue
+++ b/nezha-fronted/src/components/common/project/overViewTopology.vue
@@ -441,6 +441,9 @@
       },
       modelTopUpdate(){//model上的图标 实时更新
         this.modelTop=[];
+        if(!this.network){
+          return
+        }
         this.nodesArray.forEach((item)=>{
           let position=this.network.canvasToDOM({x:item.x,y:item.y});
           let obj={
@@ -693,6 +696,14 @@
       setTimeout(()=>{
         let this_=this;
         this.init('modal');
+        this.network.on("resize", function (params) {//检测resize
+          setTimeout(()=>{
+            this_.modelTopUpdate();
+            this_.selNodeArrUpdate();
+            this_.networkPopShow=false;
+          });
+          return false
+        });
       })
     },
     beforeDestroy(){
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index 98484c671..d2015ec6a 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -33,13 +33,13 @@
           <div class="top-tool-search float-right">
             <search-input :searchMsg="searchMsg" @search="search" :inTransform="bottomBox.inTransform"></search-input>
           </div>
+          <pick-time  :showTimePicker="false" class="float-right pickTime margin-l-20" :refresh-data-func="getTableData" v-model="searchTime" :use-chart-unit="false" ref="pickTime"></pick-time>
           <export-excel
             export-file-name="AlertRule"
             export-url="/alert/rule/export"
             import-url="/alert/rule/import"
             :params="searchLabel"
             @afterImport="getTableData"
-            class="margin-l-20"
           >
             <template slot="optionZone">
               <button id="alert-add" @click="add"  :title="$t('overall.createAlertRule')"
@@ -288,6 +288,7 @@
         viewProjectData: {},
         viewModuleData: {},
         viewAsset: false,
+        searchTime: bus.getTimezontDateRange(),
       }
     },
     methods: {
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index 1e0bbe17c..fe70f247c 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -25,8 +25,9 @@
           <div class="top-tool-search">
             <search-input :searchMsg="searchMsg" @search="search" :bottomBox.inTransform="bottomBox.inTransform"></search-input>
           </div>
+          <pick-time  :showTimePicker="false" class="float-right pickTime margin-l-20" :refresh-data-func="getAlertList" v-model="searchTimeSelect" :use-chart-unit="false" ref="pickTime"></pick-time>
           <button type="button" @click="showExportDialog" :title="$t('overall.exportExcelLower')"
-                  class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="alert-list-export">
+                  class="nz-btn nz-btn-size-normal nz-btn-style-light" id="alert-list-export">
             <i class="nz-icon nz-icon-download1"></i>
           </button>
           <delete-button :delete-objs="batchDeleteObjs" api="alert/message" @after="getAlertList" :clickFunction="openDelMessageBox"></delete-button>
@@ -152,6 +153,7 @@
         sameLabels: ['instance','module','project','asset','endpoint','datacenter'],
         legend: [],
         searchTime: [],
+        searchTimeSelect: bus.getTimezontDateRange(),
         currentMsg: {},
         chartUnit: 5,
 
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
index f5777290f..6fa129111 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
@@ -6,7 +6,7 @@
   padding: 8px 0 2px 0;
 }
 .overview-content-header .header-title{
-  flex:13;
+  flex:12;
   height: 35px;
   line-height: 35px;
   font-size: 1.5rem !important;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 72233c4ac..c3c1b1583 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -13,6 +13,7 @@
             <div class="week">{{sysWeek}}</div>
             <div class="sys-date">{{sysDate}}</div>
           </div>
+          <pick-time  :showTimePicker="false" class="float-right pickTime margin-l-20" :refresh-data-func="setFreshDataTimer" v-model="searchTime" :use-chart-unit="false" ref="pickTime"></pick-time>
           <div class="operation" @click="switchFullScreen" ><span ><i class="nz-icon screen-icon" :class="{'nz-icon-maxview':!isFullScreen,'nz-icon-exit-full-screen':isFullScreen}"></i></span></div>
         </div>
       </div>
@@ -292,6 +293,7 @@
           x: 0,
           y: 0
         },
+        searchTime:bus.getTimezontDateRange(),
       }
     },
     filters: {
@@ -351,16 +353,21 @@
         ]
       },
       setFreshDataTimer:function(){
-        this.freshDataTimer=setInterval(()=>{
+        // this.freshDataTimer=setInterval(()=>{
+        //   if(this.$refs.overviewLoading){
+        //     this.$refs.overviewLoading.startLoading();
+        //   }
+        //   Promise.all(this.initData()).then(()=>{
+        //     if(this.$refs.overviewLoading){
+        //       this.$refs.overviewLoading.endLoading();
+        //     }
+        //   })
+        // },5*60*1000)
+        Promise.all(this.initData()).then(()=>{
           if(this.$refs.overviewLoading){
-            this.$refs.overviewLoading.startLoading();
+            this.$refs.overviewLoading.endLoading();
           }
-          Promise.all(this.initData()).then(()=>{
-            if(this.$refs.overviewLoading){
-              this.$refs.overviewLoading.endLoading();
-            }
-          })
-        },5*60*1000)
+        })
       },
       querySystemState:function(){
         return new Promise(resolve => {
@@ -1584,7 +1591,7 @@
       this.initData();
       this.querySystemState().then(()=>{
         this.initDate();
-        this.setFreshDataTimer();
+        // this.setFreshDataTimer();
       })
 
       // window.onresize = () => {