m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

admins: modify

Browse Source
dev_aliyun_beta
p31729568 6 years ago
parent a8f0dde38a
commit 063733ec21
8 changed files with 90 additions and 89 deletions
Show Stats Download Patch File Download Diff File

52
app/assets/javascripts/admins/dashboards/index.js
Unescape View File

@ -36,31 +36,31 @@ $(document).on('turbolinks:load', function() {
// 近七天评测次数 // 近七天评测次数
var evaluateChart = echarts.init(document.getElementById('evaluate-pie')); // var evaluateChart = echarts.init(document.getElementById('evaluate-pie'));
evaluateChart.setOption({ // evaluateChart.setOption({
tooltip: { // tooltip: {
show: "true", // show: "true",
trigger: 'item', // trigger: 'item',
formatter: '{c0}', // formatter: '{c0}',
backgroundColor: 'rgba(0,0,0,0.7)', // 背景 // backgroundColor: 'rgba(0,0,0,0.7)', // 背景
padding: [8, 10], //内边距 // padding: [8, 10], //内边距
extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影 // extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影
axisPointer: { // 坐标轴指示器，坐标轴触发有效 // axisPointer: { // 坐标轴指示器，坐标轴触发有效
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow' // type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
} // }
}, // },
xAxis: { type: 'category', boundaryGap: false, data: [] }, // xAxis: { type: 'category', boundaryGap: false, data: [] },
yAxis: { type: 'value' }, // yAxis: { type: 'value' },
series: [{ data: [], type: 'line', areaStyle: {} }] // series: [{ data: [], type: 'line', areaStyle: {} }]
}); // });
evaluateChart.showLoading(); // evaluateChart.showLoading();
$.get('/admins/dashboards/evaluate.json').done(function(data){ // $.get('/admins/dashboards/evaluate.json').done(function(data){
evaluateChart.setOption({ // evaluateChart.setOption({
xAxis: { data: data.names }, // xAxis: { data: data.names },
series: [{ data: data.data }] // series: [{ data: data.data }]
}); // });
//
evaluateChart.hideLoading(); // evaluateChart.hideLoading();
}); // });
} }
}); });

5
app/controllers/admins/dashboards_controller.rb
Unescape View File

@ -13,7 +13,8 @@ class Admins::DashboardsController < Admins::BaseController
data = [ data = [
{ value: count['teacher'].to_i, name: '老师' }, { value: count['teacher'].to_i, name: '老师' },
{ value: count['student'].to_i, name: '学生' }, { value: count['student'].to_i, name: '学生' },
{ value: count['professional'].to_i, name: '专业人士' } { value: count['professional'].to_i, name: '专业人士' },
{ value: count[nil].to_i, name: '未选职业' },
] ]
render_ok(data: data) render_ok(data: data)
@ -23,7 +24,7 @@ class Admins::DashboardsController < Admins::BaseController
names = [] names = []
data = [] data = []
7.times do |i| 1.upto(7) do |i|
date = i.days.ago date = i.days.ago
names.unshift(date.strftime('%Y-%m-%d')) names.unshift(date.strftime('%Y-%m-%d'))

16
app/views/admins/dashboards/index.html.erb
Unescape View File

@ -100,14 +100,14 @@
<div class="row mt-5"> <div class="row mt-5">
<div class="col-xl-8 mb-5 mb-xl-0"> <div class="col-xl-8 mb-5 mb-xl-0">
<div class="card shadow"> <div class="card shadow">
<div class="card-header border-0"> <!-- <div class="card-header border-0">-->
<div class="row align-items-center"> <!-- <div class="row align-items-center">-->
<h5 class="mb-0">近7天评测次数</h5> <!-- <h5 class="mb-0">近7天评测次数</h5>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="table-responsive"> <!-- <div class="table-responsive">-->
<div id="evaluate-pie" class="pie"></div> <!-- <div id="evaluate-pie" class="pie"></div>-->
</div> <!-- </div>-->
</div> </div>
</div> </div>

2
public/assets/.sprockets-manifest-424a487a0507c47673278ed11b25973d.json
View File

File diff suppressed because one or more lines are too long

52
public/assets/admin-045bf9befb0218c582a03d2296dd309dce1c1cb24638d9ff53f27c6b5d7adf0d.js → public/assets/admin-f3b6787762e1ba5296a221b1d436e5744314e1a968bb02186e808705265b8ab1.js
Unescape View File

