cmz
/
HNWelcomeSystemAdminDcat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

数据概览图表新增tooltip显示、教师模块新增开户人过滤条件

master
崔茂正 10 months ago
parent
d654d3fce6
commit
7af537d3ed
5 changed files with 216 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      app/Admin/Controllers/TeacherScanCodeUserController.php
  2. 53
      app/Admin/Metrics/Chart/ColumnCharts.php
  3. 52
      app/Admin/Metrics/Chart/FemaleColumnCharts.php
  4. 83
      app/Admin/Metrics/Chart/FullPaymentRateColumnCharts.php
  5. 53
      app/Admin/Metrics/Chart/MaleColumnCharts.php

7
app/Admin/Controllers/TeacherScanCodeUserController.php
Unescape View File

@ -23,6 +23,9 @@ class TeacherScanCodeUserController extends AdminController @@ -23,6 +23,9 @@ class TeacherScanCodeUserController extends AdminController
// 开启字段选择器功能
$grid->showColumnSelector();
$list = TeacherScanCodeUsers::where('is_authority', TeacherScanCodeUsers::IS_AUTHORITY_YES)
->pluck('name', 'id')->toArray();
$grid->column('id')->sortable();
$grid->column('name');
$grid->column('mobile');
@ -41,6 +44,7 @@ class TeacherScanCodeUserController extends AdminController @@ -41,6 +44,7 @@ class TeacherScanCodeUserController extends AdminController
});
$grid->column('open_number_id')->display(function () {
$open_number_id = $this->open_number_id;
if (!empty($open_number_id)) {
if ($open_number_id == $this->id) {
@ -53,8 +57,9 @@ class TeacherScanCodeUserController extends AdminController @@ -53,8 +57,9 @@ class TeacherScanCodeUserController extends AdminController
return $name->name;
}
}
return "超级管理员";
});
})->filter(Grid\Column\Filter\In::make($list));
$grid->column('status')->select([1=>"正常", 2=>"禁用"]);
$grid->column('create_time')->display(function (){
if(!empty($this->create_time)){

53
app/Admin/Metrics/Chart/ColumnCharts.php
Unescape View File

@ -8,6 +8,7 @@ use App\Models\OfflineStep; @@ -8,6 +8,7 @@ use App\Models\OfflineStep;
use App\Models\SecondaryCollege;
use App\Models\Speciality;
use App\Models\UsersMember;
use Dcat\Admin\Support\JavaScript;
use Dcat\Admin\Widgets\ApexCharts\Chart;
class ColumnCharts extends Chart
@ -33,6 +34,18 @@ class ColumnCharts extends Chart @@ -33,6 +34,18 @@ class ColumnCharts extends Chart
$data = [[
"name" => "报到率",
"data" => [],
"tooltip" => [
[
"name" => "已报到人数",
"data" => [],
"color" => '#ff6b6b'
],
[
"name" => "录入人数",
"data" => [],
"color"=>"#a21919"
]
],
]];
$label = [];
@ -85,6 +98,8 @@ class ColumnCharts extends Chart @@ -85,6 +98,8 @@ class ColumnCharts extends Chart
}
$list[$key]["registering"] = $registering;
$list[$key]["studentsNum"] = $completedOfflineStep;
$list[$key]["completedOfflineStep"] = count($importStudents);
}
}
}
@ -94,8 +109,12 @@ class ColumnCharts extends Chart @@ -94,8 +109,12 @@ class ColumnCharts extends Chart
array_push($label, $item["name"]);
if(!empty($item["registering"])){
array_push($data[0]["data"], $item["registering"]);
array_push($data[0]['tooltip'][0]['data'], $item["studentsNum"]);
array_push($data[0]['tooltip'][1]['data'], $item["completedOfflineStep"]);
}else{
array_push($data[0]["data"], 0);
array_push($data[0]['tooltip'][0]['data'], 0);
array_push($data[0]['tooltip'][1]['data'], 0);
}
}
}
@ -105,5 +124,39 @@ class ColumnCharts extends Chart @@ -105,5 +124,39 @@ class ColumnCharts extends Chart
$this->option("labels",$label);
$this->option("yaxis",["max" => 100]); //Y轴最大值
$tooltipCustomFunction = <<<JS
function({ series, seriesIndex, dataPointIndex, w }) {
let newStr = "";
w.config.series[0].tooltip.forEach(item=>{
newStr += `<div style="display: flex;padding: 0 10px;align-items: center;margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: \${item.color};margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${item.name}: \${item.data[dataPointIndex]}
</div>
</div>`
})
return `
<div style=' border: 1px solid #e3e3e3; background: rgba(255, 255, 255, 0.96); border-radius: 5px; box-shadow: 2px 2px 6px -4px #999; font-size: 14px;'>
<div style='padding:6px;background: #ECEFF1;border-bottom: 1px solid #ddd;font-size:12px;'>\${w.config.labels[dataPointIndex]}</div>
<div style="display: flex;padding: 0 10px;align-items: center; margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: rgb(0, 143, 251);margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${w.config.series[0].name}: \${w.config.series[0].data[dataPointIndex]}
</div>
</div>
\${newStr}
</div>
`;
}
JS;
$this->option('tooltip.custom', JavaScript::make($tooltipCustomFunction));
}
}

