From cdc6f87f0063038d011ac9e9704d30da8e8096a7 Mon Sep 17 00:00:00 2001
From: wujiawen <wujiawen@geedgenetworks.com>
Date: Mon, 20 Jan 2020 19:11:53 +0800
Subject: [PATCH] =?UTF-8?q?metric=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/dashboard/chartMetric.vue        | 4 ++++
 .../src/components/page/dashboard/metricSet.vue          | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/nezha-fronted/src/components/page/dashboard/chartMetric.vue b/nezha-fronted/src/components/page/dashboard/chartMetric.vue
index 02f446bc0..d01aa76e9 100644
--- a/nezha-fronted/src/components/page/dashboard/chartMetric.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartMetric.vue
@@ -70,8 +70,11 @@
       <el-col span="16">
         <span  class="star-red">*</span>&nbsp;{{$t('dashboard.panel.chartForm.metric')}}
       </el-col>
+
       <el-col span="8">
+        
         <div class="nz-btn-group float-left"  v-show="tableShow == 2">
+          <!-- <button @click="clickTabelShow(1,'normal')" class="nz-tab-item nz-tab-item-active"> -->
           <button @click="clickTabelShow(1,'normal')" class="nz-btn nz-btn-size-small nz-btn-style-light float-left">
             <span>{{$t('dashboard.metric.normal')}}</span>
           </button>
@@ -89,6 +92,7 @@
         </div>
       </el-col>
     </el-row>
+
     <el-row  v-if="tableShow == 2">
       <el-col span="22" class="mt1">
         <el-form-item prop="expression" :rules="{ required: true,  message:$t('validate.required'), trigger: 'blur' }"><!--expression和metric的验证只能有一个，不能同时存在？？:rules="{ required: true, type: 'string', message: '', trigger: 'change' }"-->
diff --git a/nezha-fronted/src/components/page/dashboard/metricSet.vue b/nezha-fronted/src/components/page/dashboard/metricSet.vue
index 8844e1328..7f0314a15 100644
--- a/nezha-fronted/src/components/page/dashboard/metricSet.vue
+++ b/nezha-fronted/src/components/page/dashboard/metricSet.vue
@@ -12,22 +12,29 @@
           @on-change-condition="getCondition"
           ></chart-metric>
       </el-row>
+      
       <el-row class="pt-5 pb-5 ml-3">
+
         <button type="primary" @click="preview" :disabled="loading" class="nz-btn nz-btn-size-normal nz-btn-style-normal ">{{$t('dashboard.metric.previewChart')}}</button>
         <button :disabled="saveDisabled || loading" type="primary" @click="preview('change')"
                 :class="{'nz-btn nz-btn-disabled nz-btn-size-normal nz-btn-style-light nz-btn-min-width-75 btn-disabled-cursor-not-allowed' : (saveDisabled || loading), 'nz-btn nz-btn-size-normal nz-btn-style-normal' : !(saveDisabled || loading)}"
         >{{chartSwitchWord}}</button>
+        
         <!-- <Button type="primary" @click="addTarget">添加指标</Button> -->
       </el-row>
+
       <el-row class="operate-area">
         <div class="operate-area-title">{{$t('dashboard.metric.saveChartToPanel')}}:</div>
+
         <button :disabled="saveDisabled" type="primary" @click="createNew"
                 :class="{'nz-btn nz-btn-disabled nz-btn-size-normal nz-btn-style-light  btn-disabled-cursor-not-allowed' : saveDisabled , 'nz-btn nz-btn-size-normal nz-btn-style-normal' : !saveDisabled}"
         >{{$t('dashboard.metric.createPanel')}}</button>
         <button :disabled="saveDisabled" type="primary" @click="selectPanel"
                 :class="{'nz-btn nz-btn-disabled nz-btn-size-normal nz-btn-style-light nz-btn-min-width-75 btn-disabled-cursor-not-allowed' : saveDisabled , 'nz-btn nz-btn-size-normal nz-btn-style-normal' : !saveDisabled}"
         >{{$t('dashboard.metric.selectPanel')}}</button>
+
       </el-row>
+
       <el-row class="mt-10">
         <el-checkbox :disabled="saveDisabled" v-model="isSave">options</el-checkbox>
       </el-row>
@@ -48,7 +55,9 @@
           <div class="common-float-left">
             <el-form-item label-width="80px" :label="$t('dashboard.panel.chartForm.high')" prop="height"
             :rules="{ required: true, type: 'number', trigger: 'change' }">
+
               <el-input-number :min="400" size="small" v-model="chartInfo.height" class="w-select" placeholder=""></el-input-number>px
+
             </el-form-item>
           </div>
         </el-row>