From 49946c6d21e56ae172f39ccb60f37b8fbc102cae Mon Sep 17 00:00:00 2001
From: Hermes Agent <hermes@aicrm.local>
Date: Sat, 19 Sep 2026 15:53:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=9C=8B=E6=9D=BF=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC+=E8=AE=BF=E9=97=AE=E5=9F=8B=E7=82=B9=E4=BB=8A?=
 =?UTF-8?q?=E6=97=A5/=E6=98=A8=E6=97=A5/7=E5=A4=A9/30=E5=A4=A9/=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E7=AD=9B=E9=80=89(visits=E6=8E=A5=E5=8F=A3=E8=A1=A5ra?=
 =?UTF-8?q?nge/source=E5=8F=82=E6=95=B0=E4=B8=8E=E7=BB=9F=E8=AE=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/App.vue             |  5 ++++-
 admin/src/views/Dashboard.vue | 18 ++++++++++++---
 admin/src/views/Logs.vue      | 42 ++++++++++++++++++++++++++++++++---
 server/src/routes/admin.js    | 36 +++++++++++++++++++++++++++---
 4 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index b01f0e1..e5ce453 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, provide } from 'vue'
 import { getToken, setToken, clearToken, apiPost } from './api'
 import Dashboard from './views/Dashboard.vue'
 import Users from './views/Users.vue'
@@ -40,6 +40,9 @@ import VpayOrders from './views/VpayOrders.vue'
 
 const token = ref(getToken())
 const view = ref('dashboard')
+// 子页面跳转菜单（如看板→访问日志）
+const goto = (key) => { view.value = key }
+provide('goto', goto)
 const username = ref(''), password = ref(''), busy = ref(false), error = ref('')
 
 const menus = [
diff --git a/admin/src/views/Dashboard.vue b/admin/src/views/Dashboard.vue
index 990a2e6..593061f 100644
--- a/admin/src/views/Dashboard.vue
+++ b/admin/src/views/Dashboard.vue
@@ -35,7 +35,10 @@
         <p v-if="!(d.litByDim || []).some(b => b.count)" class="empty">还没有点亮记录</p>
       </div>
       <div class="panel grow">
-        <h3>最近访问记录</h3>
+        <div class="rec-head">
+          <h3 style="margin: 0">最近访问记录</h3>
+          <el-button size="small" text type="primary" @click="goVisitLog">查看更多 ›</el-button>
+        </div>
         <el-table :data="d.recentLogins || []" size="small" stripe>
           <el-table-column prop="createdAt" label="时间" width="160">
             <template #default="{ row }">{{ fmt(row.createdAt) }}</template>
@@ -67,9 +70,11 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, inject } from 'vue'
 import { apiGet } from '../api'
 const d = ref({})
