From f809051122882a5b58d5e633df17b950e6fe7bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com> Date: Sat, 11 Feb 2023 10:41:57 +0800 Subject: [PATCH] 11 --- app/admin/controller/nk/Village.php | 2 - app/admin/view/nk/street/edit.html | 2 +- app/admin/view/nk/village/add.html | 2 +- app/api/controller/Statistics.php | 174 +++++++++++++++++++++++++++- 4 files changed, 170 insertions(+), 10 deletions(-) diff --git a/app/admin/controller/nk/Village.php b/app/admin/controller/nk/Village.php index 22b0aa3..fdda87f 100644 --- a/app/admin/controller/nk/Village.php +++ b/app/admin/controller/nk/Village.php @@ -56,8 +56,6 @@ class Village extends BaseController }else{ $where[] = ['village_id','=','']; } - }else{ - $where = []; } $total = Db::table('fa_szxc_village') diff --git a/app/admin/view/nk/street/edit.html b/app/admin/view/nk/street/edit.html index 6d5a74d..d59c1e3 100644 --- a/app/admin/view/nk/street/edit.html +++ b/app/admin/view/nk/street/edit.html @@ -61,7 +61,7 @@ {if {:session('gougu_admin')['group_access']==1} {else /} diff --git a/app/admin/view/nk/village/add.html b/app/admin/view/nk/village/add.html index 8d93e3f..33e98ba 100644 --- a/app/admin/view/nk/village/add.html +++ b/app/admin/view/nk/village/add.html @@ -148,7 +148,7 @@ var demo1 = xmSelect.render({ name: 'street_id', el: '#demo1', - initValue: ["{$detail.street_id}"], + initValue: group_access == 2 ||group_access == 4? ["{$detail.street_id}"] : [], prop: { name: 'name', value: 'code', diff --git a/app/api/controller/Statistics.php b/app/api/controller/Statistics.php index 5433ac3..0ab15ef 100644 --- a/app/api/controller/Statistics.php +++ b/app/api/controller/Statistics.php @@ -742,12 +742,174 @@ class Statistics extends BaseController } $return = [ - ['name'=>'萝卜','minnum'=>'661','maxnum'=>'879'], - ['name'=>'白菜','minnum'=>'356','maxnum'=>'521'], - ['name'=>'芋头','minnum'=>'415','maxnum'=>'754'], - ['name'=>'地瓜','minnum'=>'258','maxnum'=>'369'], - ['name'=>'土豆','minnum'=>'779','maxnum'=>'916'], - ['name'=>'山药','minnum'=>'1465','maxnum'=>'1874'], + ['name'=>'萝卜', + 'minnum'=> + [['month'=>'1月','value'=>'661'], + ['month'=>'2月','value'=>'356'], + ['month'=>'3月','value'=>'415'], + ['month'=>'4月','value'=>'258'], + ['month'=>'5月','value'=>'779'], + ['month'=>'6月','value'=>'1465'], + ['month'=>'7月','value'=>'668'], + ['month'=>'8月','value'=>'571'], + ['month'=>'9月','value'=>'498'], + ['month'=>'10月','value'=>'587'], + ['month'=>'11月','value'=>'881'], + ['month'=>'12月','value'=>'1008']], + 'maxnum'=> + [['month'=>'1月','value'=>'879'], + ['month'=>'2月','value'=>'521'], + ['month'=>'3月','value'=>'754'], + ['month'=>'4月','value'=>'369'], + ['month'=>'5月','value'=>'916'], + ['month'=>'6月','value'=>'1874'], + ['month'=>'7月','value'=>'837'], + ['month'=>'8月','value'=>'667'], + ['month'=>'9月','value'=>'547'], + ['month'=>'10月','value'=>'741'], + ['month'=>'11月','value'=>'983'], + ['month'=>'12月','value'=>'1150']], + ], + ['name'=>'白菜', + 'minnum'=> + [['month'=>'1月','value'=>'123'], + ['month'=>'2月','value'=>'456'], + ['month'=>'3月','value'=>'789'], + ['month'=>'4月','value'=>'147'], + ['month'=>'5月','value'=>'258'], + ['month'=>'6月','value'=>'369'], + ['month'=>'7月','value'=>'159'], + ['month'=>'8月','value'=>'267'], + ['month'=>'9月','value'=>'367'], + ['month'=>'10月','value'=>'541'], + ['month'=>'11月','value'=>'354'], + ['month'=>'12月','value'=>'897']], + 'maxnum'=> + [['month'=>'1月','value'=>'879'], + ['month'=>'2月','value'=>'897'], + ['month'=>'3月','value'=>'1053'], + ['month'=>'4月','value'=>'354'], + ['month'=>'5月','value'=>'535'], + ['month'=>'6月','value'=>'774'], + ['month'=>'7月','value'=>'337'], + ['month'=>'8月','value'=>'410'], + ['month'=>'9月','value'=>'468'], + ['month'=>'10月','value'=>'600'], + ['month'=>'11月','value'=>'883'], + ['month'=>'12月','value'=>'1100']], + ], + ['name'=>'芋头', + 'minnum'=> + [['month'=>'1月','value'=>'245'], + ['month'=>'2月','value'=>'245'], + ['month'=>'3月','value'=>'411'], + ['month'=>'4月','value'=>'246'], + ['month'=>'5月','value'=>'631'], + ['month'=>'6月','value'=>'1234'], + ['month'=>'7月','value'=>'546'], + ['month'=>'8月','value'=>'246'], + ['month'=>'9月','value'=>'356'], + ['month'=>'10月','value'=>'466'], + ['month'=>'11月','value'=>'744'], + ['month'=>'12月','value'=>'998']], + 'maxnum'=> + [['month'=>'1月','value'=>'879'], + ['month'=>'2月','value'=>'511'], + ['month'=>'3月','value'=>'754'], + ['month'=>'4月','value'=>'469'], + ['month'=>'5月','value'=>'916'], + ['month'=>'6月','value'=>'1474'], + ['month'=>'7月','value'=>'887'], + ['month'=>'8月','value'=>'710'], + ['month'=>'9月','value'=>'678'], + ['month'=>'10月','value'=>'854'], + ['month'=>'11月','value'=>'983'], + ['month'=>'12月','value'=>'1005']], + ], + ['name'=>'地瓜', + 'minnum'=> + [['month'=>'1月','value'=>'255'], + ['month'=>'2月','value'=>'324'], + ['month'=>'3月','value'=>'124'], + ['month'=>'4月','value'=>'235'], + ['month'=>'5月','value'=>'364'], + ['month'=>'6月','value'=>'688'], + ['month'=>'7月','value'=>'678'], + ['month'=>'8月','value'=>'471'], + ['month'=>'9月','value'=>'468'], + ['month'=>'10月','value'=>'510'], + ['month'=>'11月','value'=>'789'], + ['month'=>'12月','value'=>'986']], + 'maxnum'=> + [['month'=>'1月','value'=>'899'], + ['month'=>'2月','value'=>'531'], + ['month'=>'3月','value'=>'759'], + ['month'=>'4月','value'=>'569'], + ['month'=>'5月','value'=>'946'], + ['month'=>'6月','value'=>'1474'], + ['month'=>'7月','value'=>'737'], + ['month'=>'8月','value'=>'610'], + ['month'=>'9月','value'=>'538'], + ['month'=>'10月','value'=>'700'], + ['month'=>'11月','value'=>'911'], + ['month'=>'12月','value'=>'1050']], + ], + ['name'=>'土豆', + 'minnum'=> + [['month'=>'1月','value'=>'468'], + ['month'=>'2月','value'=>'315'], + ['month'=>'3月','value'=>'409'], + ['month'=>'4月','value'=>'268'], + ['month'=>'5月','value'=>'756'], + ['month'=>'6月','value'=>'1126'], + ['month'=>'7月','value'=>'641'], + ['month'=>'8月','value'=>'552'], + ['month'=>'9月','value'=>'483'], + ['month'=>'10月','value'=>'568'], + ['month'=>'11月','value'=>'821'], + ['month'=>'12月','value'=>'896']], + 'maxnum'=> + [['month'=>'1月','value'=>'879'], + ['month'=>'2月','value'=>'551'], + ['month'=>'3月','value'=>'756'], + ['month'=>'4月','value'=>'389'], + ['month'=>'5月','value'=>'946'], + ['month'=>'6月','value'=>'1474'], + ['month'=>'7月','value'=>'847'], + ['month'=>'8月','value'=>'720'], + ['month'=>'9月','value'=>'668'], + ['month'=>'10月','value'=>'830'], + ['month'=>'11月','value'=>'993'], + ['month'=>'12月','value'=>'1260']], + ], + ['name'=>'山药', + 'minnum'=> + [['month'=>'1月','value'=>'578'], + ['month'=>'2月','value'=>'316'], + ['month'=>'3月','value'=>'409'], + ['month'=>'4月','value'=>'249'], + ['month'=>'5月','value'=>'789'], + ['month'=>'6月','value'=>'1420'], + ['month'=>'7月','value'=>'647'], + ['month'=>'8月','value'=>'561'], + ['month'=>'9月','value'=>'478'], + ['month'=>'10月','value'=>'513'], + ['month'=>'11月','value'=>'841'], + ['month'=>'12月','value'=>'889']], + 'maxnum'=> + [['month'=>'1月','value'=>'889'], + ['month'=>'2月','value'=>'531'], + ['month'=>'3月','value'=>'774'], + ['month'=>'4月','value'=>'569'], + ['month'=>'5月','value'=>'910'], + ['month'=>'6月','value'=>'1574'], + ['month'=>'7月','value'=>'857'], + ['month'=>'8月','value'=>'740'], + ['month'=>'9月','value'=>'648'], + ['month'=>'10月','value'=>'810'], + ['month'=>'11月','value'=>'983'], + ['month'=>'12月','value'=>'1241']], + ], ]; $this->apiSuccess('获取成功',$return); }