Skip to content

Commit 02442f1

Browse files
TastSongTastSong
committed
dashboard ui
1 parent 0c7bf92 commit 02442f1

File tree

2 files changed

+42
-24
lines changed

2 files changed

+42
-24
lines changed

‎CrazyCarBackground/src/views/dashboard/components/PanelGroup.vue

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<el-row :gutter="40" class="panel-group">
33
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
4-
<div class="card-panel" @click="handleSetLineChartData('newVisitis')">
4+
<div class="card-panel">
55
<div class="card-panel-icon-wrapper icon-people">
66
<svg-icon icon-class="peoples" class-name="card-panel-icon" />
77
</div>
@@ -14,7 +14,7 @@
1414
</div>
1515
</el-col>
1616
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
17-
<div class="card-panel" @click="handleSetLineChartData('messages')">
17+
<div class="card-panel">
1818
<div class="card-panel-icon-wrapper icon-message">
1919
<svg-icon icon-class="message" class-name="card-panel-icon" />
2020
</div>
@@ -27,7 +27,7 @@
2727
</div>
2828
</el-col>
2929
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
30-
<div class="card-panel" @click="handleSetLineChartData('purchases')">
30+
<div class="card-panel">
3131
<div class="card-panel-icon-wrapper icon-money">
3232
<svg-icon icon-class="money" class-name="card-panel-icon" />
3333
</div>
@@ -40,7 +40,7 @@
4040
</div>
4141
</el-col>
4242
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
43-
<div class="card-panel" @click="handleSetLineChartData('shoppings')">
43+
<div class="card-panel">
4444
<div class="card-panel-icon-wrapper icon-shopping">
4545
<svg-icon icon-class="shopping" class-name="card-panel-icon" />
4646
</div>
@@ -69,11 +69,6 @@ export default {
6969
return {}
7070
}
7171
}
72-
},
73-
methods: {
74-
handleSetLineChartData(type) {
75-
this.$emit('handleSetLineChartData', type)
76-
}
7772
}
7873
}
7974
</script>

‎CrazyCarBackground/src/views/dashboard/index.vue

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<template>
22
<div class="dashboard-editor-container">
3-
<panel-group :panel-info-data="panelInfoData" @handleSetLineChartData="handleGetDashboardData" />
3+
<panel-group :panel-info-data="panelInfoData" />
44
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
5-
<line-chart :chart-data="lineChartData" />
5+
<line-chart :chart-data="loginUserChartData" />
66
</el-row>
77

88
<el-row :gutter="32">
99
<el-col :xs="24" :sm="24" :lg="8">
1010
<div class="chart-wrapper">
11-
<line-chart :chart-data="lineChartData" />
11+
<line-chart :chart-data="timeTrialChartData" />
1212
</div>
1313
</el-col>
1414
<el-col :xs="24" :sm="24" :lg="8">
1515
<div class="chart-wrapper">
16-
<line-chart :chart-data="lineChartData" />
16+
<line-chart :chart-data="matchChartData" />
1717
</div>
1818
</el-col>
1919
<el-col :xs="24" :sm="24" :lg="8">
@@ -40,7 +40,9 @@ export default {
4040
},
4141
data() {
4242
return {
43-
lineChartData: { name: 'login user num', data: [1, 2, 3, 4, 5, 6, 7], actualData: [0, 0, 0, 0, 0, 0, 0] },
43+
loginUserChartData: null,
44+
timeTrialChartData: null,
45+
matchChartData: null,
4446
panelInfoData: [0, 0, 0, 0]
4547
}
4648
},
@@ -60,17 +62,38 @@ export default {
6062
this.panelInfoData = panelInfoData
6163
// ---------login user num
6264
var login_user_num = response.login_user_num
63-
var date = []
64-
var actualData = []
65-
var x
66-
for (x in login_user_num) {
67-
var time = new Date(login_user_num[x].timestamp)
68-
date.push(time.getMonth() + '.' + time.getDay())
69-
actualData.push(login_user_num[x].data)
65+
var login_user_date = []
66+
var login_user_actualData = []
67+
var login_user_x
68+
for (login_user_x in login_user_num) {
69+
var login_user_time = new Date(login_user_num[login_user_x].timestamp)
70+
login_user_date.push(login_user_time.getMonth() + '.' + login_user_time.getDay())
71+
login_user_actualData.push(login_user_num[login_user_x].data)
7072
}
71-
console.log('==+++++' + date)
72-
this.lineChartData = { name: '用户登录数', date: date, actualData: actualData }
73-
// ------------t----------
73+
this.loginUserChartData = { name: '用户登录数', date: login_user_date, actualData: login_user_actualData }
74+
// ---------
75+
var match_num = response.match_num
76+
var match_date = []
77+
var match_actualData = []
78+
var match_x
79+
for (match_x in match_num) {
80+
var match_time = new Date(match_num[match_x].timestamp)
81+
match_date.push(match_time.getMonth() + '.' + match_time.getDay())
82+
match_actualData.push(match_num[match_x].data)
83+
}
84+
this.timeTrialChartData = { name: '比赛使用次数', date: match_date, actualData: match_actualData }
85+
// ---------
86+
var time_trial_num = response.time_trial_num
87+
var time_trial_date = []
88+
var time_trial_actualData = []
89+
var time_trial_x
90+
for (time_trial_x in time_trial_num) {
91+
var time_trial_time = new Date(time_trial_num[time_trial_x].timestamp)
92+
time_trial_date.push(time_trial_time.getMonth() + '.' + time_trial_time.getDay())
93+
time_trial_actualData.push(time_trial_num[time_trial_x].data)
94+
}
95+
this.matchChartData = { name: '计时赛使用次数', date: time_trial_date, actualData: time_trial_actualData }
96+
// ----------------------
7497
})
7598
},
7699
handleUpdate() {

0 commit comments

Comments
 (0)