Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev

@@ -51,6 +51,14 @@ export default {
                 },
             },
             {
+                text: '最近6小时',
+                value: () => {
+                    const end = new Date();
+                    const start = formatDate(6,'h');
+                    return [start, end]
+                },
+            },
+            {
                 text: '最近1天',
                 value: () => {
                     const end = new Date();
@@ -238,7 +246,7 @@ export default {
 
         const oneDay=()=>{
             const end = getDateTime(new Date());
-            const start = formatDate(1,'d');
+            const start = formatDate(6,'h');
             dateValue.value=[start,end]
             changeDate(dateValue.value)
         }

@@ -28,7 +28,7 @@
       <el-col :span="24" class="detail_linechart">
         <LineChart :optionData="optionData" v-if="optionData"></LineChart>
 
-<!--        <div class="detail_linechart" id="indentKpiLineChart"></div>-->
+        <!--        <div class="detail_linechart" id="indentKpiLineChart"></div>-->
         <!--      <div class="detail_linechart" id="warningKpiLineChart" style="margin-top:35px;"></div>-->
         <!--      <div class="detail_linechart" id="line-tingyun-trendKpiLineChart" style="margin-top:35px;"></div>-->