52
app/Admin/Metrics/Chart/FemaleColumnCharts.php
Unescape View File

@ -9,6 +9,7 @@ use App\Models\PaymentList; @@ -9,6 +9,7 @@ use App\Models\PaymentList;
use App\Models\SecondaryCollege;
use App\Models\Speciality;
use App\Models\UsersMember;
use Dcat\Admin\Support\JavaScript;
use Dcat\Admin\Widgets\ApexCharts\Chart;
use Illuminate\Support\Facades\DB;
@ -36,6 +37,18 @@ class FemaleColumnCharts extends Chart @@ -36,6 +37,18 @@ class FemaleColumnCharts extends Chart
$data = [[
"name" => "报道率",
"data" => [],
"tooltip" => [
[
"name" => "已报到女生",
"data" => [],
"color" => '#ff6b6b'
],
[
"name" => "录入女生",
"data" => [],
"color"=>"#a21919"
]
],
]];
$label = [];
@ -93,6 +106,8 @@ class FemaleColumnCharts extends Chart @@ -93,6 +106,8 @@ class FemaleColumnCharts extends Chart
}
$list[$key]["registering"] = $registering;
$list[$key]["studentsNum"] = $completedOfflineStep;
$list[$key]["completedOfflineStep"] = $studentsNum;
}
}
}
@ -102,8 +117,12 @@ class FemaleColumnCharts extends Chart @@ -102,8 +117,12 @@ class FemaleColumnCharts extends Chart
array_push($label, $item["name"]);
if(!empty($item["registering"])){
array_push($data[0]["data"], $item["registering"]);
array_push($data[0]['tooltip'][0]['data'], $item["studentsNum"]);
array_push($data[0]['tooltip'][1]['data'], $item["completedOfflineStep"]);
}else{
array_push($data[0]["data"], 0);
array_push($data[0]['tooltip'][0]['data'], 0);
array_push($data[0]['tooltip'][1]['data'], 0);
}
}
}
@ -113,5 +132,38 @@ class FemaleColumnCharts extends Chart @@ -113,5 +132,38 @@ class FemaleColumnCharts extends Chart
$this->option("labels",$label);
$this->option("yaxis",["max" => 100]); //Y轴最大值
$tooltipCustomFunction = <<<JS
function({ series, seriesIndex, dataPointIndex, w }) {
let newStr = "";
w.config.series[0].tooltip.forEach(item=>{
newStr += `<div style="display: flex;padding: 0 10px;align-items: center;margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: \${item.color};margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${item.name}: \${item.data[dataPointIndex]}
</div>
</div>`
})
return `
<div style=' border: 1px solid #e3e3e3; background: rgba(255, 255, 255, 0.96); border-radius: 5px; box-shadow: 2px 2px 6px -4px #999; font-size: 14px;'>
<div style='padding:6px;background: #ECEFF1;border-bottom: 1px solid #ddd;font-size:12px;'>\${w.config.labels[dataPointIndex]}</div>
<div style="display: flex;padding: 0 10px;align-items: center; margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: rgb(0, 143, 251);margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${w.config.series[0].name}: \${w.config.series[0].data[dataPointIndex]}
</div>
</div>
\${newStr}
</div>
`;
}
JS;
$this->option('tooltip.custom', JavaScript::make($tooltipCustomFunction));
}
}

