diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue
index 23cfce3..11a348d 100644
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@@ -70,10 +70,10 @@ const payWay = [
},
];
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 2) * 60 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 2) * 60 + "px";
+// });
// 表单验证ref
const Ref = ref(null);
diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue
index 6bc4726..ddbba6d 100644
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@@ -58,10 +58,10 @@ const refundType = [
},
];
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 1) * 50 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 1) * 50 + "px";
+// });
// 表单验证ref
const Ref = ref(null);
diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue
index f3eacec..5b982e1 100644
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@@ -56,10 +56,10 @@ const consumeType = [
},
];
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 1) * 41 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 1) * 41 + "px";
+// });
// 方法
// 搜索==============================================================
// 搜索方法
diff --git a/vue/gold-system/src/views/managerecharge/activity.vue b/vue/gold-system/src/views/managerecharge/activity.vue
index 329ded7..6acaa1a 100644
--- a/vue/gold-system/src/views/managerecharge/activity.vue
+++ b/vue/gold-system/src/views/managerecharge/activity.vue
@@ -23,7 +23,6 @@ const getAdminData = async function () {
}
};
-
//变量
//活动表格数据
const tableData = ref([]);
@@ -45,10 +44,10 @@ const addObj = ref({
// 删除
// 删除对象
const delObj = ref({});
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 1) * 50 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 1) * 50 + "px";
+// });
// 表单验证ref
const Ref = ref(null);
diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 0bc65e0..992b230 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -251,10 +251,10 @@ function formatDateTwe(value) {
return `${year}-${month}-${day}`;
}
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 1) * 50 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 1) * 50 + "px";
+// });
// 新增数据规则
// 表单验证ref
diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue
index 9515b34..851dd3f 100644
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@@ -69,10 +69,10 @@ const payWay = [
// 删除对象
const delObj = ref({});
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 2) * 60 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 2) * 60 + "px";
+// });
// 方法
// 搜索===========================================================================
diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue
index becce62..07f6c30 100644
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@@ -59,10 +59,10 @@ const payWay = [
},
];
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 2) * 60 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 2) * 60 + "px";
+// });
// 方法
// 搜索==============================================================
diff --git a/vue/gold-system/src/views/refund/allRefund.vue b/vue/gold-system/src/views/refund/allRefund.vue
index 53d601f..c349c1d 100644
--- a/vue/gold-system/src/views/refund/allRefund.vue
+++ b/vue/gold-system/src/views/refund/allRefund.vue
@@ -41,10 +41,10 @@ const consumeType = [
},
];
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 2) * 45 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 2) * 45 + "px";
+// });
// 方法
// 搜索==============================================================
diff --git a/vue/gold-system/src/views/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue
index 14806e8..28bb030 100644
--- a/vue/gold-system/src/views/usergold/index.vue
+++ b/vue/gold-system/src/views/usergold/index.vue
@@ -46,10 +46,10 @@ const updateType = [
},
];
-//表格高度
-const tableHeight = computed(function () {
- return (getObj.value.pageSize + 2) * 38 + "px";
-});
+// //表格高度
+// const tableHeight = computed(function () {
+// return (getObj.value.pageSize + 2) * 38 + "px";
+// });
// 方法
// 搜索===========================================================================
diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index a8a6aeb..66b5016 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -21,7 +21,7 @@ const searchTime = ref([]);
// 月份柱状图
const getMiddleBarObj = ref({
- updateType: "充值"
+ updateType: "充值",
});
const getMiddleBarData = ref({});
const middleTotalRecharge = ref(0);
@@ -32,7 +32,6 @@ const middleRecharge = ref([]);
const middleFree = ref([]);
const middleTask = ref([]);
-
// 地区排名
const getAreaRankObj = ref({
updateType: "充值",
@@ -138,7 +137,6 @@ const get = async function () {
console.log("getDayConsumeCoin", getDayConsumeCoin.value);
console.log("platformData", platformData.value);
-
option3Data.value = [
{
value: Math.abs(statistics.value.rechargeSumCoin),
@@ -212,13 +210,13 @@ const get = async function () {
ERPData.value.forEach((item, index) =>
item == ""
? (ERPData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (ERPData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("ERPData", ERPData.value);
HCData.value = [
@@ -238,13 +236,13 @@ const get = async function () {
HCData.value.forEach((item, index) =>
item == ""
? (HCData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (HCData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("HCData", HCData.value);
LinkData.value = [
@@ -264,13 +262,13 @@ const get = async function () {
LinkData.value.forEach((item, index) =>
item == ""
? (LinkData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (LinkData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("LinkData", LinkData.value);
goldData.value = [
@@ -290,13 +288,13 @@ const get = async function () {
goldData.value.forEach((item, index) =>
item == ""
? (goldData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (goldData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("goldData", goldData.value);
allData.value = [
@@ -473,7 +471,7 @@ const getMiddleBar = async function () {
},
],
};
-
+
// 使用刚指定的配置项和数据显示图表。
recharge.setOption(option);
} else {
@@ -548,7 +546,7 @@ const getMiddleBar = async function () {
// 使用刚指定的配置项和数据显示图表。
consume.setOption(option);
}
-}
+};
// 获取门店排名
const getAreaRank = async function () {
@@ -628,13 +626,21 @@ const handleChange = function () {
// 时间范围控制
const disabledDate = function (date) {
const currentDate = new Date();
- const startDate = new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 1);
- const endDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
+ const startDate = new Date(
+ currentDate.getFullYear(),
+ currentDate.getMonth() - 1,
+ 1
+ );
+ const endDate = new Date(
+ currentDate.getFullYear(),
+ currentDate.getMonth() + 1,
+ 0
+ );
if (date >= startDate && date <= endDate) {
return false;
}
return true;
-}
+};
// 本日
const today = function () {
const current = new Date();
@@ -651,7 +657,6 @@ const today = function () {
searchTime.value = [startDate, endDate];
search();
// console.log("searchTime", moment(searchTime.value[0]).format("YYYY-MM-DD") + "至" + moment(searchTime.value[1]).format("YYYY-MM-DD"))
-
};
// 本周
const thisWeek = function () {
@@ -667,16 +672,8 @@ const thisWeek = function () {
// 本月
const thisMonth = function () {
const current = new Date();
- const startDate = new Date(
- current.getFullYear(),
- current.getMonth(),
- 1
- );
- const endDate = new Date(
- current.getFullYear(),
- current.getMonth() + 1,
- 0
- );
+ const startDate = new Date(current.getFullYear(), current.getMonth(), 1);
+ const endDate = new Date(current.getFullYear(), current.getMonth() + 1, 0);
searchTime.value = [startDate, endDate];
search();
// console.log("searchTime", moment(searchTime.value[0]).format("YYYY-MM-DD") + "至" + moment(searchTime.value[1]).format("YYYY-MM-DD"))
@@ -684,16 +681,8 @@ const thisMonth = function () {
// 本年
const thisYear = function () {
const current = new Date();
- const startDate = new Date(
- current.getFullYear(),
- 0,
- 1
- );
- const endDate = new Date(
- current.getFullYear() + 1,
- 0,
- 0
- );
+ const startDate = new Date(current.getFullYear(), 0, 1);
+ const endDate = new Date(current.getFullYear() + 1, 0, 0);
searchTime.value = [startDate, endDate];
search();
// console.log("searchTime", moment(searchTime.value[0]).format("YYYY-MM-DD") + "至" + moment(searchTime.value[1]).format("YYYY-MM-DD"))
@@ -701,13 +690,22 @@ const thisYear = function () {
const allTime = function () {
searchTime.value = ["", ""];
search();
-}
+};
// 根据时间搜索
const search = function () {
- console.log("searchTime", moment(searchTime.value[0]).format("YYYY-MM-DD") + "至" + moment(searchTime.value[1]).format("YYYY-MM-DD"));
+ console.log(
+ "searchTime",
+ moment(searchTime.value[0]).format("YYYY-MM-DD") +
+ "至" +
+ moment(searchTime.value[1]).format("YYYY-MM-DD")
+ );
- getMiddleBarObj.value.searchStartTime = moment(searchTime.value[0]).format("YYYY-MM-DD");
- getMiddleBarObj.value.searchEndTime = moment(searchTime.value[1]).format("YYYY-MM-DD");
+ getMiddleBarObj.value.searchStartTime = moment(searchTime.value[0]).format(
+ "YYYY-MM-DD"
+ );
+ getMiddleBarObj.value.searchEndTime = moment(searchTime.value[1]).format(
+ "YYYY-MM-DD"
+ );
if (getMiddleBarObj.value.searchStartTime == "Invalid date") {
delete getMiddleBarObj.value.searchStartTime;
}
@@ -716,8 +714,12 @@ const search = function () {
}
console.log("getMiddleBarObj", getMiddleBarObj.value);
- getAreaRankObj.value.searchStartTime = moment(searchTime.value[0]).format("YYYY-MM-DD");
- getAreaRankObj.value.searchEndTime = moment(searchTime.value[1]).format("YYYY-MM-DD");
+ getAreaRankObj.value.searchStartTime = moment(searchTime.value[0]).format(
+ "YYYY-MM-DD"
+ );
+ getAreaRankObj.value.searchEndTime = moment(searchTime.value[1]).format(
+ "YYYY-MM-DD"
+ );
if (getAreaRankObj.value.searchStartTime == "Invalid date") {
delete getAreaRankObj.value.searchStartTime;
}
@@ -728,8 +730,7 @@ const search = function () {
getMiddleBar();
getAreaRank();
-}
-
+};
// 切换平台
const changePlatform = function () {
@@ -1066,26 +1067,37 @@ onMounted(async function () {
折合新币累计金额 {{ formatNum(Math.abs(statistics.totalSumCoin)) }}
- 昨日新增 + 昨日新增 {{ formatNum(Math.abs(statistics.totalYesterdaySumCoin)) }} ,其中充值 {{ formatNum(Math.abs(statistics.rechargeYesterdaySumCoin)) }} @@ -1114,10 +1127,12 @@ onMounted(async function () { 消费 {{ formatNum(Math.abs(getYearConsumeCoin.yearConsumeCoin)) }}; 退款 {{ formatNum(Math.abs(getYearConsumeCoin.yearRefundCoin)) }} - 昨日新增消耗 + 昨日新增消耗 {{ formatNum(Math.abs(getDayConsumeCoin.daysumCoin)) }} ; 消费 {{ formatNum(Math.abs(getDayConsumeCoin.dayConsumeCoin)) }} ; 退款 - {{ formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin)) }} + {{ formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin)) }}