From 4ab06636fab9eec13f75010d12caaaab5b9a862e Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Fri, 11 Aug 2023 09:53:58 +0800
Subject: [PATCH] =?UTF-8?q?SERVICE=20AND=20PROCESS=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/style.less                                 | 10 ++++++++++
 .../serverMonitor/instances/monitor.vue        |  2 +-
 .../serverMonitor/instances/serviceProcess.vue | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/style.less b/src/style.less
index 6d994fa..2524847 100644
--- a/src/style.less
+++ b/src/style.less
@@ -160,6 +160,13 @@ body {
   &-time-picker-inner {
     background-color: @modalBg;
   }
+  &-time-picker {
+    background: none;
+  }
+  &-time-picker-combobox {
+    background-color: @modalBg !important;
+    border-color: @formInputBorderColor !important
+  }
 
   &-picker {
     width: 100%;
@@ -170,6 +177,9 @@ body {
       background-color: @formInputBgColor;
       color: #00e9fe !important;
     }
+    &-select {
+      background-color: @formInputBgColor !important
+    }
   }
 
   &-input {
diff --git a/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue b/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue
index ed2c4cb..f2410f2 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue
@@ -29,7 +29,7 @@
         </a-col>
         <a-col flex="265px">
           <a-range-picker
-            dropdownClassName="asd"
+            :show-time="true"
             :default-value="[moment(queryParams.startDate), moment(queryParams.endDate)]"
             @change="onRangeDateChange" 
           />
diff --git a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
index 769b568..e87c7a0 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
@@ -27,6 +27,13 @@
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
           </a-select>
         </a-col>
+        <a-col flex="265px">
+          <a-range-picker
+            :show-time="true"
+            :default-value="[moment(queryParams.startDate), moment(queryParams.endDate)]"
+            @change="onRangeDateChange" 
+          />
+        </a-col>
       </a-row>
       <div class="service-search-btns">
         <a-button :class="['service-search-btns-ant', type=='cpu'?'service-search-btns-active':'']" @click="handleCpu">CPU</a-button>
@@ -110,8 +117,10 @@
 </template>
 
 <script>
+import moment from 'moment';
 import BoxTitle from '../../components/boxTitle.vue';
 import TableList from '../../components/tableList.vue';
+import dateFormat from '@/components/jeecg/JEasyCron/format-date'
 import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
 import * as echarts from 'echarts'
 const columns = [{
@@ -166,7 +175,9 @@ export default {
       type: "cpu",
       queryParams: {
         server: undefined,
-        timer: "1h"
+        timer: "1h",
+        startDate: dateFormat(new Date(), 'yyyy-MM-dd'),
+        endDate: dateFormat(new Date(), 'yyyy-MM-dd')
       },
       serverOptions: [],
       timerOptions: [
@@ -218,6 +229,11 @@ export default {
     })
   },
   methods: {
+    moment,
+    onRangeDateChange(date, dateString) {
+      this.queryParams.startDate = dateString[0]
+      this.queryParams.endDate = dateString[1]
+    },
     filterOption(input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0