From 8ba5c0e82229d44de207b565247fb77406285cf0 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Tue, 27 Jun 2023 10:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=A4=A7=E5=B1=8F=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E9=A1=B9=E8=AE=BE=E7=BD=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/SettingController.php | 17 +++++--- .../Controllers/Api/SettingController.php | 40 ++++++++----------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/app/Admin/Controllers/SettingController.php b/app/Admin/Controllers/SettingController.php index 8b34b7d..b66ee59 100644 --- a/app/Admin/Controllers/SettingController.php +++ b/app/Admin/Controllers/SettingController.php @@ -5,10 +5,9 @@ namespace App\Admin\Controllers; use Illuminate\Http\Request; use Slowlyo\OwlAdmin\Renderers\Tab; use Slowlyo\OwlAdmin\Renderers\Tabs; -use Slowlyo\OwlAdmin\Renderers\Alert; -use Slowlyo\OwlAdmin\Renderers\InputKV; use Slowlyo\OwlAdmin\Renderers\TextControl; use Slowlyo\OwlAdmin\Controllers\AdminController; +use App\Admin\Components; class SettingController extends AdminController { @@ -33,9 +32,16 @@ class SettingController extends AdminController ->title('') ->body( Tabs::make()->tabs([ - Tab::make()->title('基本设置')->body([ + Tab::make()->title('基地信息设置')->body([ + amisMake()->ComboControl('region_base', '基础信息')->multiple(true)->items([ + amisMake()->TextControl('name', '名称'), + Components::make()->decimalControl('value', '值'), + amisMake()->TextControl('unit', '单位'), + ])->description('以上明细前6项会展示在大屏中间底部。'), + ]), + Tab::make()->title('系统设置')->body([ TextControl::make()->label('RTSP 转流服务')->name('rtsp_url'), - ]) + ]), ]) ); } @@ -43,7 +49,8 @@ class SettingController extends AdminController public function store(Request $request) { $data = $request->only([ - 'rtsp_url' + 'rtsp_url', + 'region_base' ]); return settings()->adminSetMany($data); diff --git a/app/Http/Controllers/Api/SettingController.php b/app/Http/Controllers/Api/SettingController.php index 64ffee1..2395866 100644 --- a/app/Http/Controllers/Api/SettingController.php +++ b/app/Http/Controllers/Api/SettingController.php @@ -8,31 +8,23 @@ use Illuminate\Http\Request; class SettingController extends Controller { /** - * 基础数据信息-最多返回6项-todo + * 基础数据信息-最多返回6项 */ - public function staticBaseData(){ - $data = [ - [ - 'name' => '稻田种植面积', - 'value' => '6,120', - ], - [ - 'name' => '稻田种植面积', - 'value' => '6,120', - ],[ - 'name' => '稻田种植面积', - 'value' => '6,120', - ],[ - 'name' => '稻田种植面积', - 'value' => '6,120', - ],[ - 'name' => '稻田种植面积', - 'value' => '6,120', - ],[ - 'name' => '稻田种植面积', - 'value' => '6,120', - ], - ]; + public function staticBaseData() + { + $baseData = settings()->get('region_base'); + $data = []; + foreach ($baseData as $index => $item) { + if($index <= 6){ + $data[] = [ + 'name' => $item['name'], + 'value' => number_format($item['value']), + 'unit' => $item['unit'], + ]; + }else{ + break;//最多放6个 + } + } return $this->json($data); } }