开飞机的舒克 / Campus · 提交

转到一个项目

作者 开飞机的舒克
提交 2ccecd82bb03ed10ce6628a6511a9fc60f6d4a32 1 个父辈 6f299343

后台学生管理功能优化

内嵌 并排对比
正在显示 5 个修改的文件 包含 125 行增加 和 125 行删除
@@ -291,18 +291,18 @@ class Study extends Backend @@ -291,18 +291,18 @@ class Study extends Backend
291 } 291 }
292 } 292 }
293 293
294 - /**  
295 - * 下载条形码  
296 - */  
297 - public function down()  
298 - {  
299 - $id = input('id');  
300 - $this->success('');  
301 -// $res = \app\admin\model\Study::where('id', $id)->update(['down' => 1]);  
302 -// if ($res) {  
303 -// $this->success('');  
304 -// }  
305 - } 294 +// /**
  295 +// * 下载条形码
  296 +// */
  297 +// public function down()
  298 +// {
  299 +// $id = input('id');
  300 +// $this->success('');
  301 +//// $res = \app\admin\model\Study::where('id', $id)->update(['down' => 1]);
  302 +//// if ($res) {
  303 +//// $this->success('');
  304 +//// }
  305 +// }
306 306
307 307
308 /** 308 /**
@@ -398,58 +398,58 @@ class Study extends Backend @@ -398,58 +398,58 @@ class Study extends Backend
398 $this->success(); 398 $this->success();
399 } 399 }
400 400
401 - /**  
402 - * 下载分享码  
403 - */  
404 - public function multi($ids = null)  
405 - {  
406 - $ids = $this->request->param('ids');  
407 - $study = new \app\admin\model\Study();  
408 - $ids = explode(',', $ids);  
409 - $arr = $study->whereIn('id' , $ids)->field('barcode')->select();  
410 - foreach ($arr as $v){  
411 - //$v['barcode'] = substr($v['barcode'],20);  
412 - $as = ROOT_PATH.'public/'.$v['barcode'];  
413 - $data[]=$as;  
414 - }  
415 - $url = ROOT_PATH.'public/';  
416 - // $data = [  
417 - // ROOT_PATH.'public/uploads/QR/20230301/_18.jpg'  
418 - // ];  
419 - // zip 临时文件  
420 - $tmp_dir = $url . 'temp/';  
421 - // zip名称  
422 - $zip_name = 'images'.'.zip';  
423 - // 打包  
424 - $zipName = $this->zip_files($data, $tmp_dir.$zip_name);  
425 - //下载  
426 - $down = 'http://campus.shs.broing.cn/temp/'.$zip_name;  
427 - downloads($down);  
428 - }  
429 -  
430 - /**  
431 - * 打包成zip  
432 - * @param $pathArr  
433 - * @param $zipName  
434 - * @return array  
435 - */  
436 - public function zip_files($pathArr,$zipName)  
437 - {  
438 -  
439 - $zip = new \ZipArchive();  
440 - if($zip->open($zipName,\ZipArchive::CREATE|\ZipArchive::OVERWRITE)){  
441 - foreach($pathArr as $file){  
442 - if(!file_exists($file)){  
443 - continue;  
444 - }  
445 - $zip->addFile($file,basename($file)); //向压缩包中添加文件  
446 - }  
447 - $zip->close();  
448 - return $zipName;  
449 - }else{  
450 - return '';  
451 - }  
452 - } 401 +// /**
  402 +// * 下载分享码
  403 +// */
  404 +// public function multi($ids = null)
  405 +// {
  406 +// $ids = $this->request->param('ids');
  407 +// $study = new \app\admin\model\Study();
  408 +// $ids = explode(',', $ids);
  409 +// $arr = $study->whereIn('id' , $ids)->field('barcode')->select();
  410 +// foreach ($arr as $v){
  411 +// //$v['barcode'] = substr($v['barcode'],20);
  412 +// $as = ROOT_PATH.'public/'.$v['barcode'];
  413 +// $data[]=$as;
  414 +// }
  415 +// $url = ROOT_PATH.'public/';
  416 +// // $data = [
  417 +// // ROOT_PATH.'public/uploads/QR/20230301/_18.jpg'
  418 +// // ];
  419 +// // zip 临时文件
  420 +// $tmp_dir = $url . 'temp/';
  421 +// // zip名称
  422 +// $zip_name = 'images'.'.zip';
  423 +// // 打包
  424 +// $zipName = $this->zip_files($data, $tmp_dir.$zip_name);
  425 +// //下载
  426 +// $down = 'http://campus.shs.broing.cn/temp/'.$zip_name;
  427 +// downloads($down);
  428 +// }
  429 +//
  430 +// /**
  431 +// * 打包成zip
  432 +// * @param $pathArr
  433 +// * @param $zipName
  434 +// * @return array
  435 +// */
  436 +// public function zip_files($pathArr,$zipName)
  437 +// {
  438 +//
  439 +// $zip = new \ZipArchive();
  440 +// if($zip->open($zipName,\ZipArchive::CREATE|\ZipArchive::OVERWRITE)){
  441 +// foreach($pathArr as $file){
  442 +// if(!file_exists($file)){
  443 +// continue;
  444 +// }
  445 +// $zip->addFile($file,basename($file)); //向压缩包中添加文件
  446 +// }
  447 +// $zip->close();
  448 +// return $zipName;
  449 +// }else{
  450 +// return '';
  451 +// }
  452 +// }
