-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue
index 79310f9..64802e1 100644
--- a/src/views/refund/coinRefundDetail.vue
+++ b/src/views/refund/coinRefundDetail.vue
@@ -316,32 +316,18 @@ const getGoods = async function () {
// 在这里可以处理错误逻辑，比如显示错误提示等
}
}
-
-
-// 验证跳转输入框的数字是否合法
-const checkNumber = function () {
- if (typeof parseInt(getObj.value.pageNum) === 'number') {
- console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
- if (
- getObj.value.pageNum > 0 &&
- getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
- ) {
- getObj.value.pageNum = parseInt(getObj.value.pageNum)
- console.log('输入的数字合法')
- getSelectBy()
- } else {
- //提示
- ElMessage({
- type: 'error',
- message: '请检查输入内容'
- })
- }
- } else {
- //提示
- ElMessage({
- type: 'error',
- message: '请检查输入内容'
- })
+const exportExcel = async function () {
+ const params = {
+ text:'',
+ deptid:'',
+ sort:1,
+ field:'',
+ page:getObj.pageNum,
+ size:getObj.pageSize
+ }
+ const res = await API({ url: '/export/exportRefund', data: params })
+ if (res.code === 200) {
+ ElMessage.success('导出成功')
}
}
// 挂载
diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue
index dfe3bb8..5885ced 100644
--- a/src/views/usergold/clientCountBalance.vue
+++ b/src/views/usergold/clientCountBalance.vue
@@ -32,7 +32,7 @@ const getmarket = async () => {
const result = await API({
url: '/general/market'
});
- console.log('获取地区数据成功',result)
+ console.log('获取地区数据成功', result)
// 假设后端返回的是字符串数组，转换为 { value, label } 格式
if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
market.value = result.data.map(item => ({ value: item, label: item }));
@@ -43,7 +43,7 @@ const getmarket = async () => {
console.error('获取地区数据失败:', error);
ElMessage.error('获取地区数据失败，请稍后重试');
// 可以提供默认数据
- market.value = [];
+ market.value = [];
} finally {
isLoadingmarket.value = false;
}
@@ -65,14 +65,10 @@ const freeDecemberGold = ref(0) // 修改为 currentFreeDecember 对应字段
const taskGold = ref(0) // 修改为 currentTaskGold 对应字段
const freeGold = ref(0) // 计算免费金币总数
-
-
//客户消费记录
const tableCountData = ref([])
const userInfo = ref({})
-
-
// 搜索===========================================
//分页总条目
const total = ref(100)
@@ -91,10 +87,6 @@ const getObj = ref({
const sortField = ref('')
const sortOrder = ref('')
-
-
-
-
// 方法
// 搜索===========================================================================
// 搜索方法
@@ -104,12 +96,12 @@ const get = async function (val) {
if (typeof val === 'number') {
getObj.value.pageNum = val
}
-
+
// 添加排序字段和排序方式到请求参数
user.value.sortField = sortField.value
user.value.sortOrder = sortOrder.value
console.log('搜索参数', getObj.value)
-
+
// 发送POST请求
const requestData = { ...getObj.value, user: { ...user.value } };//控制台打印请求的参数
@@ -126,7 +118,7 @@ const get = async function (val) {
tableData.value = result.data.list
total.value = result.data.total
-
+
// 获取合计数
const resultGoldTotal = await API({
url: '/goldDetail/goldTotal',
@@ -158,7 +150,7 @@ const get = async function (val) {
// 存储表格数据
tableData.value = result.data.list
console.log('tableData', tableData.value)
-
+
// 从接口返回数据中获取各金币数值
if (resultGoldTotal.data) {
permanentGold.value = parseFloat(resultGoldTotal.data.permanentGold.toFixed(2))
@@ -181,7 +173,7 @@ const get = async function (val) {
// 精网号去空格，同时处理 user 和 putExcel 中的 jwcode
const trimJwCode = () => {
if (user.value.jwcode) {
- user.value.jwcode = user.value.jwcode.replace(/\s/g, '');
+ user.value.jwcode = user.value.jwcode.replace(/\s/g, '');
}
}
@@ -202,38 +194,10 @@ const cellClick = function (row, column) {
console.log('cellClick', column.label)
if (column.label === '姓名') {
dialogVisible.value = true
-
+
userInfo.value = row
}
}
-// 验证跳转输入框的数字是否合法
-const checkNumber = function () {
- if (typeof parseInt(getObj.value.pageNum) === 'number') {
- console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
- if (
- getObj.value.pageNum > 0 &&
- getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
- ) {
- getObj.value.pageNum = parseInt(getObj.value.pageNum)
- console.log('输入的数字合法')
- get()
- } else {
- //提示
- ElMessage({
- type: 'error',
- message: '请检查输入内容'
- })
- }
- } else {
- //提示
- ElMessage({
- type: 'error',
- message: '请检查输入内容'
- })
- }
-}
-
-
// 处理排序事件
const handleSortChange = (column) => {
console.log('排序字段：', column.prop)
@@ -250,8 +214,6 @@ const handleSortChange = (column) => {
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
get()
}
-
-
// 挂载
onMounted(async function () {
await getAdminData()
@@ -266,6 +228,20 @@ const handleCurrentChange = function (val) {
getObj.value.pageNum = val
get()
}
+const exportExcel = async function () {
+ const params = {
+ text:'',
+ deptid:'',
+ sort:1,
+ field:'',
+ page:getObj.pageNum,
+ size:getObj.pageSize
+ }
+ const res = await API({ url: '/goldDetail/exportGold', data: params })
+ if (res.code === 200) {
+ ElMessage.success('导出成功')
+ }
+}
@@ -275,34 +251,17 @@ const handleCurrentChange = function (val) {
精网号：
- 查询
+ 导出Excel
+
@@ -311,26 +270,16 @@ const handleCurrentChange = function (val) {
- 
-
+
+
+
+
+
+
+
-
- 扩展
- 收缩
-
-
-
-
-
-
-
-
- 充值审核
- 退款审核
-
-
-
-
-
-
-
- 金币充值
- 金豆充值
-
-
-
-
-
-
- 消耗管理
-
- 金币消耗
- 金豆消耗
-
-
-
-
-
-
- 退款管理
-
- 金币退款
- 金豆退款
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看个人信息
- 退出登录
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 导出列表
+
+
+
+
+ {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+ 处理中
+ 已完成
+
+
+
+
+
+ 下载
+
+
+
+
-
+
所属地区：
-
-
+
- 查询
- 导出Excel
-
+
- 金币总数：{{ Math.abs(goldtotal) /100}}
- 永久金币：{{ Math.abs(permanentGold) /100}}
- 免费金币：{{ Math.abs(freeGold) /100}}
- 任务金币：{{ Math.abs(taskGold) /100}}
+ 金币总数：{{ Math.abs(goldtotal) / 100 }}
+ 永久金币：{{ Math.abs(permanentGold) / 100 }}
+ 免费金币：{{ Math.abs(freeGold) / 100 }}
+ 任务金币：{{ Math.abs(taskGold) / 100 }}
-
-
+
+
{{
scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
@@ -340,75 +289,50 @@ const handleCurrentChange = function (val) {
+
{{
(scope.row.currentPermanentGold +
scope.row.currentFreeJune +
scope.row.currentFreeDecember +
- scope.row.currentTaskGold) /100
+ scope.row.currentTaskGold) / 100
}}
-
+
- {{ Math.abs(scope.row.currentPermanentGold) /100 }}
+ {{ Math.abs(scope.row.currentPermanentGold) / 100 }}
-
+
- {{ scope.row.currentFreeJune /100 }}
+ {{ scope.row.currentFreeJune / 100 }}
-
+
- {{ scope.row.currentFreeDecember /100 }}
+ {{ scope.row.currentFreeDecember / 100 }}
-
+
- {{ Math.abs(scope.row.currentTaskGold) /100 }}
+ {{ Math.abs(scope.row.currentTaskGold) / 100 }}
- {{
- (scope.row.sumPermanentGold || 0) +
- (scope.row.sumFreeJune || 0) +
- (scope.row.sumFreeDecember || 0) +
- (scope.row.sumTaskGold || 0) /100
+ {{
+ (scope.row.sumPermanentGold || 0) +
+ (scope.row.sumFreeJune || 0) +
+ (scope.row.sumFreeDecember || 0) +
+ (scope.row.sumTaskGold || 0) / 100
}}
- {{ Math.abs(scope.row.sumConsume) /100 }}
+ {{ Math.abs(scope.row.sumConsume) / 100 }}
@@ -416,20 +340,14 @@ const handleCurrentChange = function (val) {
-
-
+
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 9423cd7..b1d5bb5 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -9,7 +9,14 @@
当前金币余量
- {{ currentGold }} 较前一日 {{ dailyChange }}
+ {{ currentGold }} 较前一日 {{ dailyChange }}
+
+
@@ -93,7 +100,7 @@
@change="handleDateRangeChange"
value-format="YYYY-MM-DD HH:mm:ss"
/>
- 查询
+ 查询
@@ -134,12 +141,12 @@ import * as echarts from 'echarts'
import { ref, onMounted, nextTick, watch } from 'vue'
import API from '@/util/http'
import { ElMessage } from 'element-plus'
-
+import { Top, Bottom, SemiSelect } from '@element-plus/icons-vue'
// 地区数据
const markets = ref([])
// 图表相关
const activeTab = ref('recharge')
-const timeRange = ref('day')
+const timeRange = ref('')
const dateRange = ref([])
const selectedType = ref('all')
const tableData = ref([])
@@ -206,9 +213,9 @@ const processData = (data) => {
// 遍历市场
data.marketCards.forEach(market => {
- for (const key in summary) {
- if (market[key] !== undefined && market[key] !== null) { // 还应该卡一个number
- summary[key] += market[key]
+ for (const i in summary) {
+ if (market[i] !== undefined && market[i] !== null) { // 其实还应该卡一个number
+ summary[i] += market[i]
}
}
})
@@ -454,7 +461,7 @@ const updateChart = (chartData) => {
// 处理标签切换
const handleTabChange = () => {
- loadChart()
+ getChartData()
}
// 处理时间范围变化
@@ -468,7 +475,7 @@ const handleTimeRangeChange = () => {
endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59)
} else if (timeRange.value === 'week') {
const day = now.getDay()
- const diff = now.getDate() - day + (day === 0 ? -6 : 1) // 调整到本周一
+ const diff = now.getDate() - day + (day === 0 ? -6 : 1)
startDate = new Date(now.setDate(diff))
startDate.setHours(0, 0, 0, 0)
endDate = new Date(now)
@@ -478,9 +485,10 @@ const handleTimeRangeChange = () => {
startDate = new Date(now.getFullYear(), now.getMonth(), 1)
endDate = new Date(now.getFullYear(), now.getMonth() + 1, 0)
endDate.setHours(23, 59, 59, 0)
- } else { // year
- startDate = '2025-01-01 00:00:00'
- endDate = '2025-12-31 23:59:59'
+ } else {
+ startDate = new Date(now.getFullYear(), 0, 1)
+ endDate = new Date(now.getFullYear(), 11, 31)
+ endDate.setHours(23, 59, 59, 0)
}
dateRange.value = [
@@ -488,7 +496,7 @@ const handleTimeRangeChange = () => {
formatDate(endDate)
]
- loadChart()
+ getChartData()
}
// 格式化日期为字符串
@@ -506,7 +514,7 @@ const formatDate = (date) => {
// 处理日期范围变化
const handleDateRangeChange = () => {
timeRange.value = 'custom'
- loadChart()
+ getChartData()
}
const getAdminData = async function () {
try {
@@ -517,11 +525,6 @@ const getAdminData = async function () {
console.log('请求失败', error)
}
}
-// 加载图表数据
-const loadChart = () => {
- getChartData()
-}
-
// 获取卡片数据
const getCardData = async () => {
try {
@@ -542,6 +545,7 @@ onMounted(async () => {
await getAdminData()
await getCardData()
await getMarkets()
+ await getChartData()
handleTimeRangeChange() // 初始化时间范围
})
diff --git a/stats.html b/stats.html
index 0886060..b131311 100644
--- a/stats.html
+++ b/stats.html
@@ -4929,7 +4929,7 @@ var drawChart = (function (exports) {