+const goto = inject('goto', () => {})
+function goVisitLog() { goto('logs') }
 const visit = ref({})
 function pct(n) {
   const max = Math.max(1, ...(d.value.litByDim || []).map(b => b.count))
@@ -107,4 +112,11 @@ onMounted(async () => {
 .bar-fill { height: 100%; background: linear-gradient(90deg, #5b5ff8, #8b5cf6); border-radius: 4px; }
 .bar-num { width: 28px; text-align: right; font-size: 12px; color: #6b7080; }
 .empty { color: #b6bac9; font-size: 12px; text-align: center; padding: 12px 0; }
-</style>
+
+.rec-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/admin/src/views/Logs.vue b/admin/src/views/Logs.vue
index af1c6b7..2f087f0 100644
--- a/admin/src/views/Logs.vue
+++ b/admin/src/views/Logs.vue
@@ -2,9 +2,26 @@
   <div class="page">
     <el-tabs v-model="tab" @tab-change="load">
       <el-tab-pane label="登录/访问日志" name="login" />
-      <el-tab-pane label="访问埋点" name="visit" />
+      <el-tab-pane label="访问埋点" name="visit">
+        <template #label>访问埋点</template>
+      </el-tab-pane>
       <el-tab-pane label="管理操作日志" name="admin" />
     </el-tabs>
+    <div v-if="tab === 'visit'" class="visit-filters">
+      <el-radio-group v-model="vRange" size="small" @change="vPage = 1; load()">
+        <el-radio-button value="today">今日 {{ vStats.today ?? '' }}</el-radio-button>
+        <el-radio-button value="yesterday">昨日 {{ vStats.yesterday ?? '' }}</el-radio-button>
+        <el-radio-button value="7d">近7天 {{ vStats.last7 ?? '' }}</el-radio-button>
+        <el-radio-button value="30d">近30天 {{ vStats.last30 ?? '' }}</el-radio-button>
+        <el-radio-button value="all">全部</el-radio-button>
+      </el-radio-group>
+      <el-select v-model="vSource" size="small" clearable placeholder="全部来源" style="width: 120px" @change="vPage = 1; load()">
+        <el-option value="H5" label="H5" />
+        <el-option value="小程序" label="小程序" />
+        <el-option value="直接访问" label="直接访问" />
+      </el-select>
+      <span style="font-size: 12px; color: #8a8fa3">共 {{ vTotal }} 条</span>
+    </div>
     <el-table :data="list" stripe v-loading="loading" size="small">
       <template v-if="tab === 'login'">
         <el-table-column label="时间" width="160"><template #default="{ row }">{{ fmt(row.createdAt) }}</template></el-table-column>
@@ -51,15 +68,26 @@
 import { ref, onMounted } from 'vue'
 import { apiGet } from '../api'
 const tab = ref('login'), list = ref([]), total = ref(0), page = ref(1), pageSize = 20, loading = ref(false)
+// 访问埋点筛选
+const vRange = ref('7d'), vSource = ref(''), vStats = ref({}), vTotal = ref(0)
 function fmt(t) { return t ? new Date(t).toLocaleString('zh-CN', { hour12: false }) : '—' }
 // adminlog 的时间字段是 timestamp，loginlog 是 createdAt
 async function load() {
   loading.value = true
   try {
     const ep = tab.value === 'login' ? 'login-logs' : tab.value === 'visit' ? 'visits' : 'logs'
-    const r = await apiGet(`/api/admin/${ep}?page=${page.value}&limit=${pageSize}`)
+    let qs = `page=${page.value}&limit=${pageSize}`
+    if (tab.value === 'visit') {
+      qs += `&range=${vRange.value}`
+      if (vSource.value) qs += `&source=${encodeURIComponent(vSource.value)}`
+    }
+    const r = await apiGet(`/api/admin/${ep}?${qs}`)
     list.value = r.items || []
     total.value = r.pagination?.total || 0
+    if (tab.value === 'visit') {
+      vStats.value = r.stats || {}
+      vTotal.value = r.total || 0
+    }
   } finally { loading.value = false }
 }
 onMounted(load)
@@ -67,4 +95,12 @@ onMounted(load)
 
 <style scoped>
 .page { background: #fff; border-radius: 12px; padding: 16px; box-shadow: 0 1px 4px rgba(0,0,0,.06); }
-</style>
+
+.visit-filters {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/server/src/routes/admin.js b/server/src/routes/admin.js
index ffc7e6e..fed253e 100755
--- a/server/src/routes/admin.js
+++ b/server/src/routes/admin.js
@@ -72,12 +72,42 @@ router.get('/visits', requirePermission('dashboard:read'), async (req, res) => {
   try {
     const page = Math.max(1, parseInt(req.query.page) || 1)
     const limit = Math.min(50, parseInt(req.query.limit) || 20)
+    const source = String(req.query.source || '').trim()
+    const range = String(req.query.range || '7d')
+    // range → mongo 时间条件
+    const now = new Date()
+    const startOfDay = (d) => { const x = new Date(d); x.setHours(0, 0, 0, 0); return x }
+    let timeQuery = {}
+    if (range === 'today') timeQuery = { createdAt: { $gte: startOfDay(now) } }
+    else if (range === 'yesterday') {
+      const y = new Date(now); y.setDate(y.getDate() - 1)
+      timeQuery = { createdAt: { $gte: startOfDay(y), $lt: startOfDay(now) } }
+    } else if (range === '30d') {
+      const d = new Date(now); d.setDate(d.getDate() - 29)
+      timeQuery = { createdAt: { $gte: startOfDay(d) } }
+    } else if (range === 'all') timeQuery = {}
+    else { // 7d
+      const d = new Date(now); d.setDate(d.getDate() - 6)
+      timeQuery = { createdAt: { $gte: startOfDay(d) } }
+    }
+    const query = { ...timeQuery, ...(source ? { source } : {}) }
     const [total, items] = await Promise.all([
-      VisitLog.countDocuments({}),
-      VisitLog.find({}).sort({ createdAt: -1 }).skip((page - 1) * limit).limit(limit).lean(),
+      VisitLog.countDocuments(query),
+      VisitLog.find(query).sort({ createdAt: -1 }).skip((page - 1) * limit).limit(limit).lean(),
     ])
     items.forEach(v => { v.ipLoc = ipLocation(v.ip) })
-    return ApiResponse.success(res, { items, total, page, limit, pagination: { total } })
+    // 快捷统计（当日/昨日/7天/30天总量）
+    const cnt = (q) => VisitLog.countDocuments(q)
+    const y = new Date(now); y.setDate(y.getDate() - 1)
+    const d7 = new Date(now); d7.setDate(d7.getDate() - 6)
+    const d30 = new Date(now); d30.setDate(d30.getDate() - 29)
+    const stats = {
+      today: await cnt({ createdAt: { $gte: startOfDay(now) } }),
+      yesterday: await cnt({ createdAt: { $gte: startOfDay(y), $lt: startOfDay(now) } }),
+      last7: await cnt({ createdAt: { $gte: startOfDay(d7) } }),
+      last30: await cnt({ createdAt: { $gte: startOfDay(d30) } }),
+    }
+    return ApiResponse.success(res, { items, total, page, limit, stats, pagination: { total } })
   } catch (error) {
     logger.error('访问日志查询失败:', error)
     return ApiResponse.serverError(res, error.message)