From a8ea0e4b2620225abbc2c6306a9db42664745c67 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 8 Oct 2024 16:31:21 +0800
Subject: [PATCH 1/6] sc

---
 src/api/home/reportSignRate.js  |   5 ++
 src/router/modules/remaining.ts |  42 ++++++------
 src/views/Home/CloseRate.vue    | 111 +++++++++++++++++++++++++++++++-
 3 files changed, 135 insertions(+), 23 deletions(-)
 create mode 100644 src/api/home/reportSignRate.js

diff --git a/src/api/home/reportSignRate.js b/src/api/home/reportSignRate.js
new file mode 100644
index 0000000..3ceb4af
--- /dev/null
+++ b/src/api/home/reportSignRate.js
@@ -0,0 +1,5 @@
+import request from '@/config/axios'
+// 线索情况
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/signRate/report', data })
+}
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index a6b5036..85ab24e 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -130,27 +130,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //     }
   //   ]
   // },
-  // {
-  //   path: '/Basic',
-  //   component: Layout,
-  //   name: 'Basic',
-  //   meta: {},
-  //   redirect: '/Basic/menu',
-  //   children: [
-  //     {
-  //       path: 'menu',
-  //       component: () => import('@/views/Basic/Menu/index.vue'),
-  //       name: 'Menu',
-  //       meta: {
-  //         canTo: true,
-  //         hidden: true,
-  //         noTagsView: false,
-  //         icon: 'ep:user',
-  //         title: '菜单管理'
-  //       }
-  //     }
-  //   ]
-  // },
+  {
+    path: '/Basic',
+    component: Layout,
+    name: 'Basic',
+    meta: { title: '菜单管理' },
+    redirect: '/Basic/menu',
+    children: [
+      {
+        path: 'menu',
+        component: () => import('@/views/Basic/Menu/index.vue'),
+        name: 'Menu',
+        meta: {
+          canTo: true,
+          hidden: true,
+          noTagsView: false,
+          icon: 'ep:user',
+          title: '菜单管理'
+        }
+      }
+    ]
+  },
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),
diff --git a/src/views/Home/CloseRate.vue b/src/views/Home/CloseRate.vue
index c8876d0..f873d6c 100644
--- a/src/views/Home/CloseRate.vue
+++ b/src/views/Home/CloseRate.vue
@@ -1,7 +1,114 @@
 <template>
-  <div> 成交率 </div>
+  <div>
+    <ContentWrap>
+      <el-form :model="searchForm" label-width="0" inline>
+        <el-form-item>
+          <el-date-picker
+            v-model="searchForm.year"
+            type="year"
+            format="YYYY"
+            value-format="YYYY"
+            placeholder="选择年"
+            :clearable="false"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="searchForm.nickname" placeholder="销售姓名" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch">查询</el-button>
+          <el-button @click="handleReset">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table :data="tableList" border stripe :default-sort="{ prop: 'totalRate' }">
+        <el-table-column type="index" width="50" fixed="left" />
+        <el-table-column prop="nickname" label="姓名" width="80" />
+        <el-table-column
+          v-for="(item, index) in new Date().getMonth() + 1"
+          :key="index"
+          :label="item + '月'"
+          sortable
+          min-width="150"
+          :sort-method="(pre, cur) => monthSort(pre, cur, index)"
+        >
+          <template #default="{ row }">
+            <span>{{ (row.monthClueSignRateReportList[index].rate * 100).toFixed(2) }}%</span>
+            <span>({{ row.monthClueSignRateReportList[index].clueSignNum }}/</span>
+            <span>{{ row.monthClueSignRateReportList[index].followClueNum }})</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="总成交率"
+          prop="totalRate"
+          min-width="150"
+          fixed="right"
+          sortable
+          :sort-method="totalSort"
+        />
+      </el-table>
+    </ContentWrap>
+  </div>
 </template>
 
