@@ -87,15 +126,16 @@
import CountTo from 'vue-count-to'
import {brief} from "@/api/system/dashboard";
import UserRoundPieChart from "@/views/dashboard/component/UserRoundPieChart.vue";
-import {plusDays} from "@/utils";
import {parseTime} from "@/utils/ruoyi";
import Device from "@/views/system/device/index.vue";
import DeviceLineChart from "@/views/dashboard/component/DeviceLineChart.vue";
import OnlineLineChart from "@/views/dashboard/component/OnlineLineChart.vue";
import ModelBarChart from "@/views/dashboard/component/ModelBarChart.vue";
+import SmallLineChart from '@/views/dashboard/component/SmallLineChart.vue'
export default {
components: {
+ SmallLineChart,
ModelBarChart,
DeviceLineChart,
Device,
@@ -127,58 +167,25 @@ export default {
}
return this.briefData.history[this.briefData.history.length - 1];
},
- // 型号图表数据
- modelChartData() {
- if (this.briefData == null) {
- return []
- }
- let list = this.briefData?.history?.map(item => {
- return {
- x: item.createDate,
- value: item.totalModel
- }
- });
- list.push({
- x: this.today,
- value: this.briefData.modelCount
- })
- return list;
+ // 订单数据
+ rechargeCountChartData() {
+ return this.parseToChart('rechargeCount', 'rechargeCount');
},
- // 在线图表数据
- onlineChartData() {
- if (this.briefData == null || this.briefData.history == null) {
- return []
- }
- let list = [];
- for (let i = 0; i < this.briefData.history.length; i ++) {
- let item = this.briefData.history[i];
- list.push({
- x: item.createDate,
- online: item.totalOnline
- })
- }
- list.push({
- x: this.today,
- online: this.briefData.onlineCount,
- })
- return list;
+ // 订单金额数据
+ rechargeAmountChartData() {
+ return this.parseToChart('rechargeAmount', 'totalRecharge', 2);
+ },
+ // 月费数据
+ monthAmountChartData() {
+ return this.parseToChart('totalMonthAmount', 'totalMonth', 2);
+ },
+ // 用户余额数据
+ userBalanceChartData() {
+ return this.parseToChart('totalUserBalance', 'userBalance', 2);
},
// 设备数据
deviceChartData() {
- if (this.briefData == null) {
- return []
- }
- let list = this.briefData?.history?.map(item => {
- return {
- x: item.createDate,
- value: item.totalDevice
- }
- });
- list.push({
- x: this.today,
- value: this.briefData.deviceCount,
- })
- return list;
+ return this.parseToChart('deviceCount', 'totalDevice');
},
// 用户图表数据
peopleChartData() {
@@ -190,37 +197,6 @@ export default {
{value: this.briefData.tenantCount, name: "用户"}
]
},
- // 设备差值
- compareDevice() {
- if (this.briefData == null) {
- return 0;
- }
- console.log(this.yesterdayData);
- if (this.yesterdayData == null) {
- return this.briefData.deviceCount;
- }
- return this.briefData.deviceCount - this.yesterdayData.totalDevice;
- },
- // 型号差值
- compareModel() {
- if (this.briefData == null) {
- return 0;
- }
- if (this.yesterdayData == null) {
- return this.briefData.modelCount;
- }
- return this.briefData.modelCount - this.yesterdayData.totalModel;
- },
- // 充值差值
- compareOnline() {
- if (this.briefData == null) {
- return 0;
- }
- if (this.yesterdayData == null) {
- return this.briefData.onlineCount;
- }
- return this.briefData.onlineCount - this.yesterdayData.totalOnline;
- },
// 用户差值
compareUser() {
if (this.briefData == null) {
@@ -231,11 +207,37 @@ export default {
}
return this.briefData.userCount + this.briefData.tenantCount - this.yesterdayData.totalUser;
},
+ // 余额差值
+ compareBalance() {
+ if (this.briefData == null) {
+ return 0;
+ }
+ if (this.yesterdayData == null) {
+ return this.briefData.totalUserBalance;
+ }
+ return this.briefData.totalUserBalance - this.yesterdayData.userBalance;
+ },
},
created() {
this.getBriefData();
},
methods: {
+ parseToChart(currentProp, historyProp, fixed = 0) {
+ if (this.briefData == null) {
+ return []
+ }
+ let list = this.briefData?.history?.map(item => {
+ return {
+ x: item.createDate,
+ value: item[historyProp]?.toFixed(fixed)
+ }
+ });
+ list.push({
+ x: this.today,
+ value: this.briefData[currentProp]?.toFixed(fixed)
+ })
+ return list;
+ },
handleSetLineChartData(type) {
this.$emit('handleSetLineChartData', type)
},
@@ -333,6 +335,12 @@ export default {
.panel-device {
background: linear-gradient(180deg, #F2F9FE -3%, #E6F4FE 100%);
}
+ .panel-yellow {
+ background: linear-gradient(180deg, #fefaf2 -3%, #fef4e6 100%);
+ }
+ .panel-red {
+ background: linear-gradient(180deg, #fef2f7 -3%, #ffeef1 100%);
+ }
}
diff --git a/src/views/dashboard/component/SmallLineChart.vue b/src/views/dashboard/component/SmallLineChart.vue
new file mode 100644
index 0000000..7f780df
--- /dev/null
+++ b/src/views/dashboard/component/SmallLineChart.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
diff --git a/src/views/dashboard/component/TodoList.vue b/src/views/dashboard/component/TodoList.vue
new file mode 100644
index 0000000..ee38aeb
--- /dev/null
+++ b/src/views/dashboard/component/TodoList.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
diff --git a/src/views/index.vue b/src/views/index.vue
index 4021a77..cd2245a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,17 +1,26 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -33,10 +42,12 @@ import Brief from "@/views/dashboard/Brief.vue";
import DailyProfitReport from "@/views/dashboard/DailyProfitReport.vue";
import { mapGetters } from 'vuex'
import { UserType } from '@/utils/constants'
+import TodoList from '@/views/dashboard/component/TodoList.vue'
export default {
name: 'Index',
components: {
+ TodoList,
DailyProfitReport,
Brief,
BalancePeriodReport,
diff --git a/src/views/ss/abnormal/index.vue b/src/views/ss/abnormal/index.vue
index 45db90f..aa184b0 100644
--- a/src/views/ss/abnormal/index.vue
+++ b/src/views/ss/abnormal/index.vue
@@ -9,6 +9,16 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -147,7 +153,7 @@
-
+
点击绑定
@@ -184,6 +190,7 @@
+