改完今昨近七天

gold-system/.env.development

@@ -1,12 +1,5 @@
-<<<<<<< HEAD
 # VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
 # VITE_API_BASE='http://54.251.137.151:10704/'
-=======
-# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-#VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.94:8080/'
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
 # VITE_API_BASE='http://192.168.8.220:8080/'

gold-system/.env.production

@@ -1,12 +1,3 @@
 # VITE_API_BASE='http://54.251.137.151:10702/'
-<<<<<<< HEAD
-<<<<<<< HEAD
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-=======
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-# VITE_API_BASE='http://192.168.8.220:8080/'
->>>>>>> zry
-=======
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
+

gold-system/.env.test

@@ -1,21 +1,6 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.94:8080/'
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-# VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.232:8080/'
-=======
-# VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.94:8080/'
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-# VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.220:8080/'
->>>>>>> zry
-=======
 # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
 #VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
 # VITE_API_BASE='http://192.168.8.232:8080/'
->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
+

gold-system/src/views/goldBeen/goldenBeenConsum.vue

@@ -66,17 +66,30 @@
           style="width: 220px"
         />
       </el-form-item>
-      <el-form-item prop="createTime">
-        <el-text class="mx-1" size="large">消费时间：</el-text>
+      <el-form-item prop="startTime">
+        <el-text class="mx-1" size="large">开始时间：</el-text>
         <el-date-picker
-          v-model="detailY.createTime"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          v-model="detailY.startTime"
+          type="date"
+          placeholder="开始日期"
+          style="width: 240px"
           format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item prop="endTime">
+        <el-text class="mx-1" size="large">结束时间：</el-text>
+        <el-date-picker
+          v-model="detailY.endTime"
+          type="date"
+          placeholder="结束日期"
           style="width: 240px"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