453 453
454 454
455 } 455 }
@@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> 9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('study/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> 10 <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('study/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
11 <!-- <a href="javascript:;" class="btn btn-success btn-import {:$auth->check('study/import')?'':'hide'}" title="导入" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> 导入</a>--> 11 <!-- <a href="javascript:;" class="btn btn-success btn-import {:$auth->check('study/import')?'':'hide'}" title="导入" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> 导入</a>-->
12 - <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('你的权限规则')?'':'hide'}" title="导入" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> 导入</a> 12 + <a href="javascript:;" class="btn btn-success btn-import {:$auth->check('你的权限规则')?'':'hide'}" title="导入" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> 导入</a>
13 <a href="javascript:;" class="btn btn-danger btn-export {:$auth->check('study/export')?'':'hide'}" title="{:__('Export')}" id="btn-export-file"><i class="fa fa-download"></i> {:__('Export')}</a> 13 <a href="javascript:;" class="btn btn-danger btn-export {:$auth->check('study/export')?'':'hide'}" title="{:__('Export')}" id="btn-export-file"><i class="fa fa-download"></i> {:__('Export')}</a>
14 - <a href="#" title="下载分享码" class="btn btn-success btn-disabled download {:$auth->check('study/multi')?'':'hide'} ">下载条形码</a> 14 +<!-- <a href="#" title="下载分享码" class="btn btn-success btn-disabled download {:$auth->check('study/multi')?'':'hide'} ">下载条形码</a>-->
15 15
16 <div class="dropdown btn-group {:$auth->check('study/multi')?'':'hide'}"> 16 <div class="dropdown btn-group {:$auth->check('study/multi')?'':'hide'}">
17 <ul class="dropdown-menu text-left" role="menu"> 17 <ul class="dropdown-menu text-left" role="menu">
@@ -20,26 +20,26 @@ class Crontab extends Api @@ -20,26 +20,26 @@ class Crontab extends Api
20 /** 20 /**
21 * @ApiTitle (定时任务) 21 * @ApiTitle (定时任务)
22 */ 22 */
23 - public function index()  
24 - {  
25 - //查询未生成的条形码  
26 - $id = db('study')->where('generate', 0)->limit(10)->column('id');  
27 - if (empty($id)) {  
28 - $this->error('不执行', ['status' => 0]);  
29 - }  
30 - foreach ($id as $k => $v) {  
31 - $res = str_pad($v, 8, "0", STR_PAD_LEFT);  
32 - $barpath = Resource::StudyBar($res);  
33 - db('study')  
34 - ->where('id', $v)  
35 - ->update([  
36 - 'barcode' => $barpath,  
37 - 'unique' => $res,  
38 - 'generate' => 1  
39 - ]);  
40 -  
41 - }  
42 - $this->success('执行成功', ['status' => 1]);  
43 -  
44 - } 23 +// public function index()
  24 +// {
  25 +// //查询未生成的条形码
  26 +// $id = db('study')->where('generate', 0)->limit(10)->column('id');
  27 +// if (empty($id)) {
  28 +// $this->error('不执行', ['status' => 0]);
  29 +// }
  30 +// foreach ($id as $k => $v) {
  31 +// $res = str_pad($v, 8, "0", STR_PAD_LEFT);
  32 +// $barpath = Resource::StudyBar($res);
  33 +// db('study')
  34 +// ->where('id', $v)
  35 +// ->update([
  36 +// 'barcode' => $barpath,
  37 +// 'unique' => $res,
  38 +// 'generate' => 1
  39 +// ]);
  40 +//
  41 +// }
  42 +// $this->success('执行成功', ['status' => 1]);
  43 +//
  44 +// }
