|
@@ -743,8 +743,8 @@ class Admin extends Backend
|
|
|
$this->model = new \app\admin\model\department\AuthAdmin();
|
|
|
$table = $this->model->getQuery()->getTable();
|
|
|
|
|
|
- $fieldArr['学号'] = 'username';
|
|
|
- $fieldArr['姓名'] = 'nickname';
|
|
|
+ $fieldArr['学员账号'] = 'username';
|
|
|
+ $fieldArr['学员姓名'] = 'nickname';
|
|
|
$fieldArr['层次'] = 'cengci';
|
|
|
$fieldArr['专业'] = 'zhuanye';
|
|
|
$fieldArr['年级'] = 'nianji';
|
|
@@ -918,6 +918,7 @@ class Admin extends Backend
|
|
|
public function export(){
|
|
|
|
|
|
$this->model = new \app\admin\model\department\AuthAdmin();
|
|
|
+ $department_id = $this->request->request("department_id");
|
|
|
$filter = $this->request->get("filter", '');
|
|
|
$filter = (array)json_decode($filter, true);
|
|
|
$filter_w = [];
|
|
@@ -980,8 +981,8 @@ class Admin extends Backend
|
|
|
$worksheet->setTitle('学员信息');
|
|
|
|
|
|
$worksheet->setCellValue('A1',"序号");
|
|
|
- $worksheet->setCellValue('B1',"学号");
|
|
|
- $worksheet->setCellValue('C1',"姓名");
|
|
|
+ $worksheet->setCellValue('B1',"学员账号");
|
|
|
+ $worksheet->setCellValue('C1',"学员姓名");
|
|
|
$worksheet->setCellValue('D1',"区队");
|
|
|
|
|
|
|