admins: modify

dev_aliyun_beta
p31729568 6 years ago
parent a8f0dde38a
commit 063733ec21

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

@ -13,7 +13,8 @@ class Admins::DashboardsController < Admins::BaseController
data = [
{ value: count['teacher'].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)
@ -23,7 +24,7 @@ class Admins::DashboardsController < Admins::BaseController
names = []
data = []
7.times do |i|
1.upto(7) do |i|
date = i.days.ago
names.unshift(date.strftime('%Y-%m-%d'))

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

File diff suppressed because one or more lines are too long

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

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