83
app/Admin/Metrics/Chart/FullPaymentRateColumnCharts.php
Unescape View File

@ -40,6 +40,18 @@ class FullPaymentRateColumnCharts extends Chart @@ -40,6 +40,18 @@ class FullPaymentRateColumnCharts extends Chart
[
"name" => "缴费率",
"data" => [],
"tooltip" => [
[
"name" => "全额缴费人数",
"data" => [],
"color" => '#ff6b6b'
],
[
"name" => "缴费人数",
"data" => [],
"color"=>"#a21919"
]
],
]
];
$label = [];
@ -81,11 +93,6 @@ class FullPaymentRateColumnCharts extends Chart @@ -81,11 +93,6 @@ class FullPaymentRateColumnCharts extends Chart
if(!empty($userList)){
$userList = array_column($userList, "unique_number");
//线下迎新有几步
/*$stepCount = OfflineStep::query()->where("status", OfflineStep::STATUS_YES)->count();
//检测是否存在线下报到步骤，存在则视为已到校(实际报到学生)
$completedOfflineStep = CompletedOfflineStep::query()->whereIn("unique_number", $userList)->where("annual_session", $config->data)->where("step_id",">=",$stepCount)->count();*/
//已缴费人数
$payNum = Order::query()->whereIn("unique_number", $userList)->where([
"status" => Order::STATUS_PAID,
@ -113,17 +120,22 @@ class FullPaymentRateColumnCharts extends Chart @@ -113,17 +120,22 @@ class FullPaymentRateColumnCharts extends Chart
}
$list[$key]["registering"] = $registering;
$list[$key]["studentsNum"] = $studentsNum; //全额缴费人数
$list[$key]["completedOfflineStep"] = $completedOfflineStep; //已缴费人数
}
}
}
foreach($list as $item){
array_push($label, $item["name"]);
if(!empty($item["registering"])){
array_push($data[0]["data"], $item["registering"]);
array_push($data[0]['tooltip'][0]['data'], $item["studentsNum"]); //全额缴费人数
array_push($data[0]['tooltip'][1]['data'], $item["completedOfflineStep"]);//已缴费人数
}else{
array_push($data[0]["data"], 0);
array_push($data[0]['tooltip'][0]['data'], 0); //全额缴费人数
array_push($data[0]['tooltip'][1]['data'], 0);//已缴费人数
}
}
}
@ -133,31 +145,40 @@ class FullPaymentRateColumnCharts extends Chart @@ -133,31 +145,40 @@ class FullPaymentRateColumnCharts extends Chart
$this->option("labels",$label);
$this->option("yaxis",["max" => 100]); //Y轴最大值
$this->option(
'tooltip.custom',
JavaScript::make("function({ series, seriesIndex, dataPointIndex, w }) {
<div class=\"apexcharts-tooltip apexcharts-theme-light\" style=\"left: 392.603px; top: 29.6094px;\">
<div class=\"apexcharts-tooltip-title\" style=\"font-family: Helvetica, Arial, sans-serif; font-size: 12px;\">
信息工程学院</div>
<div class=\"apexcharts-tooltip-series-group apexcharts-active\" style=\"display: flex;\">
<span class=\"apexcharts-tooltip-marker\" style=\"background-color: rgb(0, 143, 251);\">
</span>
<div class=\"apexcharts-tooltip-text\" style=\"font-family: Helvetica, Arial, sans-serif; font-size: 12px;\">
<div class=\"apexcharts-tooltip-y-group\">
<span class=\"apexcharts-tooltip-text-label\">缴费率: </span>
<span class=\"apexcharts-tooltip-text-value\">87.65</span>
</div>
<div class=\"apexcharts-tooltip-z-group\">
<span class=\"apexcharts-tooltip-text-z-label\">
</span>
<span class=\"apexcharts-tooltip-text-z-value\">
</span>
</div>
</div>
</div>
</div>
}") // 这个值最后段代码会作为JS代码执行
);
$tooltipCustomFunction = <<<JS
function({ series, seriesIndex, dataPointIndex, w }) {
let newStr = "";
w.config.series[0].tooltip.forEach(item=>{
newStr += `<div style="display: flex;padding: 0 10px;align-items: center;margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: \${item.color};margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${item.name}: \${item.data[dataPointIndex]}
</div>
</div>`
})
return `
<div style=' border: 1px solid #e3e3e3; background: rgba(255, 255, 255, 0.96); border-radius: 5px; box-shadow: 2px 2px 6px -4px #999; font-size: 14px;'>
<div style='padding:6px;background: #ECEFF1;border-bottom: 1px solid #ddd;font-size:12px;'>\${w.config.labels[dataPointIndex]}</div>
<div style="display: flex;padding: 0 10px;align-items: center; margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: rgb(0, 143, 251);margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${w.config.series[0].name}: \${w.config.series[0].data[dataPointIndex]}
</div>
</div>
\${newStr}
</div>
`;
}
JS;
$this->option('tooltip.custom', JavaScript::make($tooltipCustomFunction));
}

