From 27da9c50cab185e4b798011bc58002272b784118 Mon Sep 17 00:00:00 2001 From: tensent Date: Sat, 15 Aug 2020 21:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/admin/Form.php | 13 ++--- app/controller/admin/Hcloud.php | 72 ------------------------- app/http/middleware/Admin.php | 18 ++++++- app/model/Company.php | 22 -------- app/model/CompanyApt.php | 19 ------- public/static/admin/js/module/form.js | 9 ++-- view/admin/form/lists.html | 2 +- view/admin/hcloud/index.html | 75 --------------------------- 8 files changed, 27 insertions(+), 203 deletions(-) delete mode 100644 app/controller/admin/Hcloud.php delete mode 100644 app/model/Company.php delete mode 100644 app/model/CompanyApt.php delete mode 100644 view/admin/hcloud/index.html diff --git a/app/controller/admin/Form.php b/app/controller/admin/Form.php index 4c5e81d6..3b0266fc 100644 --- a/app/controller/admin/Form.php +++ b/app/controller/admin/Form.php @@ -150,20 +150,15 @@ class Form extends Base { public function outxls($form_id = '') { $form = $this->model->where('id', $form_id)->find(); - $attr = $this->Fattr->where('form_id', $form_id)->where('is_show', 1)->select(); + $attr = FormAttr::where('form_id', $form_id)->where('is_show', 1)->select(); foreach ($attr as $key => $value) { $title[$value['name']] = $value['title']; } - $data[] = $title; - $res = M($form['name'], 'form')->order('id desc')->select(); + $data = $list = $this->model->order('id desc')->select(); - foreach ($res as $key => $value) { - $data[] = $value; - } - - $out = new \com\Outxls($data, date('Y-m-d')); - $out->out(); + $this->data['data'] = $data; + return $this->data; } /** diff --git a/app/controller/admin/Hcloud.php b/app/controller/admin/Hcloud.php deleted file mode 100644 index 96cd3e21..00000000 --- a/app/controller/admin/Hcloud.php +++ /dev/null @@ -1,72 +0,0 @@ - -// +---------------------------------------------------------------------- -namespace app\controller\admin; - -use QL\QueryList; -use app\model\Company; - -/** - * @title 住建管理 - * @description 住建管理 - */ -class Hcloud extends Base { - - /** - * @title 住建列表 - */ - public function index(){ - $map = array(); - - $order = "compId desc"; - $list = Company::with(['apt'])->where($map)->order($order)->paginate($this->request->pageConfig); - - $this->data = array( - 'list' => $list, - 'page' => $list->render(), - ); - return $this->fetch(); - } - - public function get_comp_date(){ - $param = $this->request->param(); - // $param['qyType'] = 'QY_TYPE_0001'; - - $client = new \GuzzleHttp\Client(); - $res = $client->request('post', 'http://zjy.jxjst.gov.cn/w/dataQuery/getCompDate', ['form_params' => $param])->getBody()->getContents(); - $list = json_decode($res, true); - $data = []; - foreach($list['rows'] as $key => $val){ - // $apt = $client->request('get', 'http://zjy.jxjst.gov.cn/w/cms/qy/getQyAptListData/'.$val['qyCompId'])->getBody()->getContents(); - // $apt_list = json_decode($apt, true); - $detail = QueryList::get('http://zjy.jxjst.gov.cn/w/dataQuery/compDetailInfo/'.$val['qyCompId']); - $val['registerDate'] = $detail->find('.introduce-body:eq(0) table.daBg tr:eq(2) td:eq(1)')->text(); - $val['registerGov'] = $detail->find('.introduce-body:eq(0) table.daBg tr:eq(3) td:eq(3)')->text(); - $val['businessScope'] = $detail->find('.introduce-body:eq(0) table.daBg tr:eq(7) td:eq(1)')->text(); - $val['safetyCode'] = $detail->find('.introduce-body:eq(1) table.daBg tr:eq(0) td:eq(1)')->text(); - $val['safetyBdate'] = $detail->find('.introduce-body:eq(1) table.daBg tr:eq(1) td:eq(1)')->text(); - $val['safetyEdate'] = $detail->find('.introduce-body:eq(1) table.daBg tr:eq(2) td:eq(1)')->text(); - $val['safetyContent'] = $detail->find('.introduce-body:eq(1) table.daBg tr:eq(1) td:eq(3)')->text(); - $val['safetyGov'] = $detail->find('.introduce-body:eq(1) table.daBg tr:eq(2) td:eq(3)')->text(); - // $val['apt'] = $apt_list; - Company::create($val, [], true); - // if(count($apt_list['rows']) > 0){ - // foreach($apt_list['rows'] as $k => $v){ - // } - // } - // $list['rows'][$key] = $val; - // $data[] = $val; - } - // dump($list); - // (new Company())->saveAll($data, true); - } - - public function list_ba_pubic(){ - - } -} \ No newline at end of file diff --git a/app/http/middleware/Admin.php b/app/http/middleware/Admin.php index 3c650896..5e547e0a 100755 --- a/app/http/middleware/Admin.php +++ b/app/http/middleware/Admin.php @@ -16,6 +16,8 @@ use think\facade\Session; */ class Admin { + public $data = []; + public function handle($request, \Closure $next) { $request->rootUid = env('rootuid'); $request->user = Session::get('adminInfo'); @@ -29,6 +31,20 @@ class Admin { MemberLog::record($request); $response = $next($request); - return $response; + if (is_array($response->getData())) { + $this->data = array_merge($this->data, $response->getData()); + } else { + $this->data = $response->getData(); + } + + if ($request->isAjax()) { + return json($this->data); + } else { + if (\is_string($this->data) && $this->data != '') { + return $response; + } else { + return json($this->data); + } + } } } \ No newline at end of file diff --git a/app/model/Company.php b/app/model/Company.php deleted file mode 100644 index 1a8471fe..00000000 --- a/app/model/Company.php +++ /dev/null @@ -1,22 +0,0 @@ - -// +---------------------------------------------------------------------- - -namespace app\model; - -/** - * Company模型 - */ -class Company extends \think\Model{ - protected $auto = array('update_time'); - protected $insert = array('create_time'); - - public function apt(){ - return $this->hasMany('CompanyApt', 'compId', 'compId'); - } -} \ No newline at end of file diff --git a/app/model/CompanyApt.php b/app/model/CompanyApt.php deleted file mode 100644 index cc969a26..00000000 --- a/app/model/CompanyApt.php +++ /dev/null @@ -1,19 +0,0 @@ - -// +---------------------------------------------------------------------- - -namespace app\model; - -/** - * Company模型 - */ -class CompanyApt extends \think\Model{ - protected $auto = array('update_time'); - protected $insert = array('create_time'); - -} \ No newline at end of file diff --git a/public/static/admin/js/module/form.js b/public/static/admin/js/module/form.js index a225e72e..a87812a3 100644 --- a/public/static/admin/js/module/form.js +++ b/public/static/admin/js/module/form.js @@ -8,11 +8,12 @@ define(['jquery', 'sent', 'form', 'xlsxs'], function($, sent, form, xlsxs){ $('.btn-out').click(function(e){ e.preventDefault(); var url = $(this).attr('href'); - formModule.outXlsx(url) + var filename = $(this).data('name'); + formModule.outXlsx(url, 1, filename) }) } }, - outXlsx: function (url, page = 1){ + outXlsx: function (url, page = 1, filename){ var data = $('form').serialize(); var pagesize = $('select.pagesize').val() || 30; data = data + '&out=1&pagesize='+pagesize+'&page='+page @@ -29,9 +30,9 @@ define(['jquery', 'sent', 'form', 'xlsxs'], function($, sent, form, xlsxs){ success:function(res){ outList = outList.concat(res.data); if (res.last_page > page) { - formModule.outXlsx(url, page+1) + formModule.outXlsx(url, page+1, filename) }else{ - xlsxs.downloadExl(outList,res.file_name); + xlsxs.downloadExl(outList,filename); sent.msg('导出完成！'); setTimeout(function(){}, 3000); } diff --git a/view/admin/form/lists.html b/view/admin/form/lists.html index 21891ddb..acaf1aec 100644 --- a/view/admin/form/lists.html +++ b/view/admin/form/lists.html @@ -4,7 +4,7 @@

{$meta_title}

- 导出 + 导出
diff --git a/view/admin/hcloud/index.html b/view/admin/hcloud/index.html deleted file mode 100644 index c6c8798c..00000000 --- a/view/admin/hcloud/index.html +++ /dev/null @@ -1,75 +0,0 @@ -{extend name="admin/public/base"/} -{block name="body"} -
-
-

{$meta_title}

-
- -
-
-
-
- - - - - - - - - - - - - - - - - {volist name="list" id="item"} - {if count($item['apt']) > 0} - - - - - - - - - - - - - {volist name="item['apt']" id="vo" key="j"} - {if $j > 1} - - - - - - - - {/if} - {/volist} - {else/} - - - - - - - - - - - - - {/if} - {/volist} - -
公司名称公司法人注册地址证书编号安全许可到期时间资质项名称证书编号发证日期证书有效期发证机关
{$item['compName']}{$item['compCeoName']}{$item['compRegAddr']}{$item['safetyCode']}{$item['safetyEdate']}{$item['apt'][0]['aptCasename']}{$item['apt'][0]['certPrintNo']}{$item['apt'][0]['validBdate']}{$item['apt'][0]['validEdate']}{$item['apt'][0]['issueUnitName']}
{$vo['aptCasename']}{$vo['certPrintNo']}{$vo['validBdate']}{$vo['validEdate']}{$vo['issueUnitName']}
{$item['compName']}{$item['compCeoName']}{$item['compRegAddr']}{$item['safetyCode']}{$item['safetyEdate']}
- {$page|raw} -
-
-
-{/block} \ No newline at end of file