From 901118235792bac06470db2528c2bba19dd84fa1 Mon Sep 17 00:00:00 2001
From: ruancuihong <2806986110@qq.com>
Date: Thu, 13 Mar 2025 20:06:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/theme/element/index.scss                  | 10 +--
 src/theme/index.scss                          |  4 +-
 .../components/MonitorWarning.vue             | 79 ++++++++++---------
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/theme/element/index.scss b/src/theme/element/index.scss
index 962aeaf..ac3337a 100644
--- a/src/theme/element/index.scss
+++ b/src/theme/element/index.scss
@@ -38,15 +38,15 @@ $--text-color: (
   'disabled': rgba(255, 255, 255, 0.5)
 );
 $--table: (
-  'border-color': transparent,
-  'border': none,
+  // 'border-color': transparent,
+  // 'border': none,
   'text-color': rgba(255, 255, 255, 1),
-  'header-text-color': rgba(255, 255, 255, 1),
+  'header-text-color': #515a6e,
   'row-hover-bg-color': #0acccc,
   'current-row-bg-color': rgba(20, 112, 204, 1),
-  'header-bg-color': rgba(20, 112, 204, 1),
+  'header-bg-color': transparent,
   'bg-color': transparent,
-  'tr-bg-color': transparent
+  'tr-bg-color': transparent,
 );
 
 $--button: (
diff --git a/src/theme/index.scss b/src/theme/index.scss
index a121b8b..5634685 100644
--- a/src/theme/index.scss
+++ b/src/theme/index.scss
@@ -4,12 +4,12 @@
 @use "element-plus/theme-chalk/src/index.scss" as *;
 @use "./overview.scss" as *;
 @use "./search.scss" as *;
-@use "./date.scss" as *;
+// @use "./date.scss" as *;
 @use "./input.scss" as *;
 @use "./select.scss" as *;
 @use "./dialog.scss" as *;
 @use "./tree.scss" as *;
-@use "./table.scss" as *;
+// @use "./table.scss" as *;
 @use "./tabs.scss" as *;
 @use "./step.scss" as *;
 @use "./upload.scss" as *;
diff --git a/src/views/Main/ProjectOperation/components/MonitorWarning.vue b/src/views/Main/ProjectOperation/components/MonitorWarning.vue
index d36a07a..a9950f5 100644
--- a/src/views/Main/ProjectOperation/components/MonitorWarning.vue
+++ b/src/views/Main/ProjectOperation/components/MonitorWarning.vue
@@ -12,22 +12,21 @@
         <span class="ml-10 mr-6">开始日期</span>
         <el-date-picker
           class="w-150"
-          size="small"
-          type="date"
+          popper-class="date-select-common"
           v-model="startDate"
+          type="date"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           placeholder="选择日期"
-          value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
         ></el-date-picker>
         <span class="ml-10 mr-6">结束日期</span>
         <el-date-picker
           class="w-150"
-          size="small"
           type="date"
           v-model="endDate"
           placeholder="选择日期"
-          value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
         ></el-date-picker>
       </div>
       <div class="flex items-center">
@@ -89,32 +88,32 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, reactive, onMounted, watch } from "vue";
-import dayjs from "dayjs";
-import { getReservoirCZAlarmPageData } from "@/api/reservoir";
+import { ref, reactive, onMounted, watch } from 'vue';
+import dayjs from 'dayjs';
+import { getReservoirCZAlarmPageData } from '@/api/reservoir';
 
 const props = defineProps({
   resCode: {
     type: String,
-    default: "",
-  },
+    default: ''
+  }
 });
-const dateRange: any = ref("0");
-const startDate: any = ref(dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"));
-const endDate: any = ref(dayjs().format("YYYY-MM-DD HH:mm:ss"));
+const dateRange: any = ref('0');
+const startDate: any = ref(dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss'));
+const endDate: any = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
 const tableData: any = ref([]);
 const paramsData: any = ref({
   pageSize: 10,
   pageNum: 1,
-  total: 0,
+  total: 0
 });
-const emit = defineEmits(["node-click"]);
+const emit = defineEmits(['node-click']);
 watch(
   () => props.resCode,
   (val) => {
     getTableData(val);
   },
-  { immediate: true },
+  { immediate: true }
 );
 
 // onMounted(() => {
@@ -123,37 +122,37 @@ watch(
 
 function getTableData() {
   getReservoirCZAlarmPageData({
-    startDate: startDate.value,
-    endDate: endDate.value,
+    startDate: startDate.value + ' 00:00:00',
+    endDate: endDate.value + ' 23:59:59',
     pageSize: paramsData.value.pageSize,
-    pageNum: paramsData.value.pageNum,
-  }).then((res) => {
-    console.log("res >>>>>  ", res);
+    pageNum: paramsData.value.pageNum
+  }).then((res: any) => {
+    console.log('res >>>>>  ', res);
     tableData.value = res.records || [];
     paramsData.value.total = res.total;
   });
 }
 function handleChangeDate(value) {
   switch (value) {
-    case "0":
-      startDate.value = dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss");
-      endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
+    case '0':
+      startDate.value = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss');
+      endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
       break;
-    case "1":
-      startDate.value = dayjs().subtract(1, "day").format("YYYY-MM-DD HH:mm:ss");
-      endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
+    case '1':
+      startDate.value = dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss');
+      endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
       break;
-    case "2":
-      startDate.value = dayjs().subtract(7, "day").format("YYYY-MM-DD HH:mm:ss");
-      endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
+    case '2':
+      startDate.value = dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss');
+      endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
       break;
-    case "3":
-      startDate.value = dayjs().subtract(3, "month").format("YYYY-MM-DD HH:mm:ss");
-      endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
+    case '3':
+      startDate.value = dayjs().subtract(3, 'month').format('YYYY-MM-DD HH:mm:ss');
+      endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
       break;
-    case "4":
-      startDate.value = dayjs().subtract(1, "year").format("YYYY-MM-DD HH:mm:ss");
-      endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
+    case '4':
+      startDate.value = dayjs().subtract(1, 'year').format('YYYY-MM-DD HH:mm:ss');
+      endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
       break;
     default:
       break;
@@ -174,11 +173,13 @@ function handleReset() {
 </script>
 <style scoped lang="scss">
 .monitor-warning {
+  width: 100%;
+  padding: 12px;
   .search-box {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 0 12px;
+    // padding: 0 12px;
     font-size: 14px;
     color: #262626;
     padding-bottom: 12px;