53
app/Admin/Metrics/Chart/MaleColumnCharts.php
Unescape View File

@ -9,6 +9,7 @@ use App\Models\PaymentList; @@ -9,6 +9,7 @@ use App\Models\PaymentList;
use App\Models\SecondaryCollege;
use App\Models\Speciality;
use App\Models\UsersMember;
use Dcat\Admin\Support\JavaScript;
use Dcat\Admin\Widgets\ApexCharts\Chart;
use Illuminate\Support\Facades\DB;
@ -36,6 +37,18 @@ class MaleColumnCharts extends Chart @@ -36,6 +37,18 @@ class MaleColumnCharts extends Chart
$data = [[
"name" => "报道率",
"data" => [],
"tooltip" => [
[
"name" => "已报到男生",
"data" => [],
"color" => '#ff6b6b'
],
[
"name" => "录入男生",
"data" => [],
"color"=>"#a21919"
]
],
]];
$label = [];
@ -93,6 +106,8 @@ class MaleColumnCharts extends Chart @@ -93,6 +106,8 @@ class MaleColumnCharts extends Chart
}
$list[$key]["registering"] = $registering;
$list[$key]["studentsNum"] = $completedOfflineStep;
$list[$key]["completedOfflineStep"] = $studentsNum;
}
}
}
@ -102,8 +117,12 @@ class MaleColumnCharts extends Chart @@ -102,8 +117,12 @@ class MaleColumnCharts extends Chart
array_push($label, $item["name"]);
if(!empty($item["registering"])){
array_push($data[0]["data"], $item["registering"]);
array_push($data[0]['tooltip'][0]['data'], $item["studentsNum"]);
array_push($data[0]['tooltip'][1]['data'], $item["completedOfflineStep"]);
}else{
array_push($data[0]["data"], 0);
array_push($data[0]['tooltip'][0]['data'], 0);
array_push($data[0]['tooltip'][1]['data'], 0);
}
}
}
@ -113,5 +132,39 @@ class MaleColumnCharts extends Chart @@ -113,5 +132,39 @@ class MaleColumnCharts extends Chart
$this->option("labels",$label);
$this->option("yaxis",["max" => 100]); //Y轴最大值
$tooltipCustomFunction = <<<JS
function({ series, seriesIndex, dataPointIndex, w }) {
let newStr = "";
w.config.series[0].tooltip.forEach(item=>{
newStr += `<div style="display: flex;padding: 0 10px;align-items: center;margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: \${item.color};margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${item.name}: \${item.data[dataPointIndex]}
</div>
</div>`
})
return `
<div style=' border: 1px solid #e3e3e3; background: rgba(255, 255, 255, 0.96); border-radius: 5px; box-shadow: 2px 2px 6px -4px #999; font-size: 14px;'>
<div style='padding:6px;background: #ECEFF1;border-bottom: 1px solid #ddd;font-size:12px;'>\${w.config.labels[dataPointIndex]}</div>
<div style="display: flex;padding: 0 10px;align-items: center; margin-top: 8px;">
<div style="width:12px;height:12px;border-radius:50%;background-color: rgb(0, 143, 251);margin-right: 10px;">
</div>
<div style="font-size: 12px;">
\${w.config.series[0].name}: \${w.config.series[0].data[dataPointIndex]}
</div>
</div>
\${newStr}
</div>
`;
}
JS;
$this->option('tooltip.custom', JavaScript::make($tooltipCustomFunction));
}
}

Write Preview
Loading…
Cancel
Save