From 984da801c871d9252793a030a703c505f66aa279 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 23 Oct 2024 09:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AppHourSale.vue     |  7 ++-----
 src/views/AppStoreMonitor.vue | 13 +++++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/AppHourSale.vue b/src/views/AppHourSale.vue
index 0989049..630e23f 100644
--- a/src/views/AppHourSale.vue
+++ b/src/views/AppHourSale.vue
@@ -1,5 +1,4 @@
 <script>
-let timer
 export default {
   name: "AppHourSale",
   label: "市场看板-全门店时段销售",
@@ -91,18 +90,17 @@ export default {
       })).then(res => {
         if (res?.data) {
           this.summary = res.data.total
-          this.tableData = res.data?.page?.records?.map(e => ({...e, hour: `${e.hour.padStart(2, '0')}:00-${`${Number(e.hour) + 1}`.padStart(2, '0')}:00`})) || []
+          this.tableData = res.data?.page?.records?.map(e => ({...e, hour: `${e.hour.padStart(2, '0')}:00-${`${Number(e.hour) + 1}`.padStart(2, '0')}:00`, index: e.hour})).sort((a, b) => a.index - b.index) || []
         }
       })
     },
     handleSta({hour}) {
+      this.handleMouseout()
       const rowIndex = this.tableData.findIndex(e => e.hour == hour)
       const v = this
       const summary = {
         compareSaleAmt: 0, compareValidOrderNum: 0, currentSaleAmt: 0, currentValidOrderNum: 0, saleGrowthRate: 0
       }
-
-      console.log(rowIndex)
       v.tableData.forEach((e, i) => {
         if (i <= rowIndex) {
           summary.compareSaleAmt += Number(e.compareSaleAmt || 0)
@@ -123,7 +121,6 @@ export default {
       v.tableColumns.forEach(({prop}, i) => {
         summaryRow[prop] = i == 0 ? "时段合计" : (summary[prop] || '')
       })
-      this.handleMouseout()
       v.tableData.splice(rowIndex + 1, 0, summaryRow)
       // this.hourSummary = v.tableColumns.map((column, i) => {
       //   const isNumber = v => /^-?\d+(\.\d+)?%?$/.test(v)
diff --git a/src/views/AppStoreMonitor.vue b/src/views/AppStoreMonitor.vue
index 173ffc4..ddc7a86 100644
--- a/src/views/AppStoreMonitor.vue
+++ b/src/views/AppStoreMonitor.vue
@@ -57,9 +57,16 @@ export default {
       })).then(res => {
         if (res?.data) {
           this.summary = res.data.total
-          this.tableData = res.data?.page?.records || []
+          return this.tableData = res.data?.page?.records || []
         }
       })
+    },
+    getOptions() {
+      const ops = {}
+      this.tableData.forEach(e => {
+        ops[e.groupCode] = e.supervisorName
+      })
+      return Object.entries(ops).map(([key, value]) => ({label: value, value: key}))
     }
   },
   watch: {
@@ -71,9 +78,7 @@ export default {
   },
   created() {
     this.getTableData().then(() => {
-      this.options = this.tableData.map(e => ({
-        label: e.supervisorName, value: e.groupCode
-      }))
+      this.options = this.getOptions()
     })
   }
 }