@ -127977,32 +127977,32 @@ $(document).on('turbolinks:load', function() {
// 近七天评测次数 // 近七天评测次数
var evaluateChart = echarts.init(document.getElementById('evaluate-pie')); // var evaluateChart = echarts.init(document.getElementById('evaluate-pie'));
evaluateChart.setOption({ // evaluateChart.setOption({
tooltip: { // tooltip: {
show: "true", // show: "true",
trigger: 'item', // trigger: 'item',
formatter: '{c0}', // formatter: '{c0}',
backgroundColor: 'rgba(0,0,0,0.7)', // 背景 // backgroundColor: 'rgba(0,0,0,0.7)', // 背景
padding: [8, 10], //内边距 // padding: [8, 10], //内边距
extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影 // extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影
axisPointer: { // 坐标轴指示器，坐标轴触发有效 // axisPointer: { // 坐标轴指示器，坐标轴触发有效
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow' // type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
} // }
}, // },
xAxis: { type: 'category', boundaryGap: false, data: [] }, // xAxis: { type: 'category', boundaryGap: false, data: [] },
yAxis: { type: 'value' }, // yAxis: { type: 'value' },
series: [{ data: [], type: 'line', areaStyle: {} }] // series: [{ data: [], type: 'line', areaStyle: {} }]
}); // });
evaluateChart.showLoading(); // evaluateChart.showLoading();
$.get('/admins/dashboards/evaluate.json').done(function(data){ // $.get('/admins/dashboards/evaluate.json').done(function(data){
evaluateChart.setOption({ // evaluateChart.setOption({
xAxis: { data: data.names }, // xAxis: { data: data.names },
series: [{ data: data.data }] // series: [{ data: data.data }]
}); // });
//
evaluateChart.hideLoading(); // evaluateChart.hideLoading();
}); // });
} }
}); });
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {

BIN
public/assets/admin-045bf9befb0218c582a03d2296dd309dce1c1cb24638d9ff53f27c6b5d7adf0d.js.gz → public/assets/admin-f3b6787762e1ba5296a221b1d436e5744314e1a968bb02186e808705265b8ab1.js.gz
View File

Binary file not shown.

52
public/assets/application-b09714b6e37c0d4d2904d5b759d73143cd54485bbf853df634c59df5b563cf4b.js → public/assets/application-094c8a75bd3cb43770dc3576e7b0d7a7b026b70869bac1a5da816cb3dfe63de3.js
Unescape View File

@ -127977,32 +127977,32 @@ $(document).on('turbolinks:load', function() {
// 近七天评测次数 // 近七天评测次数
var evaluateChart = echarts.init(document.getElementById('evaluate-pie')); // var evaluateChart = echarts.init(document.getElementById('evaluate-pie'));
evaluateChart.setOption({ // evaluateChart.setOption({
tooltip: { // tooltip: {
show: "true", // show: "true",
trigger: 'item', // trigger: 'item',
formatter: '{c0}', // formatter: '{c0}',
backgroundColor: 'rgba(0,0,0,0.7)', // 背景 // backgroundColor: 'rgba(0,0,0,0.7)', // 背景
padding: [8, 10], //内边距 // padding: [8, 10], //内边距
extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影 // extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影
axisPointer: { // 坐标轴指示器，坐标轴触发有效 // axisPointer: { // 坐标轴指示器，坐标轴触发有效
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow' // type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
} // }
}, // },
xAxis: { type: 'category', boundaryGap: false, data: [] }, // xAxis: { type: 'category', boundaryGap: false, data: [] },
yAxis: { type: 'value' }, // yAxis: { type: 'value' },
series: [{ data: [], type: 'line', areaStyle: {} }] // series: [{ data: [], type: 'line', areaStyle: {} }]
}); // });
evaluateChart.showLoading(); // evaluateChart.showLoading();
$.get('/admins/dashboards/evaluate.json').done(function(data){ // $.get('/admins/dashboards/evaluate.json').done(function(data){
evaluateChart.setOption({ // evaluateChart.setOption({
xAxis: { data: data.names }, // xAxis: { data: data.names },
series: [{ data: data.data }] // series: [{ data: data.data }]
}); // });
//
evaluateChart.hideLoading(); // evaluateChart.hideLoading();
}); // });
} }
}); });
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {

BIN
public/assets/application-b09714b6e37c0d4d2904d5b759d73143cd54485bbf853df634c59df5b563cf4b.js.gz → public/assets/application-094c8a75bd3cb43770dc3576e7b0d7a7b026b70869bac1a5da816cb3dfe63de3.js.gz
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save