+        <el-button style="margin-left: 10px" @click="getToday()">今</el-button>
+      <el-button @click="getYesterday()">昨</el-button>
+      <el-button @click="get7Days()">近7天</el-button>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="search">查询</el-button>
@@ -185,7 +198,8 @@ const ruleFormRef = ref<FormInstance>()
 const detailY = ref({
   jwcode: '',
   ipAddress: '',
-  createTime: '',
+  startTime:'',
+  endTime:'',
   // channel: '', //频道
   sourceName: '', //直播间
   sourceType: '' //消费类型
@@ -194,11 +208,45 @@ const getObj = ref({
   pageNum: 1,
   pageSize: 50
 })
+// 今天
+const getToday = function () {
+  const today = new Date()
+  // 格式化开始时间
+  const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
+// 昨天
+const getYesterday = function () {
+  const yesterday = moment().subtract(1, 'days')
+  // 格式化开始时间
+  const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
+// 近7天
+const get7Days = function () {
+  // 格式化开始时间
+  const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
+
 //初始化
 const getInit = async function () {
   try {
     console.log('搜索参数', getObj.value)
-    const [startTime, endTime] = detailY.value.createTime
+    const startTime = detailY.value.startTime
+    const endTime = detailY.value.endTime
     // 发送POST请求
     const result = await API({
       url: '/dou/getSpend',
@@ -263,8 +311,8 @@ const getCount = async () => {
       ipAddress: detailY.value.ipAddress,
       sourceName: detailY.value.sourceName,
       sourceType: detailY.value.sourceType,
-      startTime: detailY.value.createTime[0],
-      endTime: detailY.value.createTime[1]
+      startTime: detailY.value.startTime,
+      endTime: detailY.value.endTime
     }
   })
   if (result.code == 200) {

gold-system/src/views/goldBeen/goldenBeenDetail.vue

@@ -57,19 +57,31 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item prop="createTime">
-        <el-text class="mx-1" size="large">充值时间：</el-text>
+      <el-form-item prop="startTime">
+        <el-text class="mx-1" size="large">开始时间：</el-text>
         <el-date-picker
-          v-model="detailY.createTime"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          v-model="detailY.startTime"
+          type="date"
+          placeholder="开始日期"
           style="width: 240px"
           format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          :unlinkPanels="true"
         />
       </el-form-item>
+      <el-form-item prop="endTime">
+        <el-text class="mx-1" size="large">结束时间：</el-text>
+        <el-date-picker
+          v-model="detailY.endTime"
+          type="date"
+          placeholder="结束日期"
+          style="width: 240px"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-button style="margin-left: 10px" @click="getToday()">今</el-button>
+      <el-button @click="getYesterday()">昨</el-button>
+      <el-button @click="get7Days()">近7天</el-button>
       <el-form-item>
         <el-button type="primary" @click="search">查询</el-button>
         <el-button type="success" @click="reset(ruleFormRef)">重置</el-button>
@@ -229,7 +241,38 @@ const rules = ref({
   jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
   area: [{ required: true, message: '请选择所属地区', trigger: 'change' }]
 })
-//获取地区接口
+// 今天
+const getToday = function () {
+  const today = new Date()
+  // 格式化开始时间
+  const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
+// 昨天
+const getYesterday = function () {
+  const yesterday = moment().subtract(1, 'days')
+  // 格式化开始时间
+  const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
+// 近7天
+const get7Days = function () {
+  // 格式化开始时间
+  const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
 const getArea = async () => {
   try {
     const result = await API({
@@ -271,7 +314,8 @@ const detailY = ref({
   orderNo: '',
   payStyle: '',
   type: '',
-  createTime: ''
+  startTime: '',
+  endTime: ''
 })
 const getObj = ref({
   pageNum: 1,
@@ -363,8 +407,6 @@ const getInit = async function (
 ) {
   try {
     console.log('搜索参数', getObj.value)
-    const [startTime, endTime] = detailY.value.createTime
-    console.log(startTime, endTime)
     // 发送POST请求
     const result = await API({
       url: '/dou/getPay',
@@ -372,8 +414,8 @@ const getInit = async function (
         pay: {
           jwcode: isExport.value ? excelData.jwcode : detailY.value.jwcode,
           deptName: isExport.value ? excelData.area : detailY.value.deptName,
-          startTime: isExport.value ? excelData.startTime : startTime || '',
-          endTime: isExport.value ? excelData.endTime : endTime || '',
+          startTime: isExport.value ? excelData.startTime : detailY.value.startTime || '',
+          endTime: isExport.value ? excelData.endTime : detailY.value.endTime || '',
           payStyle: isExport.value ? '' : detailY.value.payStyle,
           type: isExport.value ? '' : detailY.value.type,
           orderNo: isExport.value ? '' : detailY.value.orderNo,
@@ -448,8 +490,8 @@ const getCount = async () => {
       data: {
         jwcode: detailY.value.jwcode,
         deptName: detailY.value.deptName,
-        startTime: detailY.value.createTime[0],
-        endTime: detailY.value.createTime[1],
+        startTime: detailY.value.startTime,
+        endTime: detailY.value.endTime,
         orderNo: detailY.value.orderNo,
         type: detailY.value.type
         // payStyle: detailY.value.payStyle

gold-system/src/views/goldBeen/onLineDetail.vue

@@ -60,19 +60,31 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="createTime">
-        <el-text class="mx-1" size="large">充值时间：</el-text>
+      <el-form-item prop="startTime">
+        <el-text class="mx-1" size="large">开始时间：</el-text>
         <el-date-picker
-          v-model="detailY.createTime"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          v-model="detailY.startTime"
+          type="date"
+          placeholder="开始日期"
           style="width: 240px"
           format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          :unlinkPanels="true"
         />
       </el-form-item>
+      <el-form-item prop="endTime">
+        <el-text class="mx-1" size="large">结束时间：</el-text>
+        <el-date-picker
+          v-model="detailY.endTime"
+          type="date"
+          placeholder="结束日期"
+          style="width: 240px"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button style="margin-left: 10px" @click="getToday()">今</el-button>
+      <el-button @click="getYesterday()">昨</el-button>
+      <el-button @click="get7Days()">近7天</el-button>
+      </el-form-item>
       <el-col :span="10">
         <el-form-item>
         <el-button type="primary" @click="search">查询</el-button>
@@ -230,6 +242,38 @@ const rules = ref({
   jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
   area: [{ required: true, message: '请选择所属地区', trigger: 'change' }]
 })
+// 今天
+const getToday = function () {
+  const today = new Date()
+  // 格式化开始时间
+  const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
+// 昨天
+const getYesterday = function () {
+  const yesterday = moment().subtract(1, 'days')
+  // 格式化开始时间
+  const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
+// 近7天
+const get7Days = function () {
+  // 格式化开始时间
+  const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  detailY.value.startTime = startDate
+  detailY.value.endTime = endDate
+  search()
+}
 const handlePageSizeChange = (val) => {
   getObj.value.pageSize = val
   getObj.value.pageNum = 1
@@ -263,7 +307,8 @@ const detailY = ref({
   orderNo: '',
   payStyle: '',
   type: '',
-  createTime: ''
+  startTime: '',
+  endTime: ''
 })
 const getObj = ref({
   pageNum: 1,
@@ -355,7 +400,9 @@ const getInit = async function (
 ) {
   try {
     console.log('搜索参数', getObj.value)
-    const [startTime, endTime] = detailY.value.createTime
+    const startTime = detailY.value.startTime
+    const endTime = detailY.value.endTime
+
     console.log(startTime, endTime)
     // 发送POST请求
     const result = await API({
@@ -458,8 +505,8 @@ const getCount = async () => {
       data: {
         jwcode: detailY.value.jwcode,
         deptName: detailY.value.deptName,
-        startTime: detailY.value.createTime[0],
-        endTime: detailY.value.createTime[1],
+        startTime: detailY.value.startTime,
+        endTime: detailY.value.endTime,
         orderNo: detailY.value.orderNo,
         payStyle: detailY.value.payStyle
       }

gold-system/src/views/index.vue

@@ -22,6 +22,7 @@ const { currentArea, updateArea } = storeToRefs(areaStore)
 const adminData = ref({
   name: ''
 })
+
 const getAdminData = async function () {
   try {
     const result = await API({ url: '/admin/userinfo', data: {} })

gold-system/src/views/login.vue

@@ -225,3 +225,19 @@ More comprehensive version at shenanigans.shoghisimon.ca/collection/css
   background-size: 100% 2px, 100% 100%, 100% 100%;
 }
 </style>
+
+<!-- 这是补救
+  const run = () => {
+    const width = window.innerWidth;
+    const height = window.innerHeight;
+   
+    const chartNode = document.querySelector("main");
+    drawChart.default(chartNode,data,width,height);
+  };
+  window.addEventListener("resize", run);
+  document.addEventListener("DOMContentLoaded", run);
+
+  </script>
+  </body>
+  </html>
+-->

gold-system/src/views/managerecharge/activity.vue

@@ -95,7 +95,58 @@ const get = async function (val) {
     ElMessage.error('请求失败')
   }
 }
-
+// 今天
+const getToday = function () {
+  const today = new Date()
+  const startDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate()
+  )
+  const endDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  )
+  getTime.value = [startDate, endDate]
+  console.log('getTime', getTime.value)
+  get()
+}
+// 昨天
+const getYesterday = function () {
+  const yesterday = new Date()
+  yesterday.setDate(yesterday.getDate() - 1)
+  const startDate = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate()
+  )
+  const endDate = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate() + 1
+  )
+  getTime.value = [startDate, endDate]
+  console.log('getTime', getTime.value)
+  get()
+}
+// 近7天
+const get7Days = function () {
+  const today = new Date()
+  const startDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() - 6
+  )
+  const endDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  )
+  getTime.value = [startDate, endDate]
+  console.log('getTime', getTime.value)
+  get()
+}
 // 活动名称去空格
 const trim = () => {
   if (activity.value.activityName) {
@@ -173,7 +224,6 @@ const throttledAdd = async () => {
     ElMessage.error('新增活动失败')
   }
 }
-<<<<<<< HEAD
 
 // 删除确认方法
 const delConfirm = async (row) => {
@@ -199,8 +249,6 @@ const delConfirm = async (row) => {
 const del = (row) => {
   delObj.value = row
 }
-=======
->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
 </script>
 
 <template>
@@ -226,6 +274,11 @@ const del = (row) => {
               start-placeholder="起始时间"
               end-placeholder="结束时间"
             />
+            <el-button style="margin-left: 10px" @click="getToday()"
+                >今</el-button
+              >
+              <el-button @click="getYesterday()">昨</el-button>
+              <el-button @click="get7Days()">近7天</el-button>
           </div>
           <div class="head-card-btn">
             <el-button type="success" @click="reset()">重置</el-button>
@@ -271,6 +324,7 @@ const del = (row) => {
                 {{ moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') }}
               </template>
             </el-table-column>
+            
             <el-table-column prop="rechargeRatio" label="免费兑换比">
               <template #default="scope">
                 <span>{{ scope.row.rechargeRatio }}:1</span>

gold-system/src/views/managerecharge/rate.vue

@@ -22,7 +22,7 @@ const getAdminData = async function () {
     rateAdd.value.adminId = adminData.value.adminId
     rateEdit.value.adminId = adminData.value.adminId
     console.log('请求成功', result)
-    console.log('用户信息', user.value)
+    // console.log('用户信息', user.value)
   } catch (error) {
     console.log('请求失败', error)
   }
@@ -31,7 +31,6 @@ getAdminData()
 
 const regeAdd = ref(false)
 const regeEdit = ref(false)
-
 //汇率表格数据
 const tableData = ref([])
 //搜索对象
@@ -39,10 +38,11 @@ const getObj = ref({
   pageNum: 1,
   pageSize: 10
 })
+
 const total = ref(0)
 //分页总条目
 
-//时间选择器
+// 时间选择器
 const value1 = ref({
   startTime: '',
   endTime: ''
@@ -58,45 +58,102 @@ function handleDateChange(value) {
 const time = ref({})
 const get = async function (val) {
   // 搜索参数时间赋值
-  if (value1.value != null) {
-    if (value1.value.startDate != '' && value1.value.endDate != '') {
-      time.value.startTime = value1.value[0]
-      time.value.endTime = value1.value[1]
-    }
+  if (value1.value && value1.value.length === 2) {
+    time.value.startTime = value1.value[0];
+    time.value.endTime = value1.value[1];
   } else {
-    time.value.startTime = ''
-    time.value.endTime = ''
+    time.value.startTime = '';
+    time.value.endTime = '';
   }
   try {
     // 搜索参数页码赋值
     if (typeof val === 'number') {
-      getObj.value.pageNum = val
+      getObj.value.pageNum = val;
     }
 
-    console.log('搜索参数', getObj.value)
+    console.log('搜索参数', {
+      ...getObj.value,
+      rate: { ...time.value }
+    });
     // 发送POST请求
     const result = await request({
       url: '/rates/search',
+      method: 'POST',
       data: {
         ...getObj.value,
         rate: { ...time.value }
       }
-    })
+    });
 
     // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
+    console.log('请求成功', result);
     // 存储表格数据
-    tableData.value = result.data.list
-    console.log('tableData', tableData.value)
-    // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
+    tableData.value = result.data.list;
+    console.log('tableData', tableData.value);
     // 存储分页总条目
-    total.value = result.data.total
-    console.log('total', total.value)
+    total.value = result.data.total;
+    console.log('total', total.value);
   } catch (error) {
-    console.log('请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
+    console.log('请求失败', error);
+    ElMessage.error('请求失败');
   }
 }
+
+// 今天
+const getToday = function () {
+  const today = new Date();
+  const startDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate()
+  );
+  const endDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  );
+  // value1!!value1!!lhl狗屎脑子
+  value1.value = [startDate, endDate]; 
+  console.log('value1', value1.value);
+  get();
+}
+// 昨天
+const getYesterday = function () {
+  const yesterday = new Date();
+  yesterday.setDate(yesterday.getDate() - 1);
+  const startDate = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate()
+  );
+  const endDate = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate() + 1
+  );
+  // 这个也是value1！！
+  value1.value = [startDate, endDate]; 
+  console.log('value1', value1.value);
+  get();
+}
+// 近7天
+const get7Days = function () {
+  const today = new Date();
+  const startDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() - 6
+  );
+  const endDate = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  );
+  // value1！！
+  value1.value = [startDate, endDate]; 
+  console.log('value1', value1.value);
+  get();
+}
 // 搜索
 const search = function () {
   getObj.value.pageNum = 1
@@ -464,21 +521,22 @@ function handleInput(value) {
             :size="size"
             value-format="YYYY-MM-DD"
           />
+          <el-button style="margin-left: 10px" @click="getToday">今</el-button>
+          <el-button @click="getYesterday">昨</el-button>
+          <el-button @click="get7Days">近7天</el-button>
           <!-- 按钮 -->
           <el-button
             class="button-item"
             type="primary"
             style="float: right"
-            @click="search()"
-            >查询</el-button
-          >
+            @click="search"
+          >查询</el-button>
           <el-button
             class="button-item"
             type="success"
             style="float: right"
             @click="handledelete"
-            >重置</el-button
-          >
+          >重置</el-button>
         </div>
       </el-card>
     </el-col>

gold-system/src/views/usergold/index.vue

@@ -203,55 +203,28 @@ const reset = function () {
 }
 // 今天
 const getToday = function () {
-  const today = new Date()
-  const startDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate()
-  )
-  const endDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
-  )
+  const today = moment()
+  const startDate = today.startOf('day').toDate()
+  const endDate = today.endOf('day').toDate()
   getTime.value = [startDate, endDate]
-  console.log('getTime', getTime.value)
-  get()
+  search()
 }
+
 // 昨天
 const getYesterday = function () {
-  const yesterday = new Date()
-  yesterday.setDate(yesterday.getDate() - 1)
-  const startDate = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate()
-  )
-  const endDate = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate() + 1
-  )
+  const yesterday = moment().subtract(1, 'day')
+  const startDate = yesterday.startOf('day').toDate()
+  const endDate = yesterday.endOf('day').toDate()
   getTime.value = [startDate, endDate]
-  console.log('getTime', getTime.value)
-  get()
+  search()
 }
+
 // 近7天
 const get7Days = function () {
-  const today = new Date()
-  const startDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() - 6
-  )
-  const endDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
-  )
+  const startDate = moment().subtract(6, 'day').startOf('day').toDate()
+  const endDate = moment().endOf('day').toDate()
   getTime.value = [startDate, endDate]
-  console.log('getTime', getTime.value)
-  get()
+  search()
 }
 
 // 验证跳转输入框的数字是否合法
@@ -731,11 +704,12 @@ const handleCurrentChange = function (val) {
             range-separator="至"
             start-placeholder="起始时间"
             end-placeholder="结束时间"
-            style="margin-right: 700px"
+            style="margin-right: 10px"
           />
-          <el-button type="success" @click="getPutEX = true"
-            >导出Excel表格</el-button
-          >
+          <el-button type="success" @click="getToday()">今</el-button>
+          <el-button type="success" @click="getYesterday()">昨</el-button>
+          <el-button type="success" @click="get7Days()">近7天</el-button>
+          <el-button type="success" @click="getPutEX = true">导出Excel表格</el-button>
           <el-button type="success" @click="reset()">重置</el-button>
           <el-button type="primary" @click="search()">查询</el-button>
         </div>