-<script setup name="CloseRate"></script>
+<script setup name="CloseRate">
+import * as reportApi from '@/api/home/reportSignRate'
+import { removeNullField } from '@/utils'
+
+onMounted(() => {
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    nickname: undefined,
+    year: new Date().getFullYear() + ''
+  }
+}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data.map((item) => {
+      const count = item.monthClueSignRateReportList.reduce(
+        (pre, cur) => {
+          return {
+            signCount: pre.signCount + cur.clueSignNum,
+            clueCount: pre.clueCount + cur.followClueNum
+          }
+        },
+        { signCount: 0, clueCount: 0 }
+      )
+      const rate = count.clueCount > 0 ? ((count.signCount * 100) / count.clueCount).toFixed(2) : 0
+      return {
+        ...item,
+        totalRate: `${rate}%(${count.signCount}/${count.clueCount})`,
+        totalRateNum: rate
+      }
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+function totalSort(pre, cur) {
+  return Number(pre.totalRateNum) - Number(cur.totalRateNum)
+}
+
+function monthSort(pre, cur, idx) {
+  console.log(idx)
+
+  return (
+    Number(pre.monthClueSignRateReportList[idx].rate) -
+    Number(cur.monthClueSignRateReportList[idx].rate)
+  )
+}
+</script>
 
 <style lang="scss" scoped></style>

From 41c20623d457aa0829e4c8a83a57ef0ddaa7c65d Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 8 Oct 2024 18:08:22 +0800
Subject: [PATCH 2/6] cc

---
 src/api/home/reportChannel.js                 |   4 +
 src/api/home/reportSignRate.js                |   1 -
 src/router/modules/remaining.ts               |  42 +++---
 src/views/Home/ChannelReport.vue              | 140 ++++++++++++++++++
 src/views/Home/CloseRate.vue                  |   2 +-
 .../Home/{channel.vue => SignReport.vue}      |   2 +-
 6 files changed, 167 insertions(+), 24 deletions(-)
 create mode 100644 src/api/home/reportChannel.js
 create mode 100644 src/views/Home/ChannelReport.vue
 rename src/views/Home/{channel.vue => SignReport.vue} (76%)

diff --git a/src/api/home/reportChannel.js b/src/api/home/reportChannel.js
new file mode 100644
index 0000000..0e1d268
--- /dev/null
+++ b/src/api/home/reportChannel.js
@@ -0,0 +1,4 @@
+import request from '@/config/axios'
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/report', data })
+}
diff --git a/src/api/home/reportSignRate.js b/src/api/home/reportSignRate.js
index 3ceb4af..0b515fe 100644
--- a/src/api/home/reportSignRate.js
+++ b/src/api/home/reportSignRate.js
@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-// 线索情况
 export const getList = async (data) => {
   return await request.post({ url: '/admin-api/crm/sch-clue/signRate/report', data })
 }
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 85ab24e..13f762a 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -130,27 +130,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //     }
   //   ]
   // },
-  {
-    path: '/Basic',
-    component: Layout,
-    name: 'Basic',
-    meta: { title: '菜单管理' },
-    redirect: '/Basic/menu',
-    children: [
-      {
-        path: 'menu',
-        component: () => import('@/views/Basic/Menu/index.vue'),
-        name: 'Menu',
-        meta: {
-          canTo: true,
-          hidden: true,
-          noTagsView: false,
-          icon: 'ep:user',
-          title: '菜单管理'
-        }
-      }
-    ]
-  },
+  // {
+  //   path: '/Basic',
+  //   component: Layout,
+  //   name: 'Basic',
+  //   meta: { title: '菜单管理' },
+  //   redirect: '/Basic/menu',
+  //   children: [
+  //     {
+  //       path: 'menu',
+  //       component: () => import('@/views/Basic/Menu/index.vue'),
+  //       name: 'Menu',
+  //       meta: {
+  //         canTo: true,
+  //         hidden: true,
+  //         noTagsView: false,
+  //         icon: 'ep:user',
+  //         title: '菜单管理'
+  //       }
+  //     }
+  //   ]
+  // },
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),
diff --git a/src/views/Home/ChannelReport.vue b/src/views/Home/ChannelReport.vue
new file mode 100644
index 0000000..c38c3b2
--- /dev/null
+++ b/src/views/Home/ChannelReport.vue
@@ -0,0 +1,140 @@
+<template>
+  <div>
+    <ContentWrap>
+      <el-form :model="searchForm" label-width="0" inline>
+        <el-form-item>
+          <el-date-picker
+            v-model="searchForm.period"
+            type="month"
+            format="YYYY-MM"
+            value-format="YYYY-MM"
+            placeholder="选择年月"
+            :clearable="false"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-tree-select
+            v-model="searchForm.sourceId"
+            :data="sourceOptions"
+            :props="defaultProps"
+            check-strictly
+            node-key="sourceId"
+            placeholder="请选择渠道"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch">查询</el-button>
+          <el-button @click="handleReset">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        v-loading="loading"
+        :data="tableList"
+        border
+        stripe
+        :summary-method="getSummaries"
+        show-summary
+      >
+        <el-table-column prop="sourceName" label="渠道名称" />
+        <el-table-column prop="newClueSignNum" label="新线索成交数" sortable />
+        <el-table-column prop="newClueNum" label="新线索总数" sortable />
+        <el-table-column prop="rate" label="新线索成交率" sortable :formatter="parseRate" />
+        <el-table-column prop="reallyClueSignNum" sortable>
+          <template #header> <Tooltip message="新线索+老线索" /> <span>实际成交数</span> </template>
+        </el-table-column>
+      </el-table>
+    </ContentWrap>
+  </div>
+</template>
+
+<script setup name="ChannelReport">
+import * as reportApi from '@/api/home/reportChannel'
+import { getSimpleSourceList } from '@/api/clue/source'
+import { removeNullField } from '@/utils'
+import { formatDate } from '@/utils/formatTime'
+import { handleTree } from '@/utils/tree'
+
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+
+onMounted(() => {
+  getOptions()
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    sourceName: undefined,
+    period: formatDate(new Date(), 'YYYY-MM')
+  }
+}
+
+const sourceOptions = ref([])
+
+function getOptions() {
+  getSimpleSourceList().then((data) => {
+    sourceOptions.value = handleTree(data, 'sourceId')
+  })
+}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+function parseRate(row) {
+  return Number(row.rate * 100).toFixed(2) + '%'
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '合计'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property == 'rate') {
+        const sum = data.reduce(
+          (pre, cur) => ({
+            clueNum: pre.clueNum + cur.newClueNum,
+            signNum: pre.signNum + cur.newClueSignNum
+          }),
+          { clueNum: 0, signNum: 0 }
+        )
+        sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
+      } else {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Home/CloseRate.vue b/src/views/Home/CloseRate.vue
index f873d6c..aa9aa68 100644
--- a/src/views/Home/CloseRate.vue
+++ b/src/views/Home/CloseRate.vue
@@ -21,7 +21,7 @@
         </el-form-item>
       </el-form>
 
-      <el-table :data="tableList" border stripe :default-sort="{ prop: 'totalRate' }">
+      <el-table v-loading="loading" :data="tableList" border stripe>
         <el-table-column type="index" width="50" fixed="left" />
         <el-table-column prop="nickname" label="姓名" width="80" />
         <el-table-column
diff --git a/src/views/Home/channel.vue b/src/views/Home/SignReport.vue
similarity index 76%
rename from src/views/Home/channel.vue
rename to src/views/Home/SignReport.vue
index 082b0bf..b780bce 100644
--- a/src/views/Home/channel.vue
+++ b/src/views/Home/SignReport.vue
@@ -1,5 +1,5 @@
 <template>
-  <div> </div>
+  <div>成交报表</div>
 </template>
 
 <script setup></script>

From 2406bcb8e4400f1114910f500ef8a365fcc782cd Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 9 Oct 2024 16:38:49 +0800
Subject: [PATCH 3/6] sc

---
 src/api/home/reportSignDetail.js       |   8 +
 src/views/Home/ChannelReport.vue       | 127 ++--------------
 src/views/Home/Comp/ChannelMonthly.vue | 147 +++++++++++++++++++
 src/views/Home/Comp/ChannelPeriod.vue  | 160 ++++++++++++++++++++
 src/views/Home/Comp/SignListCard.vue   | 105 +++++++++++++
 src/views/Home/Comp/SignTotalCard.vue  | 195 +++++++++++++++++++++++++
 src/views/Home/SignReport.vue          |  10 +-
 7 files changed, 634 insertions(+), 118 deletions(-)
 create mode 100644 src/api/home/reportSignDetail.js
 create mode 100644 src/views/Home/Comp/ChannelMonthly.vue
 create mode 100644 src/views/Home/Comp/ChannelPeriod.vue
 create mode 100644 src/views/Home/Comp/SignListCard.vue
 create mode 100644 src/views/Home/Comp/SignTotalCard.vue

diff --git a/src/api/home/reportSignDetail.js b/src/api/home/reportSignDetail.js
new file mode 100644
index 0000000..71b6667
--- /dev/null
+++ b/src/api/home/reportSignDetail.js
@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+export const getInfo = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/one', data })
+}
+
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/two', data })
+}
diff --git a/src/views/Home/ChannelReport.vue b/src/views/Home/ChannelReport.vue
index c38c3b2..d541869 100644
--- a/src/views/Home/ChannelReport.vue
+++ b/src/views/Home/ChannelReport.vue
@@ -1,82 +1,28 @@
 <template>
   <div>
