diff --git a/.env.development b/.env.development
index f7965ab..4a254d4 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
@@ -11,6 +11,6 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 # zhangyong
 #  VITE_API_BASE='http://192.168.3.83:8081/'
 # 本地
-# VITE_API_BASE='http://localhost:8081/'
+VITE_API_BASE='http://localhost:8081/'
 # sunjiabei
 #  VITE_API_BASE='http://192.168.0.113:8081/'
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index fdd8a82..d750fce 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -240,6 +240,12 @@ const routes = [
                 component: () => import("../views/usergold/bean/userbean.vue"),
                 meta:{ permissionId: 45 }
             },
+            {
+                path: '/history',
+                name: "history",
+                component: () => import("../views/history/history.vue"),
+                meta:{ permissionId: [56,57] }
+            },
 
             // 权限管理
             {
diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js
index 356381d..60ec710 100644
--- a/src/utils/menuTreePermission.js
+++ b/src/utils/menuTreePermission.js
@@ -10,6 +10,8 @@ export const permissionMapping = {
     Consumption_Management: 6,     // 消耗管理
     Refund_Management: 7,          // 退款管理
     Customer_Account_Details: 8,   // 客户账户明细
+    History: 56,                   // 历史数据查询
+
 
     Permission_Management: 9,      // 权限管理
 
@@ -61,6 +63,9 @@ export const permissionMapping = {
     Recharge_Audit: 31,             // 充值审核(金币) // audit页面
     Refund_Audit: 32,               // 退款审核(金币) // audit页面,
 
+    History_Query: 57,             // 历史数据查询
+
+
     // 新增的金豆相关权限
     Submit_Golden_Bean_Recharge: 46, // 提交金豆充值
     View_Golden_Bean_System_Recharge_Details: 47, // 查看金豆系统充值明细
diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js
index e516cfd..3c9877a 100644
--- a/src/utils/menuUtils.js
+++ b/src/utils/menuUtils.js
@@ -61,6 +61,9 @@ export const getRoutePath = (menu) => {
         '金币退款': '/coinRefund',
         // '金豆退款': '/beanRefund',
 
+        '历史数据查询': '/history',
+
+
         '权限管理': '/permissions',
 
 
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index 2b9f02e..89485b9 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -54,12 +54,11 @@
           <span>{{ scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize }}</span>
         </template>
       </el-table-column>
-      <el-table-column fixed="left" prop="name" label="姓名" width="150px" />
-      <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px" />
-      <el-table-column prop="market" label="所属地区" width="100px" />
-      <el-table-column prop="activity" label="活动名称" width="100px" show-overflow-tooltip />
-      <el-table-column prop="rateName" label="货币名称" width="110px" />
-      <el-table-column prop="money" sortable="custom" label="充值金额" width="110px" />
+      <el-table-column fixed="left" prop="name" label="姓名" width="150px"/>
+      <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px"/>
+      <el-table-column prop="market" label="所属地区" width="100px"/>
+      <el-table-column prop="activity" label="活动名称" width="100px" show-overflow-tooltip/>
+      <el-table-column prop="rateName" label="货币名称" width="110px"/>
       <el-table-column prop="money" label="充值金额" sortable="custom" width="110px">
         <template #default="scope">{{ scope.row.permanentGold / 100 }}</template>
       </el-table-column>
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index f5704b5..a8df09d 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -43,8 +43,8 @@
 
     <div>
       总条数：{{ format3(stats.totalNum) }}条&nbsp;&nbsp;&nbsp;&nbsp;
-      退款总金币数：{{ format3(stats.permanentGolds + stats.freeGolds + stats.taskGolds) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
-      永久金币：{{ format3(stats.permanentGolds) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
+      退款总金币数：{{ format3((stats.permanentGolds + stats.freeGolds + stats.taskGolds).toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
+      永久金币：{{ format3(stats.permanentGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
       免费金币：{{ format3(stats.freeGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
       任务金币：{{ format3(stats.taskGolds.toFixed(2)) }}金币
     </div>
@@ -98,7 +98,7 @@
 
         </template>
       </el-table-column>
-      <el-table-column v-if="checkTab !== 'pending'" prop="auditTime" label="审核时间" width="180" sortable="custom">
+      <el-table-column v-if="checkTab !== 'pending'" prop="auditTime" label="审核时间" width="180">
         <template #default="{ row }">
           {{ row.auditTime ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') : '--' }}
         </template>
@@ -306,7 +306,6 @@ const clicked = ref(false);
 const handleApprove = async (row) => {
   clicked.value = true
   if (findMenuById(menuTree.value, permissionMapping.Refund_Approval)) {
-
     try {
       const params = {
         orderCode: row.orderCode,
diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index b7a8ea4..4f4502a 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -1,12 +1,16 @@
 <script setup>
 import {onMounted, reactive, ref, watch} from "vue";
 import {ElIcon, ElMessage, ElMessageBox} from "element-plus";
-import {Plus, WarnTriangleFilled} from '@element-plus/icons-vue'
-
 import moment from "moment";
 import request from "@/util/http.js"
 import Cookies from 'js-cookie';
+import {useAdminStore} from "@/store/index.js";
+import {storeToRefs} from "pinia";
+import {WarnTriangleFilled} from "@element-plus/icons-vue";
 import dayjs from "dayjs";
+
+const adminStore = useAdminStore();
+const { adminData, menuTree } = storeToRefs(adminStore);
 // 精网号去空格
 const trimJwCode = () => {
   if (addConsume.value.jwcode) {
@@ -28,7 +32,8 @@ const addDisabled = ref(false)
 ====================数据=================================
 */
 //这是获取当前登录的用户信息
-const adminData = ref({});
+// const adminData = ref({});
+
 // 通过精网号查询用户（客户）信息 表单
 const user = ref({
   jwcode: null,
@@ -66,12 +71,12 @@ const Ref = ref(null);
 // 表单验证规则
 const rules = reactive({
   jwcode: [
-    {required: true, message: "请输入精网号", trigger: "blur"},
+    { required: true, message: "请输入精网号", trigger: "blur" },
     // { type: 'number', message: "精网号必须为数字", trigger: "blur" }
   ],
-  goodsName: [{required: true, message: "请选择商品", trigger: "blur"}],
+  goodsName: [{ required: true, message: "请选择商品", trigger: "blur" }],
   sumGold: [
-    {required: true, message: "消耗金币总数不能为空", trigger: "blur"},
+    { required: true, message: "消耗金币总数不能为空", trigger: "blur" },
     {
       validator: (rule, value, callback) => {
         // 允许0开头的小数（如0.1）但不允许单独的0
@@ -181,6 +186,7 @@ function validateInput() {
   }
 
 
+
   // 验证金币总和
   const totalAvailableGold = (user.value.nowSumGold)
   if (user.value.jwcode && sumGold > totalAvailableGold) {
@@ -198,10 +204,10 @@ function calculateCoins(sumGold) {
   console.log("消耗金币计算函数:计算金币", sumGold);
   const parsedSumGold = parseFloat(sumGold);
   if (isNaN(parsedSumGold) || parsedSumGold <= 0 || !user.value.jwcode) {
-    return {free: 0, permanent: 0, task: 0};
+    return { free: 0, permanent: 0, task: 0 };
   }
 
-  const {nowFreeGold, nowPermanentGold, nowTaskGold} = user.value;
+  const { nowFreeGold, nowPermanentGold, nowTaskGold } = user.value;
   let remaining = parsedSumGold;
   let freeUsed = 0, permanentUsed = 0, taskUsed = 0;
 
@@ -227,9 +233,8 @@ function calculateCoins(sumGold) {
   addConsume.value.permanentGold = permanentUsed;
   addConsume.value.taskGold = taskUsed;
 
-  return {free: freeUsed, permanent: permanentUsed, task: taskUsed};
+  return { free: freeUsed, permanent: permanentUsed, task: taskUsed };
 }
-
 // 用来写的 cookie 的 key
 const WriteCookies = ref(null)
 // 用来写的 cookie 的 value
@@ -238,7 +243,6 @@ const WriteCookiesTime = ref(null)
 const ReadCookies = ref(null)
 // 用来读的 cookie 的 value
 const ReadCookiesTime = ref(null)
-
 // 这是添加消费信息的接口
 const add = async function () {
   try {
@@ -250,16 +254,18 @@ const add = async function () {
     calculateCoins(addConsume.value.sumGold);
 
     console.log("addConsume.value", addConsume.value)
+
     //存一下 用户的jwcode
     // 拼接 jwcode:permanentGold:freeGold
     WriteCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}}`
     //value 为当前消耗时间
     WriteCookiesTime.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
     // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
-    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {expires: 1, path: '/'});
+    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {expires:
+          1, path: '/'});
 
-    // 发送POST请求
     addDisabled.value = true
+    // 发送POST请求
     const result = await request({
       // url: "/consume/add",
       url: "/consume/add",
@@ -335,7 +341,6 @@ function resetForm() {
     nowSumGold: null
   }
 }
-
 // 充值对话框显示状态
 const ConsumeDialogVisible = ref(false);
 
@@ -355,8 +360,8 @@ const ConsumeDialogVisibleContinue = () => {
 
 const ConsumeDialogVisibleCancel = () => {
   ConsumeDialogVisible.value = false
-    resetForm()
-    user.value = {}
+  resetForm()
+  user.value = {}
 };
 // 实际执行充值操作
 const proceedWithConsume = () => {
@@ -382,7 +387,7 @@ const addBefore = () => {
       return;
     }
     ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}}`
-  // 获取cookie
+    // 获取cookie
     const cookie = Cookies.get(ReadCookies.value)
     console.log("time", WriteCookiesTime.value)
     // 格式化时间
@@ -395,6 +400,7 @@ const addBefore = () => {
   });
 };
 
+
 // 查询客户信息（通过精网号）
 const getUser = async function (jwcode) {
   try {
@@ -414,7 +420,7 @@ const getUser = async function (jwcode) {
     // 发送POST请求
     const result = await request({
       url: "/user/selectUser",
-      data: {jwcode}
+      data: { jwcode }
     });
 
     console.log("请求成功", result);
@@ -441,7 +447,7 @@ const getUser = async function (jwcode) {
       if (addConsume.value.sumGold) {
         const parsedSumGold = parseFloat(addConsume.value.sumGold);
         if (!isNaN(parsedSumGold) && parsedSumGold > 0) {
-          const {free, permanent, task} = calculateCoins(parsedSumGold);
+          const { free, permanent, task } = calculateCoins(parsedSumGold);
           addConsume.value.freeGold = free;
           addConsume.value.permanentGold = permanent;
           addConsume.value.taskGold = task;
@@ -493,20 +499,20 @@ const getGoods = async function () {
 
 // 监听消费总金额变化，自动计算三类金币
 watch(
-    () => addConsume.value.sumGold,
-    (newValue) => {
-      const parsedNewValue = parseFloat(newValue);
-      if (!isNaN(parsedNewValue) && parsedNewValue > 0) {
-        const {free, permanent, task} = calculateCoins(parsedNewValue);
-        addConsume.value.freeGold = free;
-        addConsume.value.permanentGold = permanent;
-        addConsume.value.taskGold = task;
-      } else {
-        addConsume.value.freeGold = null;
-        addConsume.value.permanentGold = null;
-        addConsume.value.taskGold = null;
-      }
+  () => addConsume.value.sumGold,
+  (newValue) => {
+    const parsedNewValue = parseFloat(newValue);
+    if (!isNaN(parsedNewValue) && parsedNewValue > 0) {
+      const { free, permanent, task } = calculateCoins(parsedNewValue);
+      addConsume.value.freeGold = free;
+      addConsume.value.permanentGold = permanent;
+      addConsume.value.taskGold = task;
+    } else {
+      addConsume.value.freeGold = null;
+      addConsume.value.permanentGold = null;
+      addConsume.value.taskGold = null;
     }
+  }
 );
 
 /*
@@ -522,46 +528,60 @@ onMounted(async function () {
 
 <template>
   <div>
-    <el-form :model="addConsume" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px;"
-             label-position="right" class="add-form">
-      <el-form-item prop="jwcode" label="精网号">
-        <el-input v-model="addConsume.jwcode" style="width: 200px"/>
+    <el-form :model="addConsume" ref="Ref" :rules="rules" style="max-width: 750px;">
+      <div style="width:25vw">
+      <el-form-item prop="jwcode" label="精网号" style="margin-top: 50px">
+        <el-input v-model="addConsume.jwcode" style="width: 10vw;margin-left:45px" />
         <el-button type="primary" @click="getUser(addConsume.jwcode)" style="margin-left: 10px">查询
         </el-button>
       </el-form-item>
-      <el-form-item prop="goodsName" label="商品名称">
-        <el-select v-model="addConsume.goodsName" placeholder="请选择商品" style="width: 200px">
-          <el-option v-for="item in goods" :key="item.value" :label="item.label" :value="item.value"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="sumGold" label="消耗金币总数">
-        <el-input v-model="addConsume.sumGold" style="width: 100px" @input="validateInput()"
-                  @change="calculateCoins(addConsume.sumGold)"/>
-      </el-form-item>
+    </div>
+      <div  style="width:25vw">
+        <el-form-item prop="goodsName" label="商品名称" style="flex: 1; margin-right: 0px">
+          <el-select v-model="addConsume.goodsName" placeholder="请选择商品"  style="width: 10vw;margin-left:30px">
+            <el-option v-for="item in goods" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+      </div>
+      <div  style="width:25vw"> 
+        <el-form-item prop="sumGold" label="消耗金币总数">
+          <el-input v-model="addConsume.sumGold" style="width: 10vw;margin-left:2px" @input="validateInput()"
+            @change="calculateCoins(addConsume.sumGold)" />
+        </el-form-item>
+      </div>
 
       <!-- 三类金币自动计算（禁用状态，不可编辑） -->
-      <el-form-item prop="permanentGold" label="永久金币">
-        <el-input v-model="addConsume.permanentGold" disabled style="width: 100px">
-          <template #default="scope">{{ scope.row.permanentGold }}</template>
-        </el-input>
-        <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
-      </el-form-item>
-      <el-form-item prop="freeCoin" label="免费金币">
-        <el-input disabled v-model="addConsume.freeGold" style="width: 100px"/>
-        <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
-      </el-form-item>
-      <el-form-item prop="taskGold" label="任务金币">
-        <el-input disabled v-model="addConsume.taskGold" style="width: 100px"/>
-        <p style="margin-right: 20px">&nbsp;&nbsp;个</p>
-      </el-form-item>
-      <el-form-item prop="remark" label="备注">
-        <el-input v-model="addConsume.remark" style="width: 300px" :rows="4" maxlength="100" show-word-limit
-                  type="textarea"/>
-      </el-form-item>
+      <div style="width:25vw">
+        <el-form-item prop="permanentGold" label="永久金币">
+          <el-input v-model="addConsume.permanentGold" disabled  style="width: 10vw;margin-left:40px">
+            <template #default="scope">{{ scope.row.permanentGold }}</template>
+          </el-input>
+          <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
+        </el-form-item>
+      </div>
+      <div style="width:25vw">
+        <el-form-item prop="freeCoin" label="免费金币">
+          <el-input disabled v-model="addConsume.freeGold" style="width: 10vw;margin-left:40px" />
+          <p style="margin-right: 0px">&nbsp;&nbsp;个</p>
+        </el-form-item>
+      </div>
+      <div style="width:25vw">
+        <el-form-item prop="taskGold" label="任务金币">
+          <el-input disabled v-model="addConsume.taskGold" style="width: 10vw;margin-left:40px" />
+          <p style="margin-right: 20px">&nbsp;&nbsp;个</p>
+        </el-form-item>
+      </div>
+      <div style="width:25vw">
+        <el-form-item prop="remark" label="备注">
+          <el-input v-model="addConsume.remark" style="width: 13.5vw;margin-left:70px" :rows="4" maxlength="100" show-word-limit
+            type="textarea" />
+        </el-form-item>
+      </div>
       <el-button type="success" @click="resetForm()" style="margin-left: 200px;margin-top:10px">重置</el-button>
       <el-button type="primary" :disabled="addDisabled" @click="addBefore" style="margin-top:10px"> 提交</el-button>
     </el-form>
 
+
     <!-- 客户信息栏 -->
     <el-card v-if="user.jwcode" style="width: 800px; float: right" class="customer-info">
       <el-form :model="user" label-width="auto" style="max-width: 1000px" label-position="left">
@@ -586,7 +606,7 @@ onMounted(async function () {
             </el-form-item>
             <el-form-item style="margin-top: -23px">
               <span style="display: inline; white-space: nowrap; color: #b1b1b1"
-                    v-if="user.historyPermanentGold !== undefined">(永久金币:{{ user.historyPermanentGold }};免费金币:{{
+                v-if="user.historyPermanentGold !== undefined">(永久金币:{{ user.historyPermanentGold }};免费金币:{{
                   (user.historyFreeGold)
                 }};任务金币:{{ user.historyTaskGold }})</span>
             </el-form-item>
@@ -602,15 +622,13 @@ onMounted(async function () {
           </el-col>
           <el-col :span="14">
             <el-form-item label="当前金币总数" style="width: 500px">
-              <span style="color: #2fa1ff; margin-right: 5px" v-if="user.nowSumGold !== undefined">{{
-                  user.nowSumGold
-                }}</span>
+              <span style="color: #2fa1ff; margin-right: 5px" v-if="user.nowSumGold !== undefined">{{ user.nowSumGold
+              }}</span>
             </el-form-item>
             <!-- 金币详情独立显示 -->
             <el-form-item style="margin-top: -23px"> <!-- 负边距减少间距 -->
               <span style="color: #b1b1b1; margin-left: 0px" v-if="user.nowPermanentGold !== undefined">(永久金币:{{
-                  user.nowPermanentGold
-                }};
+                user.nowPermanentGold }};
                 免费金币:{{ user.nowFreeGold }};
                 任务金币:{{ user.nowTaskGold }})</span>
             </el-form-item>
@@ -648,7 +666,6 @@ onMounted(async function () {
         </el-row>
       </el-form>
     </el-card>
-
     <el-dialog
         v-model="ConsumeDialogVisible"
         title="操作确认"
@@ -722,7 +739,6 @@ onMounted(async function () {
         </div>
       </template>
     </el-dialog>
-
   </div>
 
   <!-- 金币消耗明细的布局------------------------------------------------------- -->
@@ -739,12 +755,6 @@ p {
   margin: 0px;
 }
 
-.add-form {
-  margin-top: 50px;
-  max-width: 50%;
-  float: left;
-}
-
 .el-form-item {
   margin-left: 50px;
 }
@@ -755,10 +765,6 @@ p {
   height: 50px;
   display: block;
 }
-
-.customer-info {
-  max-width: 60%;
-}
 </style>
 
 <style>
diff --git a/src/views/history/history.vue b/src/views/history/history.vue
new file mode 100644
index 0000000..ebcdbd0
--- /dev/null
+++ b/src/views/history/history.vue
@@ -0,0 +1,144 @@
+<template>
+    <el-card>
+        <el-text size="large>">姓名：</el-text>
+        <el-input v-model="searchObj.name" placeholder="请输入姓名" style="width: 12vw;margin-right:1vw"
+            clearable></el-input>
+        <el-text size="large>">精网号：</el-text>
+        <el-input v-model="searchObj.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw"
+            clearable></el-input>
+        <el-text size="large" style="width: 80px">充值时间：</el-text>
+        <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="开始时间"
+            end-placeholder="结束时间" style="width: 25vw;margin-right:1vw" @change="handleDatePickerChange" />
+        <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
+        <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
+        <el-button @click="get7Days()" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
+        <el-button type="success" @click="resetSearch">重置</el-button>
+        <el-button type="primary" @click="get">查询</el-button>
+    </el-card>
+    <el-card style="margin-top:10px">
+        <el-table :data="tableData">
+            <el-table-column type="index" label="序号" width="55">
+                <template #default="scope">
+                    {{ scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize }}
+                </template>
+
+            </el-table-column>
+            <el-table-column prop="name" label="客户姓名" width="120" show-overflow-tooltip />
+            <el-table-column prop="jwcode" label="精网号" width="120" />
+            <el-table-column prop="" label="数量" width="120" />
+            <el-table-column prop="" label="更新类型" width="120" />
+            <el-table-column prop="" label="免费金币" width="120" />
+            <el-table-column prop="" label="永久金币" width="120" />
+            <el-table-column prop="" label="任务金币" width="120" />
+            <el-table-column prop="" label="操作人" width="120" />
+            <el-table-column prop="" label="更新时间" width="120" />
+            <el-table-column prop="" label="备注" width="120" />
+        </el-table>
+        <el-pagination class="pagination" v-model:current-page="pagination.pageNum"
+            v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
+            :total="pagination.total" @size-change="handlePageSizeChange"
+            @current-change="handleCurrentChange"></el-pagination>
+    </el-card>
+</template>
+<script setup>
+import { onMounted, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import API from '@/util/http'
+import moment from 'moment'
+import { useAdminStore } from "@/store/index.js"
+import { storeToRefs } from "pinia"
+const adminStore = useAdminStore()
+const { adminData, menuTree } = storeToRefs(adminStore)
+import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
+
+const tableData = ref([])
+const dateRange = ref([])
+const searchObj = ref({
+    name: '',
+    jwcode: ''
+})
+const pagination = ref({
+    pageNum: 1,
+    pageSize: 50,
+    total: 0
+})
+const get = async function () {
+    if (findMenuById(menuTree.value, permissionMapping.History_Query)) {
+        try {
+            if (!searchObj.value.name && !searchObj.value.jwcode) {
+                const res = await API.get('/admin/history', {
+                    params: {
+                        ...searchObj.value,
+                        startTime: dateRange.value[0],
+                        endTime: dateRange.value[1]
+                    }
+                })
+                tableData.value = res.data
+                pagination.value.total = res.data.total
+            } else {
+                ElMessage.error('请输入姓名或精网号')
+                return
+            }
+        } catch (e) {
+            ElMessage.error(e.message)
+        }
+    }
+}
+
+const resetSearch = function () {
+    searchObj.value = {
+        name: '',
+        jwcode: ''
+    }
+    dateRange.value = []
+    get()
+}
+const getToday = function () {
+    const today = dayjs()
+    const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+    dateRange.value = [startTime, endTime]
+    console.log('dateRange', dateRange.value)
+    activeTimeRange.value = 'today'
+    get()
+    getStats()
+}
+const getYesterday = function () {
+    const today = dayjs()
+    const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+    dateRange.value = [startTime, endTime]
+    console.log('dateRange', dateRange.value)
+    activeTimeRange.value = 'yesterday'
+    get()
+    getStats()
+}
+const get7Days = function () {
+    const today = dayjs()
+    const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+    dateRange.value = [startTime, endTime]
+    console.log('dateRange', dateRange.value)
+    activeTimeRange.value = '7days'
+    get()
+    getStats()
+}
+const handleDatePickerChange = () => {
+    activeTimeRange.value = ''
+}
+const handlePageSizeChange = function (val) {
+    pagination.value.pageSize = val
+    get()
+}
+const handleCurrentChange = function (val) {
+    pagination.value.pageNum = val
+    get()
+}
+</script>
+
+<style scoped>
+.pagination {
+    display: flex;
+    margin-top: 0.5vh;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/usergold/bean/userbean.vue b/src/views/usergold/bean/userbean.vue
index 848eade..ebb7794 100644
--- a/src/views/usergold/bean/userbean.vue
+++ b/src/views/usergold/bean/userbean.vue
@@ -9,7 +9,8 @@
 
         <div style="float: right;">
             <el-button type="success" @click="reset">重置</el-button>
-            <el-button type="primary" @click="get">查询</el-button>
+            <el-button type="primary" @click="search">查询</el-button>
+
         </div>
     </el-card>
 
@@ -149,7 +150,7 @@ const handleSortChange = (column) => {
     }
     searchObj.value.sortOrder = column.order === 'ascending' ? 'asc' : 'desc'
     console.log('排序字段：', searchObj.value.sortField,'排序方式：', searchObj.value.sortOrder)
-    get()
+    search()
 }
 const getmarkets = async () => {
     try {
@@ -168,23 +169,27 @@ const trim = () => {
 const reset = function () {
     searchObj.value.jwcode = ''
     searchObj.value.dept = ''
-    get()
+    search()
 }
 const handlePageSizeChange = function (val) {
     pagination.value.pageSize = val
-    get()
+    search()
 }
 const handleCurrentChange = function (val) {
     pagination.value.pageNum = val
-    get()
+    search()
 }
 const format3 = (num) => {
     // 每三位添加逗号
     return num.toLocaleString('en-US')
 }
+const search = () => {
+    get()
+    getStats()
+}
 
 onMounted(() => {
-    get()
+    search()
     getmarkets()
     getStats()
     console.log('页面接收到的adminData:', adminData.value)
diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue
index ab2f072..51b3dbd 100644
--- a/src/views/usergold/gold/clientCountBalance.vue
+++ b/src/views/usergold/gold/clientCountBalance.vue
@@ -108,7 +108,7 @@ const get = async function (val) {
     const result = await API({
       url: '/goldDetail/getGold',
       method: 'post',
-      data: {...getObj.value, user: {...user.value, UserFlag: showEmployeeData.value? 0 : 1}}
+      data: {...getObj.value, user: {...user.value, flag: showEmployeeData.value? 0 : 1}}
     })
     console.log('响应数据', result)
     tableData.value = result.data.list
@@ -121,7 +121,7 @@ const get = async function (val) {
       data: {
         jwcode: user.value.jwcode,
         markets: user.value.markets,
-      UserFlag: showEmployeeData.value? 1 : 0
+      flag: showEmployeeData.value? 1 : 0
       }
     })
     // 判断精网号是否存在，假设精网号不存在时 result.data.list 为空数组
@@ -250,7 +250,7 @@ const exportExcel = async function () {
     user: {
       jwcode: user.value.jwcode || '',
       markets: user.value.markets || [],
-    UserFlag: showEmployeeData.value? 0 : 1
+    flag: showEmployeeData.value? 0 : 1
     }
 
   }
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue
index 9a2da6e..157a961 100644
--- a/src/views/usergold/gold/clientCountDetail.vue
+++ b/src/views/usergold/gold/clientCountDetail.vue
@@ -170,7 +170,7 @@ const get = async function (val) {
     const result = await API({
       url: '/goldDetail/getGoldDetail',
       method: 'post',
-      data: {...getObj.value, goldDetail: {...goldDetail.value, UserFlag: showEmployeeData.value? 0 : 1}}
+      data: {...getObj.value, goldDetail: {...goldDetail.value, flag: showEmployeeData.value? 0 : 1}}
     })
     console.log('响应数据', result)
     tableData.value = result.data.list
@@ -191,7 +191,7 @@ const get = async function (val) {
       url: '/goldDetail/getTotal',
       method: 'post',
       data: {
-        goldDetail: {...goldDetail.value, UserFlag: showEmployeeData.value? 1 : 0},
+        goldDetail: {...goldDetail.value, flag: showEmployeeData.value? 1 : 0},
         /* jwcode: goldDetail.value.jwcode || '',
          payPlatform: goldDetail.value.payPlatform || '',
          type: goldDetail.value.type || '',
@@ -333,7 +333,7 @@ const exportExcel = async function () {
       endTime: goldDetail.value.endTime || '',
       sortField: goldDetail.value.sortField || '',
       sortOrder: goldDetail.value.sortOrder || '',
-      UserFlag: showEmployeeData.value ? 0 : 1 // 新增 UserFlag 参数
+      flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数
     },
 
   }
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index eef54b4..1992659 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -314,8 +314,8 @@ const getToday = function () {
 // 本周
 const getWeek = function () {
   const today = dayjs()
-  const startTime = (today.startOf('week').format('YYYY-MM-DD HH:mm:ss'))
-  const endTime = today.endOf('week').format('YYYY-MM-DD HH:mm:ss')
+  const startTime = (today.startOf('week').add(1, 'day')).format('YYYY-MM-DD HH:mm:ss')
+  const endTime = (today.endOf('week').add(1, 'day')).format('YYYY-MM-DD HH:mm:ss')
   // const endTime = today.add(1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD HH:mm:ss')
   dateRange.value = [startTime, endTime]
   console.log('看看dateRange', dateRange.value)
diff --git a/stats.html b/stats.html
index 93f9be7..4bb1e61 100644
--- a/stats.html
+++ b/stats.html
@@ -4925,7 +4925,6 @@ var drawChart = (function (exports) {
 
 })({});
 
-  /*-->*/
   </script>
   <script>
     /*<!--*/
@@ -4942,7 +4941,7 @@ var drawChart = (function (exports) {
     window.addEventListener('resize', run);
 
     document.addEventListener('DOMContentLoaded', run);
-    /*-->*/
+
   </script>
 </body>
 </html>