From 26a02142765d3ec230b07f7d02d54b41f256448c Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Tue, 29 Apr 2025 18:03:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E6=89=BE=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/.env.production | 11 +- .../src/views/goldBeen/goldenBeenDetail.vue | 427 ++++++++++++----- gold-system/src/views/goldBeen/onLineDetail.vue | 513 +++++++++++---------- gold-system/src/views/usergold/index.vue | 9 +- 4 files changed, 612 insertions(+), 348 deletions(-) diff --git a/gold-system/.env.production b/gold-system/.env.production index 98834c3..70912af 100644 --- a/gold-system/.env.production +++ b/gold-system/.env.production @@ -1,12 +1,5 @@ # VITE_API_BASE='http://54.251.137.151:10702/' -<<<<<<< HEAD -<<<<<<< HEAD -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -======= -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -# VITE_API_BASE='http://192.168.8.220:8080/' ->>>>>>> zry -======= VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' ->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 +# VITE_API_BASE='http://192.168.8.220:8080/' + diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index b57ad3f..8a2b579 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -60,7 +60,7 @@ 充值时间： 查询 重置 - 导出excel + 导出excel + + + +
导出信息
+
+ 你正在导出所有数据 +
+
+ 你正在导出以下数据 +
+
精网号：{{ detailY.jwcode || '' }}
+
所属地区：{{ detailY.deptName || '' }}
+
订单号：{{ detailY.orderNo || '' }}
+
充值类型：{{ detailY.type || '' }}
+
+更新时间： +{{ detailY.startTime || '无起始时间' }} 至 {{ detailY.endTime || '无结束时间' }} +
+ + + + + + + +
+ 已导出 {{ exportedCount }} 条 / 共 {{ totalExport }} 条 +
+ + + +
金豆总数：充值金豆总数：{{ countValue }}，合计金额数：{{ @@ -136,7 +191,7 @@
- - + --> + + diff --git a/gold-system/src/views/usergold/index.vue b/gold-system/src/views/usergold/index.vue index 28a01b0..aa964ae 100644 --- a/gold-system/src/views/usergold/index.vue +++ b/gold-system/src/views/usergold/index.vue @@ -426,12 +426,17 @@ const handleCurrentChange = function (val) { :close-on-click-modal="false" >
导出信息
-
你正在导出以下数据
+ 例如，在代码中，我们可能错误地在模板中使用了detailY.value，但实际上应该直接使用detailY。 --> +
+ 你正在导出所有数据 +
+
+ 你正在导出以下数据 +
精网号：{{ detailY.jwcode || '' }}
平台信息：{{ detailY.consumePlatform ? (platform.find(item => item.value === detailY.consumePlatform)?.label) : '' }}
数量更新类型：{{ detailY.num ? (num.find(item => item.value === detailY.num)?.label || '') : '' }}
From 20623ef0ba8abaeb8b815b8544f451df9352a917 Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Wed, 30 Apr 2025 10:23:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E5=AE=8C=E6=88=90=E8=87=AA=E6=B5=8Bbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/src/views/goldBeen/goldenBeenDetail.vue | 7 ++++--- gold-system/src/views/goldBeen/onLineDetail.vue | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index 8a2b579..e96b95c 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -319,7 +319,7 @@ const doExportExcel = async () => { return } - const pageSize = 100 // 每批次获取 100 条数据 + const pageSize = 5000 // 每批次获取 100 条数据 const totalPages = Math.ceil(totalExport.value / pageSize) for (let page = 1; page <= totalPages; page++) { @@ -351,9 +351,10 @@ const doExportExcel = async () => { } if (isExporting.value) { - // 导出的数据将字段映射 - const exportData = allExportData.map((item) => { + // 导出的数据将字段映射，添加序号列 + const exportData = allExportData.map((item, index) => { return { + 序号: index + 1, // 添加序号列 姓名: item.nickname, 精网号: item.jwcode, 地区: item.ipAddress, diff --git a/gold-system/src/views/goldBeen/onLineDetail.vue b/gold-system/src/views/goldBeen/onLineDetail.vue index d1e16f4..a095ced 100644 --- a/gold-system/src/views/goldBeen/onLineDetail.vue +++ b/gold-system/src/views/goldBeen/onLineDetail.vue @@ -455,7 +455,7 @@ const doExportExcel = async () => { return } - const pageSize = 100 // 每批次获取 100 条数据 + const pageSize = 1000 // 每批次获取 100 条数据 const totalPages = Math.ceil(totalExport.value / pageSize) for (let page = 1; page <= totalPages; page++) { @@ -484,9 +484,10 @@ const doExportExcel = async () => { } if (isExporting.value) { - // 导出的数据将字段映射 - const exportData = allExportData.map((item) => { + // 导出的数据将字段映射，添加序号列 + const exportData = allExportData.map((item, index) => { return { + 序号: index + 1, // 添加序号列 姓名: item.name, 精网号: item.jwcode, 地区: item.deptName, From 7a608d9168317814f8e482aecff16a2e316bbe4c Mon Sep 17 00:00:00 2001 From: lihuilin Date: Wed, 30 Apr 2025 10:31:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?0430=E6=95=B4=E5=90=88=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/goldBeen/goldenBeenConsum.vue | 66 +++++++++++++++++++--- .../src/views/goldBeen/goldenBeenDetail.vue | 66 ++++++++++++++++++---- gold-system/src/views/managerecharge/activity.vue | 58 ++++++++++++++++++- gold-system/src/views/managerecharge/rate.vue | 59 +++++++++++++++++++ gold-system/src/views/usergold/index.vue | 29 +++++++++- 5 files changed, 256 insertions(+), 22 deletions(-) diff --git a/gold-system/src/views/goldBeen/goldenBeenConsum.vue b/gold-system/src/views/goldBeen/goldenBeenConsum.vue index a9e505a..836b7f0 100644 --- a/gold-system/src/views/goldBeen/goldenBeenConsum.vue +++ b/gold-system/src/views/goldBeen/goldenBeenConsum.vue @@ -66,17 +66,30 @@ style="width: 220px" /> - - 消费时间： + + 开始时间： + + + 结束时间： + + 今 + 昨 + 近7天 查询 @@ -185,7 +198,8 @@ const ruleFormRef = ref() const detailY = ref({ jwcode: '', ipAddress: '', - createTime: '', + startTime:'', + endTime:'', // channel: '', //频道 sourceName: '', //直播间 sourceType: '' //消费类型 @@ -194,11 +208,44 @@ const getObj = ref({ pageNum: 1, pageSize: 50 }) +// 今天 +const getToday = function () { + const today = new Date() + // 格式化开始时间 + const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 昨天 +const getYesterday = function () { + const yesterday = moment().subtract(1, 'days') + // 格式化开始时间 + const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 近7天 +const get7Days = function () { + // 格式化开始时间 + const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} //初始化 const getInit = async function () { try { console.log('搜索参数', getObj.value) - const [startTime, endTime] = detailY.value.createTime + const startTime = detailY.value.startTime + const endTime = detailY.value.endTime // 发送POST请求 const result = await API({ url: '/dou/getSpend', @@ -233,6 +280,7 @@ const trimJwCode = () => { detailY.value.sourceName = detailY.value.sourceName.replace(/\s/g, ''); } } + // 搜索 const search = function () { trimJwCode(); diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index 8a2b579..98684e8 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -57,19 +57,31 @@ /> --> - - 充值时间： + + 开始时间： + + 结束时间： + + + 今 + 昨 + 近7天 查询 重置 @@ -411,6 +423,38 @@ const rules = ref({ jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }], area: [{ required: true, message: '请选择所属地区', trigger: 'change' }] }) +// 今天 +const getToday = function () { + const today = new Date() + // 格式化开始时间 + const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 昨天 +const getYesterday = function () { + const yesterday = moment().subtract(1, 'days') + // 格式化开始时间 + const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 近7天 +const get7Days = function () { + // 格式化开始时间 + const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} //获取地区接口 const getArea = async () => { try { @@ -453,7 +497,6 @@ const detailY = ref({ orderNo: '', payStyle: '', type: '', - createTime: '', startTime:'', endTime:'' }) @@ -547,7 +590,8 @@ const getInit = async function ( ) { try { console.log('搜索参数', getObj.value) - const [startTime, endTime] = detailY.value.createTime + const startTime = detailY.value.startTime + const endTime = detailY.value.endTime console.log(startTime, endTime) // 发送POST请求 const result = await API({ @@ -632,8 +676,8 @@ const getCount = async () => { data: { jwcode: detailY.value.jwcode, deptName: detailY.value.deptName, - startTime: detailY.value.createTime[0], - endTime: detailY.value.createTime[1], + startTime: detailY.value.startTime, + endTime: detailY.value.endTime, orderNo: detailY.value.orderNo, type: detailY.value.type // payStyle: detailY.value.payStyle diff --git a/gold-system/src/views/managerecharge/activity.vue b/gold-system/src/views/managerecharge/activity.vue index aa48821..1a78c29 100644 --- a/gold-system/src/views/managerecharge/activity.vue +++ b/gold-system/src/views/managerecharge/activity.vue @@ -95,7 +95,58 @@ const get = async function (val) { ElMessage.error('请求失败') } } - +// 今天 +const getToday = function () { + const today = new Date() + const startDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + ) + const endDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + 1 + ) + getTime.value = [startDate, endDate] + console.log('getTime', getTime.value) + get() +} +// 昨天 +const getYesterday = function () { + const yesterday = new Date() + yesterday.setDate(yesterday.getDate() - 1) + const startDate = new Date( + yesterday.getFullYear(), + yesterday.getMonth(), + yesterday.getDate() + ) + const endDate = new Date( + yesterday.getFullYear(), + yesterday.getMonth(), + yesterday.getDate() + 1 + ) + getTime.value = [startDate, endDate] + console.log('getTime', getTime.value) + get() +} +// 近7天 +const get7Days = function () { + const today = new Date() + const startDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() - 6 + ) + const endDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + 1 + ) + getTime.value = [startDate, endDate] + console.log('getTime', getTime.value) + get() +} // 活动名称去空格 const trim = () => { if (activity.value.activityName) { @@ -223,6 +274,11 @@ const del = (row) => { start-placeholder="起始时间" end-placeholder="结束时间" /> + 今 + 昨 + 近7天
重置 diff --git a/gold-system/src/views/managerecharge/rate.vue b/gold-system/src/views/managerecharge/rate.vue index 9d0aaf3..01df6af 100644 --- a/gold-system/src/views/managerecharge/rate.vue +++ b/gold-system/src/views/managerecharge/rate.vue @@ -97,6 +97,62 @@ const get = async function (val) { // 在这里可以处理错误逻辑，比如显示错误提示等 } } + +// 今天 +const getToday = function () { + const today = new Date(); + const startDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + ); + const endDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + 1 + ); + // value1!!value1!!lhl狗屎脑子 + value1.value = [startDate, endDate]; + console.log('value1', value1.value); + get(); +} +// 昨天 +const getYesterday = function () { + const yesterday = new Date(); + yesterday.setDate(yesterday.getDate() - 1); + const startDate = new Date( + yesterday.getFullYear(), + yesterday.getMonth(), + yesterday.getDate() + ); + const endDate = new Date( + yesterday.getFullYear(), + yesterday.getMonth(), + yesterday.getDate() + 1 + ); + // 这个也是value1！！ + value1.value = [startDate, endDate]; + console.log('value1', value1.value); + get(); +} +// 近7天 +const get7Days = function () { + const today = new Date(); + const startDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() - 6 + ); + const endDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + 1 + ); + // value1！！ + value1.value = [startDate, endDate]; + console.log('value1', value1.value); + get(); +} // 搜索 const search = function () { getObj.value.pageNum = 1 @@ -464,6 +520,9 @@ function handleInput(value) { :size="size" value-format="YYYY-MM-DD" /> + 今 + 昨 + 近7天 { detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, ''); } } +// 今天 +const getToday = function () { + const today = moment() + const startDate = today.startOf('day').toDate() + const endDate = today.endOf('day').toDate() + getTime.value = [startDate, endDate] + search() +} + +// 昨天 +const getYesterday = function () { + const yesterday = moment().subtract(1, 'day') + const startDate = yesterday.startOf('day').toDate() + const endDate = yesterday.endOf('day').toDate() + getTime.value = [startDate, endDate] + search() +} +// 近7天 +const get7Days = function () { + const startDate = moment().subtract(6, 'day').startOf('day').toDate() + const endDate = moment().endOf('day').toDate() + getTime.value = [startDate, endDate] + search() +} // 搜索 const search = function () { trimJwCode(); @@ -559,8 +583,11 @@ const handleCurrentChange = function (val) { range-separator="至" start-placeholder="起始时间" end-placeholder="结束时间" - style="margin-right: 700px" + style="margin-right: 50px" /> + 今 + 昨 + 近7天 导出Excel表格 重置 查询 From 23e2486ea80c2627f6c4bc73cfe887a18c633005 Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Wed, 30 Apr 2025 16:16:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=98=8E=E7=BB=86=E7=9A=84excel=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/src/views/recharge/allRecharge.vue | 285 +++++++++++++++++++++++-- 1 file changed, 270 insertions(+), 15 deletions(-) diff --git a/gold-system/src/views/recharge/allRecharge.vue b/gold-system/src/views/recharge/allRecharge.vue index 574cfce..d61cea4 100644 --- a/gold-system/src/views/recharge/allRecharge.vue +++ b/gold-system/src/views/recharge/allRecharge.vue @@ -1,11 +1,16 @@