-    <ContentWrap>
-      <el-form :model="searchForm" label-width="0" inline>
-        <el-form-item>
-          <el-date-picker
-            v-model="searchForm.period"
-            type="month"
-            format="YYYY-MM"
-            value-format="YYYY-MM"
-            placeholder="选择年月"
-            :clearable="false"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-tree-select
-            v-model="searchForm.sourceId"
-            :data="sourceOptions"
-            :props="defaultProps"
-            check-strictly
-            node-key="sourceId"
-            placeholder="请选择渠道"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="handleSearch">查询</el-button>
-          <el-button @click="handleReset">重置</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table
-        v-loading="loading"
-        :data="tableList"
-        border
-        stripe
-        :summary-method="getSummaries"
-        show-summary
-      >
-        <el-table-column prop="sourceName" label="渠道名称" />
-        <el-table-column prop="newClueSignNum" label="新线索成交数" sortable />
-        <el-table-column prop="newClueNum" label="新线索总数" sortable />
-        <el-table-column prop="rate" label="新线索成交率" sortable :formatter="parseRate" />
-        <el-table-column prop="reallyClueSignNum" sortable>
-          <template #header> <Tooltip message="新线索+老线索" /> <span>实际成交数</span> </template>
-        </el-table-column>
-      </el-table>
-    </ContentWrap>
+    <el-tabs v-model="tabName" type="border-card" tab-position="top">
+      <el-tab-pane label="月度统计" name="monthly">
+        <ChannelMonthly :sourceOptions="sourceOptions" />
+      </el-tab-pane>
+      <el-tab-pane label="周期统计" name="period">
+        <ChannelPeriod :sourceOptions="sourceOptions" />
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
 <script setup name="ChannelReport">
