From ed085bcfe50f79d6746ff5348ec76e8ba3bea13b Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Tue, 9 Jun 2020 10:54:06 +0800
Subject: [PATCH] =?UTF-8?q?perf:project=20asset=20=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=9F=E4=B8=80=E5=AE=9A=E6=97=B6=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/line-chart-block.vue  |  7 ++++++-
 .../common/bottomBox/tabs/panelTab.vue          | 12 +++++++-----
 .../src/components/page/dashboard/panel.vue     | 17 ++++++++++-------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index b92b8b67b..28c4c0134 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -176,6 +176,7 @@
           '#f58220', '#c37e00', '#00ae9d', '#f26522', '#76becc',
           '#76624c', '#d71345', '#2468a2', '#ca8687', '#1b315e',
         ],
+        stackTotalColor:null,
         firstShow: false, // 默认不显示操作按钮,
         caretShow:false,
         dropdownMenuShow:false,
@@ -515,9 +516,13 @@
                 str += `</div>`;
               });
               if(self.data.type==='stackArea' || self.isStackArea){
+                if(!self.stackTotalColor||self.stackTotalColor==''){
+                  self.stackTotalColor=randomcolor();
+                }
                 sum = parseFloat(Number(sum).toFixed(2));
                 str +=`<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">`;
-                str +=`<div style="line-height: 18px; font-size: 12px;padding-left:20px;">`
+                str +=`<div style="line-height: 18px; font-size: 12px;padding-left:0px;">`
+                str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${self.stackTotalColor};}'></span>`;
                 str +=self.$t("dashboard.panel.chartTotal");
                 str +=`</div>`;
                 str +=`<div style="padding-left: 10px;">`;
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index dcb4fe810..9639028a3 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -22,7 +22,7 @@
             <i slot="suffix" class="el-input__icon el-icon-search" @click="focusInput" style="float: right"></i>
           </el-input>
         </div>
-        <div class="panel-calendar margin-r-20" v-if="from == 'asset'">
+        <!--<div class="panel-calendar margin-r-20" v-if="from == 'asset'">
           <time-picker ref="calendarPanel" class="nz-dashboard-picker" @change="dateChange" style="height: 26px; margin-top: -1px;"></time-picker>
         </div>
         <div class="nz-btn-group nz-btn-group-size-small nz-btn-group-light margin-r-20" style="height: 24px;" v-if="from == 'asset'">
@@ -42,7 +42,8 @@
               <i style="font-size: 12px" class="nz-icon nz-icon-arrow-down"></i>
             </button>
           </el-popover>
-        </div>
+        </div>-->
+        <pick-time :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false" v-if="from=='asset'"></pick-time>
         <button @click="toAddChart" :title="$t('overall.createChart')" v-if="from != 'alertRule'"
                 class="nz-btn nz-btn-size-normal nz-btn-style-light ">
           <i class="nz-icon-create-square nz-icon"></i>
@@ -64,7 +65,7 @@
           </el-input>
         </div>
 
-        <div class="panel-calendar margin-r-20">
+        <!--<div class="panel-calendar margin-r-20">
           <div class="block">
             <time-picker ref="calendarPanel" class="nz-dashboard-picker" @change="dateChange"></time-picker>
           </div>
@@ -87,7 +88,8 @@
             <i style="font-size: 12px" class="nz-icon nz-icon-arrow-down"></i>
           </button>
         </el-popover>
-        </div>
+        </div>-->
+        <pick-time :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false"></pick-time>
         <button @click="toAddChart" :title="$t('overall.createChart')"
                 class="nz-btn nz-btn-size-normal nz-btn-style-light ">
           <i class="nz-icon-create-square nz-icon"></i>
@@ -314,7 +316,7 @@
       /*时间条件查询--start*/
       // 选择日期变化
       dateChange(val) {
-        this.searchTime = [...val];
+        // this.searchTime = [...val];
         this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
         this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
         this.filter.panelId = this.panelId;
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 7a77ea24b..ddbc5a0a1 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -58,13 +58,13 @@
               </el-input>
             </div>
 
-            <div class="panel-calendar margin-r-20">
+            <!--<div class="panel-calendar margin-r-20">
               <div class="block">
                 <time-picker ref="calendarPanel" class="nz-dashboard-picker" @change="dateChange"></time-picker>
               </div>
-            </div>
+            </div>-->
 
-            <div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-r-20">
+            <!--<div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-r-20">
               <button style="border-right: 1px solid rgba(162,162,162,0.50);" type="button"
                       class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="Refresh()">
                 <i style="font-size: 12px" class="global-active-color nz-icon nz-icon-refresh"></i>
@@ -81,7 +81,8 @@
                 <i style="font-size: 12px" class="nz-icon nz-icon-arrow-down"></i>
               </button>
             </el-popover>
-            </div>
+            </div>-->
+            <pick-time :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false"></pick-time>
             <button @click="toAddChart" :title="$t('overall.createChart')"
                     class="nz-btn nz-btn-size-normal nz-btn-style-light ">
               <i class="nz-icon-create-square nz-icon"></i>
@@ -112,6 +113,7 @@
   import bus from '../../../libs/bus';
   import timePicker from '../../common/timePicker'
   import draggable from 'vuedraggable'
+  import pickTime from "../../common/pickTime";
   export default {
     name: "panel",
     data() {
@@ -205,6 +207,7 @@
       'chart-list': ChartList,
       'time-picker':timePicker,
       draggable,
+      'pick-time':pickTime,
     },
     methods: {
       //刷新
@@ -379,9 +382,9 @@
       /*时间条件查询--start*/
       // 选择日期变化
       dateChange(val) {
-        if(val){
-          this.searchTime = [...val];
-        }
+        // if(val){
+        //   this.searchTime = [...val];
+        // }
         this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
         this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
         this.filter.panelId = this.showPanel.id;