45 } 45 }
@@ -9,10 +9,10 @@ class Resource @@ -9,10 +9,10 @@ class Resource
9 /** 9 /**
10 * 生成条形码 10 * 生成条形码
11 */ 11 */
12 - public static function StudyBar($res){  
13 - $generate = Generate::bar();  
14 - $file_path = $generate->create($res,true,true);  
15 - $file_path = substr($file_path,strripos($file_path,"public")+6);  
16 - return $file_path;  
17 - } 12 +// public static function StudyBar($res){
  13 +// $generate = Generate::bar();
  14 +// $file_path = $generate->create($res,true,true);
  15 +// $file_path = substr($file_path,strripos($file_path,"public")+6);
  16 +// return $file_path;
  17 +// }
18 } 18 }
@@ -101,41 +101,41 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -101,41 +101,41 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
101 // {field: 'team_id', title: __('Team_id')}, 101 // {field: 'team_id', title: __('Team_id')},
102 {field: 'earn_score', title: __('Earn_score'),operate:false}, 102 {field: 'earn_score', title: __('Earn_score'),operate:false},
103 {field: 'unique', title: __('Unique'), operate:false}, 103 {field: 'unique', title: __('Unique'), operate:false},
104 - {field: 'barcode_images', title: __('Barcode'),events: Table.api.events.image, formatter: Table.api.formatter.image, operate:false}, 104 + //{field: 'barcode_images', title: __('Barcode'),events: Table.api.events.image, formatter: Table.api.formatter.image, operate:false},
105 {field: 'rank', title: __('Rank'),operate: false}, 105 {field: 'rank', title: __('Rank'),operate: false},
106 // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 106 // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
107 // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 107 // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
108 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, 108 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
109 - buttons: [  
110 - {  
111 - name: 'click',  
112 - title: __('下载'),  
113 - text: __('下载'),  
114 - classname: 'btn btn-xs btn-info btn-click',  
115 - icon: 'fa fa-leaf',  
116 - // dropdown: '更多',//如果包含dropdown，将会以下拉列表的形式展示  
117 - click: function (e, data) {  
118 -  
119 - $.ajax({  
120 - type: 'get',  
121 - url: 'study/down',  
122 - data: {id: data.id},  
123 - success: function (res) {  
124 - if (res.code === 1) {  
125 - var domain = window.location.href.split(':')[0] + '://' + document.domain;  
126 - var url = domain + data.barcode;  
127 - var link = document.createElement('a');  
128 - link.setAttribute("download", data.name);  
129 - link.href = url;  
130 - link.click();  
131 - $(".btn-refresh").trigger("click");  
132 - }  
133 - }  
134 - });  
135 -  
136 - }  
137 - },  
138 - ], 109 + // buttons: [
  110 + // {
  111 + // name: 'click',
  112 + // title: __('下载'),
  113 + // text: __('下载'),
  114 + // classname: 'btn btn-xs btn-info btn-click',
  115 + // icon: 'fa fa-leaf',
  116 + // // dropdown: '更多',//如果包含dropdown，将会以下拉列表的形式展示
  117 + // click: function (e, data) {
  118 + //
  119 + // $.ajax({
  120 + // type: 'get',
  121 + // url: 'study/down',
  122 + // data: {id: data.id},
  123 + // success: function (res) {
  124 + // if (res.code === 1) {
  125 + // var domain = window.location.href.split(':')[0] + '://' + document.domain;
  126 + // var url = domain + data.barcode;
  127 + // var link = document.createElement('a');
  128 + // link.setAttribute("download", data.name);
  129 + // link.href = url;
  130 + // link.click();
  131 + // $(".btn-refresh").trigger("click");
  132 + // }
  133 + // }
  134 + // });
  135 + //
  136 + // }
  137 + // },
  138 + // ],
139 formatter: Table.api.formatter.operate} 139 formatter: Table.api.formatter.operate}
140 ] 140 ]
141 ] 141 ]