-import * as reportApi from '@/api/home/reportChannel'
+import ChannelMonthly from './Comp/ChannelMonthly.vue'
+import ChannelPeriod from './Comp/ChannelPeriod.vue'
 import { getSimpleSourceList } from '@/api/clue/source'
-import { removeNullField } from '@/utils'
-import { formatDate } from '@/utils/formatTime'
 import { handleTree } from '@/utils/tree'
 
-const defaultProps = {
-  children: 'children',
-  label: 'sourceName',
-  value: 'sourceId',
-  isLeaf: 'leaf'
-}
+const tabName = ref('monthly')
 
 onMounted(() => {
   getOptions()
-  handleReset()
-  handleSearch()
 })
 
-const searchForm = ref({})
-
-function handleReset() {
-  searchForm.value = {
-    sourceName: undefined,
-    period: formatDate(new Date(), 'YYYY-MM')
-  }
-}
-
 const sourceOptions = ref([])
 
 function getOptions() {
@@ -84,57 +30,6 @@ function getOptions() {
     sourceOptions.value = handleTree(data, 'sourceId')
   })
 }
-
-const loading = ref(false)
-const tableList = ref([])
-async function handleSearch() {
-  loading.value = true
-  try {
-    const data = await reportApi.getList(removeNullField(searchForm.value))
-    tableList.value = data
-  } finally {
-    loading.value = false
-  }
-}
-
-function parseRate(row) {
-  return Number(row.rate * 100).toFixed(2) + '%'
-}
-
-function getSummaries({ columns, data }) {
-  let sums = []
-  columns.forEach((column, index) => {
-    if (index == 0) {
-      sums[index] = '合计'
-      return
-    }
-    const values = data.map((item) => Number(item[column.property]))
-    if (!values.every((value) => Number.isNaN(value))) {
-      if (column.property == 'rate') {
-        const sum = data.reduce(
-          (pre, cur) => ({
-            clueNum: pre.clueNum + cur.newClueNum,
-            signNum: pre.signNum + cur.newClueSignNum
-          }),
-          { clueNum: 0, signNum: 0 }
-        )
-        sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
-      } else {
-        sums[index] = values.reduce((prev, curr) => {
-          const value = Number(curr)
-          if (!Number.isNaN(value)) {
-            return prev + curr
-          } else {
-            return prev
-          }
-        }, 0)
-      }
-    } else {
-      sums[index] = ''
-    }
-  })
-  return sums
-}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/Home/Comp/ChannelMonthly.vue b/src/views/Home/Comp/ChannelMonthly.vue
new file mode 100644
index 0000000..6411d27
--- /dev/null
+++ b/src/views/Home/Comp/ChannelMonthly.vue
@@ -0,0 +1,147 @@
+<template>
+  <ContentWrap>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.period"
+          type="month"
+          format="YYYY-MM"
+          value-format="YYYY-MM"
+          placeholder="选择年月"
+          :clearable="false"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-tree-select
+          v-model="searchForm.sourceId"
+          :data="props.sourceOptions"
+          :props="defaultProps"
+          check-strictly
+          node-key="sourceId"
+          placeholder="请选择渠道"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      stripe
+      :summary-method="getSummaries"
+      show-summary
+    >
+      <el-table-column prop="sourceName" label="渠道名称" />
+      <el-table-column prop="newClueSignNum" label="新线索当月成交数" sortable>
+        <template #header>
+          <Tooltip message="当月咨询且当月成交的线索数" /> <span>新线索当月成交数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="newClueNum" label="新线索总数" sortable>
+        <template #header>
+          <Tooltip message="当月咨询的线索数" /> <span>新线索总数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="rate" label="新线索当月成交率" sortable :formatter="parseRate" />
+      <el-table-column prop="reallyClueSignNum" sortable>
+        <template #header>
+          <Tooltip message="成交日期在本月的线索数" /> <span>当月总成交数</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+</template>
+
+<script setup name="ChannelMonthly">
+import * as reportApi from '@/api/home/reportChannel'
+import { removeNullField } from '@/utils'
+import { formatDate } from '@/utils/formatTime'
+
+const props = defineProps({
+  sourceOptions: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+
+onMounted(() => {
+  getOptions()
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    sourceId: undefined,
+    period: formatDate(new Date(), 'YYYY-MM')
+  }
+}
+
+function getOptions() {}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+function parseRate(row) {
+  return Number(row.rate * 100).toFixed(2) + '%'
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '合计'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property == 'rate') {
+        const sum = data.reduce(
+          (pre, cur) => ({
+            clueNum: pre.clueNum + cur.newClueNum,
+            signNum: pre.signNum + cur.newClueSignNum
+          }),
+          { clueNum: 0, signNum: 0 }
+        )
+        sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
+      } else {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Home/Comp/ChannelPeriod.vue b/src/views/Home/Comp/ChannelPeriod.vue
new file mode 100644
index 0000000..7da3810
--- /dev/null
+++ b/src/views/Home/Comp/ChannelPeriod.vue
@@ -0,0 +1,160 @@
+<template>
+  <ContentWrap>
+    <el-form ref="searchRef" :model="searchForm" :rules="searchRules" label-width="100px" inline>
+      <el-form-item label="咨询日期" prop="consultDate">
+        <el-date-picker
+          v-model="searchForm.consultDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="选择日期"
+          end-placeholder="选择日期"
+        />
+      </el-form-item>
+      <el-form-item label="成交周期" prop="period">
+        <el-input-number
+          v-model="searchForm.period"
+          :min="1"
+          :controls="false"
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item label="渠道来源" prop="sourceId">
+        <el-tree-select
+          v-model="searchForm.sourceId"
+          :data="props.sourceOptions"
+          :props="defaultProps"
+          check-strictly
+          node-key="sourceId"
+          placeholder="请选择渠道"
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      stripe
+      :summary-method="getSummaries"
+      show-summary
+    >
+      <el-table-column prop="sourceName" label="渠道名称" />
+      <el-table-column prop="newClueSignNum" label="新线索成交数" sortable>
+        <template #header>
+          <Tooltip message="咨询日期在查询范围内，且在所查成交周期内成交的线索数" />
+          <span>新线索成交数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="newClueNum" label="新线索总数" sortable>
+        <template #header>
+          <Tooltip message="咨询日期在查询范围内，咨询的线索数" /> <span>新线索总数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="rate" label="新线索成交率" sortable :formatter="parseRate" />
+    </el-table>
+  </ContentWrap>
+</template>
+
+<script setup name="ChannelPeriod">
+import * as reportApi from '@/api/home/reportChannel'
+import { removeNullField } from '@/utils'
+
+const props = defineProps({
+  sourceOptions: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+
+const searchRef = ref()
+
+const searchRules = {
+  consultDate: { required: true, type: 'array', message: '请选择咨询日期', trigger: 'change,blur' },
+  period: { required: true, message: '请输入成交周期', trigger: 'blur' }
+}
+
+onMounted(() => {
+  getOptions()
+  handleReset()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    sourceId: undefined,
+    period: 30,
+    consultDate: []
+  }
+}
+
+function getOptions() {}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  try {
+    const valid = await searchRef.value.validate()
+    if (!valid) return
+    loading.value = true
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+function parseRate(row) {
+  return Number(row.rate * 100).toFixed(2) + '%'
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '合计'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property == 'rate') {
+        const sum = data.reduce(
+          (pre, cur) => ({
+            clueNum: pre.clueNum + cur.newClueNum,
+            signNum: pre.signNum + cur.newClueSignNum
+          }),
+          { clueNum: 0, signNum: 0 }
+        )
+        sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
+      } else {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Home/Comp/SignListCard.vue b/src/views/Home/Comp/SignListCard.vue
new file mode 100644
index 0000000..fb9e77d
--- /dev/null
+++ b/src/views/Home/Comp/SignListCard.vue
@@ -0,0 +1,105 @@
+<template>
+  <ContentWrap>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-select v-model="searchForm.detailType" :clearable="false" filterable>
+          <el-option
+            v-for="item in detailTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="searchForm.detailType == 1">
+        <el-date-picker
+          v-model="searchForm.month"
+          type="month"
+          format="YYYY-MM"
+          value-format="YYYY-MM"
+          placeholder="选择年月"
+          :clearable="false"
+        />
+      </el-form-item>
+      <el-form-item v-if="[2, 3].includes(searchForm.detailType)">
+        <el-date-picker
+          v-model="searchForm.year"
+          type="year"
+          format="YYYY"
+          value-format="YYYY"
+          placeholder="选择年"
+          :clearable="false"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableList" border stripe>
+      <el-table-column label="周期" prop="period" width="110px" />
+      <el-table-column prop="signNumber" label="成交数" />
+      <el-table-column prop="signPrice" label="成交额" />
+      <el-table-column prop="signPriceSequentialGrowth" label="成交额环比增长" />
+      <el-table-column prop="signPriceSamePeriodCompareGrowth" label="成交额同比增长" />
+      <el-table-column prop="profit" label="利润" />
+      <el-table-column prop="profitSequentialGrowth" label="利润环比增长" />
+      <el-table-column prop="profitSamePeriodCompareGrowth" label="利润同比增长" />
+      <el-table-column prop="notReceivedMoney" label="未到账金额" />
+      <el-table-column prop="receivedMoney" label="已到账金额" />
+      <el-table-column prop="waitSettleMoney" label="待结算金额" />
+      <el-table-column prop="settledMoney" label="已结算金额" />
+      <el-table-column prop="refundAmount" label="已退款金额" />
+      <el-table-column prop="remainMoney" label="结余" />
+    </el-table>
+  </ContentWrap>
+</template>
+
+<script setup name="SignListCard">
+import { getList } from '@/api/home/reportSignDetail'
+import { formatDate } from '@/utils/formatTime'
+import { removeNullField } from '@/utils'
+
+const detailTypeOptions = [
+  { label: '日明细', value: 1 },
+  { label: '月明细', value: 2 },
+  { label: '季明细', value: 3 },
+  { label: '年明细', value: 4 }
+]
+
+onMounted(() => {
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    detailType: 2,
+    month: formatDate(new Date(), 'YYYY-MM'),
+    year: new Date().getFullYear() + ''
+  }
+}
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    let params = { detailType: searchForm.value.detailType }
+    if (params.detailType == 1) {
+      const d = new Date(searchForm.value.month)
+      params.month = d.getMonth() + 1
+      params.year = d.getFullYear()
+    } else if ([2, 3].includes(params.detailType)) {
+      params.year = searchForm.value.year
+    }
+    const data = await getList(removeNullField(params))
+    tableList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Home/Comp/SignTotalCard.vue b/src/views/Home/Comp/SignTotalCard.vue
new file mode 100644
index 0000000..c7d3bcb
--- /dev/null
+++ b/src/views/Home/Comp/SignTotalCard.vue
@@ -0,0 +1,195 @@
+<template>
+  <ContentWrap>
+    <div class="flex items-center">
+      <span class="mr-20px">成交概况</span>
+      <el-dropdown>
+        <el-button size="small"
+          >{{ periodTypeOptions[periodType] }} <Icon icon="ep:arrow-down"
+        /></el-button>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item
+              v-for="(item, index) in periodTypeOptions"
+              :key="index"
+              @click="handleSearchTotalInfo(index)"
+            >
+              {{ item }}
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+    </div>
+    <el-row :gutter="20" v-loading="infoLoading">
+      <el-col :span="8" :offset="0">
+        <div class="statistic-card">
+          <el-statistic :value="totalData.signNumber" title="成交数" />
+          <div
+            class="statistic-footer"
+            :class="periodType != 4 ? 'justify-between' : 'justify-center'"
+          >
+            <div class="footer-item">
+              <span>环比</span>
+              <span :class="getColor(totalData.signNumberSequentialGrowth)">
+                {{ totalData.signNumberSequentialGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signNumberSequentialGrowth)" />
+              </span>
+            </div>
+            <div class="footer-item" v-if="periodType != 4">
+              <span>同比</span>
+              <span :class="getColor(totalData.signNumberPeriodCompareGrowth)">
+                {{ totalData.signNumberPeriodCompareGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signNumberPeriodCompareGrowth)" />
+              </span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <div class="statistic-card">
+          <el-statistic :value="totalData.signPrice" title="成交额" :precision="2" />
+          <div
+            class="statistic-footer"
+            :class="periodType != 4 ? 'justify-between' : 'justify-center'"
+          >
+            <div class="footer-item">
+              <span>环比</span>
+              <span :class="getColor(totalData.signPriceSequentialGrowth)">
+                {{ totalData.signPriceSequentialGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signPriceSequentialGrowth)" />
+              </span>
+            </div>
+            <div class="footer-item" v-if="periodType != 4">
+              <span>同比</span>
+              <span :class="getColor(totalData.signPriceSamePeriodCompareGrowth)">
+                {{ totalData.signPriceSamePeriodCompareGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signPriceSamePeriodCompareGrowth)" />
+              </span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <div class="statistic-card">
+          <el-statistic :value="totalData.profit" title="利润" :precision="2" />
+          <div
+            class="statistic-footer"
+            :class="periodType != 4 ? 'justify-between' : 'justify-center'"
+          >
+            <div class="footer-item">
+              <span>环比</span>
+              <span :class="getColor(totalData.profitSequentialGrowth)">
+                {{ totalData.profitSequentialGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.profitSequentialGrowth)" />
+              </span>
+            </div>
+            <div class="footer-item" v-if="periodType != 4">
+              <span>同比</span>
+              <span :class="getColor(totalData.profitSamePeriodCompareGrowth)">
+                {{ totalData.profitSamePeriodCompareGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.profitSamePeriodCompareGrowth)" />
+              </span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </ContentWrap>
+</template>
+
+<script setup name="SignTotalCard">
+import { getInfo } from '@/api/home/reportSignDetail'
+
+const periodTypeOptions = ['本日', '本周', '本月', '本季', '本年']
+
+const periodType = ref(2)
+const totalData = ref({})
+
+onMounted(() => {
+  handleSearchTotalInfo(2)
+})
+
+const infoLoading = ref(false)
+async function handleSearchTotalInfo(index) {
+  periodType.value = index
+  infoLoading.value = true
+  try {
+    const data = await getInfo({ periodType: periodType.value + 1 })
+    totalData.value = data
+  } finally {
+    infoLoading.value = false
+  }
+}
+
+function getIcon(val) {
+  if (val > 0) {
+    return 'ep:caret-top'
+  } else if (val < 0) {
+    return 'ep:caret-bottom'
+  } else {
+    return 'ep:minus'
+  }
+}
+
+function getColor(val) {
+  if (val > 0) {
+    return 'green'
+  } else if (val < 0) {
+    return 'red'
+  } else {
+    return 'gley'
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.el-col {
+  text-align: center;
+}
+:global(h2#card-usage ~ .example .example-showcase) {
+  background-color: var(--el-fill-color) !important;
+}
+
+.el-statistic {
+  --el-statistic-content-font-size: 28px;
+}
+
+.statistic-card {
+  height: 100%;
+  // padding: 20px;
+  border-radius: 4px;
+  background-color: var(--el-bg-color-overlay);
+}
+
+.statistic-footer {
+  margin: 16px auto 0;
+  display: flex;
+  // justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+  font-size: 12px;
+  color: var(--el-text-color-regular);
+  width: 300px;
+}
+
+.statistic-footer .footer-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.statistic-footer .footer-item span:last-child {
+  display: inline-flex;
+  align-items: center;
+  margin-left: 4px;
+}
+
+.green {
+  color: var(--el-color-success);
+}
+.gley {
+  color: var(--el-color-info);
+}
+.red {
+  color: var(--el-color-error);
+}
+</style>
diff --git a/src/views/Home/SignReport.vue b/src/views/Home/SignReport.vue
index b780bce..c65aab5 100644
--- a/src/views/Home/SignReport.vue
+++ b/src/views/Home/SignReport.vue
@@ -1,7 +1,13 @@
 <template>
-  <div>成交报表</div>
+  <div>
+    <SignTotalCard />
+    <SignListCard />
+  </div>
 </template>
 
-<script setup></script>
+<script setup name="SignReport">
+import SignTotalCard from './Comp/SignTotalCard.vue'
+import SignListCard from './Comp/SignListCard.vue'
+</script>
 
 <style lang="scss" scoped></style>

From 9c7ba2fb87f1cf8097f281d4735ad4da3816f2ef Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 10 Oct 2024 16:49:57 +0800
Subject: [PATCH 4/6] sc

---
 src/api/home/reportChannel.js         |  4 ++
 src/hooks/web/useMessage.ts           |  7 +++-
 src/router/modules/remaining.ts       |  1 -
 src/views/Home/Comp/ChannelPeriod.vue | 19 ++++++----
 src/views/Home/Comp/SignListCard.vue  | 54 ++++++++++++++++++++++++---
 5 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/src/api/home/reportChannel.js b/src/api/home/reportChannel.js
index 0e1d268..3a66cc1 100644
--- a/src/api/home/reportChannel.js
+++ b/src/api/home/reportChannel.js
@@ -2,3 +2,7 @@ import request from '@/config/axios'
 export const getList = async (data) => {
   return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/report', data })
 }
+
+export const getPeriodList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/period/report', data })
+}
diff --git a/src/hooks/web/useMessage.ts b/src/hooks/web/useMessage.ts
index ac2b552..e064b08 100644
--- a/src/hooks/web/useMessage.ts
+++ b/src/hooks/web/useMessage.ts
@@ -13,7 +13,12 @@ export const useMessage = () => {
     },
     // 成功消息
     success(content: string) {
-      ElMessage.success(content)
+      // ElMessage.success(content)
+      ElMessage({
+        message: content,
+        duration: 1500,
+        type: 'success'
+      })
     },
     // 警告消息
     warning(content: string) {
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 13f762a..fdd7af5 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -106,7 +106,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
-
   // {
   //   path: '/dict',
   //   component: Layout,
diff --git a/src/views/Home/Comp/ChannelPeriod.vue b/src/views/Home/Comp/ChannelPeriod.vue
index 7da3810..8873ac3 100644
--- a/src/views/Home/Comp/ChannelPeriod.vue
+++ b/src/views/Home/Comp/ChannelPeriod.vue
@@ -11,9 +11,9 @@
           end-placeholder="选择日期"
         />
       </el-form-item>
-      <el-form-item label="成交周期" prop="period">
+      <el-form-item label="成交周期" prop="periodNumber">
         <el-input-number
-          v-model="searchForm.period"
+          v-model="searchForm.periodNumber"
           :min="1"
           :controls="false"
           style="width: 100%"
@@ -62,7 +62,7 @@
 </template>
 
 <script setup name="ChannelPeriod">
-import * as reportApi from '@/api/home/reportChannel'
+import { getPeriodList } from '@/api/home/reportChannel'
 import { removeNullField } from '@/utils'
 
 const props = defineProps({
@@ -82,8 +82,8 @@ const defaultProps = {
 const searchRef = ref()
 
 const searchRules = {
-  consultDate: { required: true, type: 'array', message: '请选择咨询日期', trigger: 'change,blur' },
-  period: { required: true, message: '请输入成交周期', trigger: 'blur' }
+  // consultDate: { required: true, type: 'array', message: '请选择咨询日期', trigger: 'change,blur' },
+  periodNumber: { required: true, message: '请输入成交周期', trigger: 'blur' }
 }
 
 onMounted(() => {
@@ -96,7 +96,7 @@ const searchForm = ref({})
 function handleReset() {
   searchForm.value = {
     sourceId: undefined,
-    period: 30,
+    periodNumber: 30,
     consultDate: []
   }
 }
@@ -110,7 +110,12 @@ async function handleSearch() {
     const valid = await searchRef.value.validate()
     if (!valid) return
     loading.value = true
-    const data = await reportApi.getList(removeNullField(searchForm.value))
+    const params = { ...searchForm.value }
+    if (params.consultDate && params.consultDate.length) {
+      params.startDateTime = params.consultDate[0]
+      params.endDateTime = params.consultDate[1]
+    }
+    const data = await getPeriodList(removeNullField(params))
     tableList.value = data
   } finally {
     loading.value = false
diff --git a/src/views/Home/Comp/SignListCard.vue b/src/views/Home/Comp/SignListCard.vue
index fb9e77d..253ce3b 100644
--- a/src/views/Home/Comp/SignListCard.vue
+++ b/src/views/Home/Comp/SignListCard.vue
@@ -36,15 +36,27 @@
         <el-button @click="handleReset">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-table :data="tableList" border stripe>
+    <el-table :data="tableList" border stripe show-summary :summary-method="getSummaries">
       <el-table-column label="周期" prop="period" width="110px" />
       <el-table-column prop="signNumber" label="成交数" />
       <el-table-column prop="signPrice" label="成交额" />
-      <el-table-column prop="signPriceSequentialGrowth" label="成交额环比增长" />
-      <el-table-column prop="signPriceSamePeriodCompareGrowth" label="成交额同比增长" />
+      <el-table-column
+        prop="signPriceSequentialGrowth"
+        label="成交额环比增长"
+        :formatter="parseRate"
+      />
+      <el-table-column
+        prop="signPriceSamePeriodCompareGrowth"
+        label="成交额同比增长"
+        :formatter="parseRate"
+      />
       <el-table-column prop="profit" label="利润" />
-      <el-table-column prop="profitSequentialGrowth" label="利润环比增长" />
-      <el-table-column prop="profitSamePeriodCompareGrowth" label="利润同比增长" />
+      <el-table-column prop="profitSequentialGrowth" label="利润环比增长" :formatter="parseRate" />
+      <el-table-column
+        prop="profitSamePeriodCompareGrowth"
+        label="利润同比增长"
+        :formatter="parseRate"
+      />
       <el-table-column prop="notReceivedMoney" label="未到账金额" />
       <el-table-column prop="receivedMoney" label="已到账金额" />
       <el-table-column prop="waitSettleMoney" label="待结算金额" />
@@ -100,6 +112,38 @@ async function handleSearch() {
     loading.value = false
   }
 }
+
+function parseRate(row, column) {
+  return Number(row[column.property] * 100).toFixed(2) + '%'
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '合计'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property.includes('Growth')) {
+        sums[index] = ''
+      } else {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
 </script>
 
 <style lang="scss" scoped></style>

From 8fc9dd449bf8abce1a682677886f13ff032bbf7a Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 11 Oct 2024 11:38:37 +0800
Subject: [PATCH 5/6] sc

---
 src/views/Home/Comp/ChannelPeriod.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/Home/Comp/ChannelPeriod.vue b/src/views/Home/Comp/ChannelPeriod.vue
index 8873ac3..5977f1e 100644
--- a/src/views/Home/Comp/ChannelPeriod.vue
+++ b/src/views/Home/Comp/ChannelPeriod.vue
@@ -64,6 +64,7 @@
 <script setup name="ChannelPeriod">
 import { getPeriodList } from '@/api/home/reportChannel'
 import { removeNullField } from '@/utils'
+import { formatDate } from '@/utils/formatTime'
 
 const props = defineProps({
   sourceOptions: {
@@ -89,15 +90,18 @@ const searchRules = {
 onMounted(() => {
   getOptions()
   handleReset()
+  handleSearch()
 })
 
 const searchForm = ref({})
 
 function handleReset() {
+  const date = new Date()
+  date.setDate(1)
   searchForm.value = {
     sourceId: undefined,
     periodNumber: 30,
-    consultDate: []
+    consultDate: [formatDate(date), formatDate(new Date())]
   }
 }
 

From f74ed7e62df07a26a8ffcb396e8431ffbec6d7b7 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 18 Oct 2024 10:32:03 +0800
Subject: [PATCH 6/6] sc

---
 src/components/UploadFile/src/UploadFile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index a8442d5..9d104e7 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -47,7 +47,7 @@ const props = defineProps({
   // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileType: propTypes.array.def([]),
   accept: propTypes.string.def('*'),
-  fileSize: propTypes.number.def(5), // 大小限制(MB)
+  fileSize: propTypes.number.def(100), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
   drag: propTypes.bool.def(false), // 拖拽上传