From 51bfa3bd76e51a5788a59514ca2d12744ef79831 Mon Sep 17 00:00:00 2001
From: Kubbo <390378816@qq.com>
Date: Mon, 1 Jul 2024 01:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=BA=A4=E4=B8=80=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AppHourCount.vue         |  2 +-
 src/views/AppHourSale.vue          |  2 +-
 src/views/AppMarketBoardFilter.vue | 20 ++++++++++++--------
 src/views/AppSalesPerformance.vue  |  8 ++++++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/views/AppHourCount.vue b/src/views/AppHourCount.vue
index 0fe016e..28a2483 100644
--- a/src/views/AppHourCount.vue
+++ b/src/views/AppHourCount.vue
@@ -12,7 +12,7 @@ export default {
     search: v => v.$marketBoard.search,
     columns: v => {
       let {currentDate, compareDate} = v.search
-      const {compareSaleAmt, compareHourTotalAmt, currentHourTotalAmt, saleGrowthRate} = v.summary
+      const {compareSaleAmt = 0, compareHourTotalAmt = 0, currentHourTotalAmt = 0, saleGrowthRate = 0} = v.summary
       const {dayjs} = window
       currentDate = currentDate ? dayjs(currentDate).format("YYYY-MM-DD") : ""
       compareDate = compareDate ? dayjs(compareDate).format("YYYY-MM-DD") : ""
diff --git a/src/views/AppHourSale.vue b/src/views/AppHourSale.vue
index 9b5f3e4..ca45791 100644
--- a/src/views/AppHourSale.vue
+++ b/src/views/AppHourSale.vue
@@ -39,7 +39,7 @@ export default {
         ...this.search, limit: 999
       })).then(res => {
         if (res?.data) {
-          this.tableData = res.data?.page?.records || []
+          this.tableData = res.data?.page?.records?.map(e => ({...e, hour: `${`${e.hour-1}`.padStart(2, '0')}:00-${e.hour.padStart(2, '0')}:00`})) || []
         }
       })
     }
diff --git a/src/views/AppMarketBoardFilter.vue b/src/views/AppMarketBoardFilter.vue
index da424fe..6828281 100644
--- a/src/views/AppMarketBoardFilter.vue
+++ b/src/views/AppMarketBoardFilter.vue
@@ -24,8 +24,8 @@ export default {
       this.form = {
         compareDate: dayjs().subtract(1, "day").format("YYYYMMDD"),
         currentDate: dayjs().format("YYYYMMDD"),
-        groupCodeList: this.options?.[0].value,
-        hourNum: new Date().getHours()
+        hourNum: new Date().getHours(),
+        groupCodeList: this.options?.[0].value
       }
     })
   },
@@ -33,19 +33,19 @@ export default {
 </script>
 
 <template>
-  <el-form class="AppMarketBoardFilter flex" size="small" label-width="80px">
-    <el-form-item label="课长">
+  <el-form class="AppMarketBoardFilter flex" size="small" label-width="60px">
+    <el-form-item label="课长" class="fill">
       <el-select v-model="form.groupCodeList" @change="v=>$marketBoard.search.groupCodeList=[v]">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
     </el-form-item>
-    <el-form-item label="对比时间">
+    <el-form-item label="对比时间" class="fill">
       <el-date-picker v-model="form.compareDate" value-format="yyyyMMdd" @change="v=>$marketBoard.search.compareDate=v"/>
     </el-form-item>
-    <el-form-item label="当前时间">
+    <el-form-item label="当前时间" class="fill">
       <el-date-picker v-model="form.currentDate" value-format="yyyyMMdd" @change="v=>$marketBoard.search.currentDate=v"/>
     </el-form-item>
-    <el-form-item label="时段">
+    <el-form-item label="时段" class="fill">
       <el-select v-model="form.hourNum" :picker-options="options" size="small" format="HH:mm" value-format="H" @change="v=>$marketBoard.search.hourNum=v">
         <el-option v-for="item in dateOptions" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
@@ -59,7 +59,11 @@ export default {
   border: 1px solid #1760AE;
   border-radius: 0;
   color: #fff;
-  min-width: 120px;
+  min-width: 100px;
+}
+
+.AppMarketBoardFilter .el-input {
+  width: 100%;
 }
 
 .AppMarketBoardFilter .el-form-item__label {
diff --git a/src/views/AppSalesPerformance.vue b/src/views/AppSalesPerformance.vue
index 12279b0..29345cf 100644
--- a/src/views/AppSalesPerformance.vue
+++ b/src/views/AppSalesPerformance.vue
@@ -42,8 +42,12 @@ export default {
       return result
     }
   },
-  created() {
-    this.getData()
+  watch: {
+    search: {
+      immediate: true, deep: true, handler() {
+        this.getData()
+      }
+    }
   }
 }
 </script>