-
+
{{
scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
@@ -265,42 +266,17 @@ onMounted(async function () {
diff --git a/gold-system/src/views/workspace/index.vue b/gold-system/src/views/workspace/index.vue
index 544fa5e..9377a6a 100644
--- a/gold-system/src/views/workspace/index.vue
+++ b/gold-system/src/views/workspace/index.vue
@@ -89,28 +89,54 @@ const get = async function () {
getAreaRank();
getMiddleBar();
// 发送POST请求
+<<<<<<< HEAD
const result1 = await API.post("/hwjb/statistics/getSumCoin", {});
const result2 = await API.post("/hwjb/statistics/a", {});
const result3 = await API.post("/hwjb/statistics/getYearConsumeCoin", {});
const result4 = await API.post("/hwjb/statistics/getDayConsumeCoin", {});
+=======
+ const result1 = await API.post(
+ "http://192.168.8.93:10010/statistics/getSumCoin",
+ {}
+ );
+ const result2 = await API.post(
+ "http://192.168.8.93:10010/statistics/a",
+ {}
+ );
+ const result3 = await API.post(
+ "http://192.168.8.93:10010/statistics/getYearConsumeCoin",
+ {}
+ );
+ const result4 = await API.post(
+ "http://192.168.8.93:10010/statistics/getDayConsumeCoin",
+ {}
+ );
+>>>>>>> Hongxilin
// const result5 = await API.post(
- // "/hwjb/statistics/getMediumAreaPay",
+ // "http://192.168.8.93:10010/statistics/getMediumAreaPay",
// {}
// );
// const result6 = await API.post(
- // "/hwjb/statistics/getMediumAreaConsume",
+ // "http://192.168.8.93:10010/statistics/getMediumAreaConsume",
// {}
// );
// const result7 = await API.post(
- // "/hwjb/statistics/getMediuPayCoin",
+ // "http://192.168.8.93:10010/statistics/getMediuPayCoin",
// {}
// );
// const result8 = await API.post(
- // "/hwjb/statistics/getMediuConsumeCoin",
+ // "http://192.168.8.93:10010/statistics/getMediuConsumeCoin",
// {}
// );
+<<<<<<< HEAD
const result9 = await API.post("/hwjb/statistics/b", {});
+=======
+ const result9 = await API.post(
+ "http://192.168.8.93:10010/statistics/b",
+ {}
+ );
+>>>>>>> Hongxilin
// 将响应结果存储到响应式数据中
getSumCoin.value = result1.data;
@@ -353,7 +379,11 @@ const get = async function () {
// 获取中间柱状图数据
const getMiddleBar = async function () {
const result = await API.post(
+<<<<<<< HEAD
"hwjb/statistics/getCoinTime",
+=======
+ "http://192.168.8.93:10010/statistics/getCoinTime",
+>>>>>>> Hongxilin
getMiddleBarObj.value
);
@@ -555,7 +585,7 @@ const getMiddleBar = async function () {
// 获取门店排名
const getAreaRank = async function () {
const result = await API.post(
- "/hwjb/statistics/getMee",
+ "http://192.168.8.93:10010/statistics/getMee",
getAreaRankObj.value
);
@@ -1351,24 +1381,12 @@ onMounted(async function () {
任务金币