From 2dc87694db55286cfbb80ace8f6adb8c29b80677 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 12 Apr 2023 11:36:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=86=9C=E4=BD=9C=E7=89=A9?= =?UTF-8?q?=E7=A7=8D=E6=A4=8D=E8=AE=B0=E5=BD=95=E6=A0=B7=E5=BC=8F=E8=A1=A5?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/CropController.php | 91 +++++++++++++++++++ .../Controllers/CustomRegionController.php | 41 ++++++++- app/Admin/routes.php | 3 + 3 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 app/Admin/Controllers/CropController.php diff --git a/app/Admin/Controllers/CropController.php b/app/Admin/Controllers/CropController.php new file mode 100644 index 0000000..a227949 --- /dev/null +++ b/app/Admin/Controllers/CropController.php @@ -0,0 +1,91 @@ +Grid()->columns([ + amisMake()->Wrapper()->sm(6)->body([ + amisMake()->Panel()->title('基础详情') + ->subFormMode('horizontal') + ->labelWidth(100) + ->className('Panel--success') + ->body([ + \amisMake()->TextControl()->static(true)->name('name')->label('名称')->value('试验田1'), + \amisMake()->TextControl()->static(true)->name('name1')->label('负责人')->value('负责人'), + \amisMake()->TextControl()->static(true)->name('area')->label('种植面积m²')->value(), + \amisMake()->TextControl()->static(true)->name('time')->label('种植时间')->value('2023-03-01'), + ]), + amisMake()->Panel()->title('收割记录') + ->className('Panel--success') + ->body([ + \amisMake()->Button()->className('absolute top-2 right-4')->actionType('dialog')->label('新增')->dialog([ + "title"=> "收割记录", + "body"=> [ + "type"=> "form", + "api"=> "", + "body"=> [ + \amisMake()->TextControl()->label('负责人'), + \amisMake()->TextControl()->label('收割面积'), + \amisMake()->TextControl()->label('收割产量'), + \amisMake()->DateControl()->label('收割时间'), + ] + ] + ])->level('primary'), + \amisMake()->CRUDTable()->title('') + ->data([ + 'items' => [ + [ + 'name'=> '负责人', + 'name1'=> '100', + 'area'=> '100', + 'time1'=> '2023-03-21', + ], + ] + ])->columns([ + amisMake()->TableColumn()->name('name')->label('负责人'), + amisMake()->TableColumn()->name('name1')->label('收割面积'), + amisMake()->TableColumn()->name('area')->label('收割产量'), + amisMake()->TableColumn()->name('time1')->label('收割时间'), + ]) + ]), + ]), + amisMake()->Wrapper()->sm(6)->body([ + \amisMake()->grid()->columns([ + \amisMake()->Form()->title('搜索条件')->mode('inline')->body([ + \amisMake()->DateRangeControl()->label('时间范围'), + amis('submit')->label(__('admin.search'))->level('primary'), + ]), + ]), + amisMake()->Card()->className('m-r')->body( + amisMake()->Chart()->config("{ + title:{ text: '种植情况'}, + tooltip: { trigger: 'axis' }, + xAxis: { type: 'category', boundaryGap: false, data: ['2023-03-01', '2023-03-10', '2023-03-15', '2023-03-15', '2023-03-20', '2023-03-25', '2023-03-31'] }, + yAxis: { type: 'value' }, + grid:{ left: '7%', right:'3%', top: 60, bottom: 30, }, + series: [ + { name:'面积', data: {$random2}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', }, + { name:'产量', data: {$random1}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', }, + ]}") + ), + ]), + ]); + } +} \ No newline at end of file diff --git a/app/Admin/Controllers/CustomRegionController.php b/app/Admin/Controllers/CustomRegionController.php index d4e9104..4ace542 100644 --- a/app/Admin/Controllers/CustomRegionController.php +++ b/app/Admin/Controllers/CustomRegionController.php @@ -131,7 +131,7 @@ class CustomRegionController extends AdminController ->className('Panel--success') ->body([ \amisMake()->Button()->className('absolute top-2 right-4')->actionType('dialog')->label('新增')->dialog([ - "title"=> "新增表单", + "title"=> "种植记录", "body"=> [ "type"=> "form", "api"=> "post:/amis/api/mock2/sample", @@ -151,6 +151,12 @@ class CustomRegionController extends AdminController 'name1'=> '负责人', 'area'=> '100', 'time1'=> '2023-03-21', + ], + [ + 'name'=> '作物名称2', + 'name1'=> '负责人', + 'area'=> '100', + 'time1'=> '2023-03-21', ] ] ]) @@ -158,11 +164,38 @@ class CustomRegionController extends AdminController amisMake()->TableColumn()->name('name')->label('名称'), amisMake()->TableColumn()->name('name1')->label('负责人'), amisMake()->TableColumn()->name('area')->label('种植面积'), - amisMake()->TableColumn()->name('time1')->label('开始时间'), + amisMake()->TableColumn()->name('time1')->label('种植时间'), ]) - ->itemActions([ - \amisMake()->DialogAction()->label('收获记录')->level('link') + ->itemAction([ + 'type'=>'button', + 'actionType'=>'dialog', + 'dialog'=> \amisMake()->Dialog()->title('作物名称') + ->size('full')->actions([])->body([ + \amisMake()->Tabs()->tabsMode('simple')->name('detailTab')->tabs([ + [ + 'title' => '种植详情', + 'value' => 'detail', + 'tab'=>\amisMake()->Service()->schemaApi(admin_url('crop-plan-detail?id=')),//传id + 'unmountOnExit' => true//每次切换tab都要销毁 + ], + [ + 'title' => '报警记录', + 'value' => 'warning', + // 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-detail?id='.$region['id'])), + 'unmountOnExit' => true//每次切换tab都要销毁 + ], + [ + 'title' => '虫情记录', + 'value' => 'warning', + // 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-detail?id='.$region['id'])), + 'unmountOnExit' => true//每次切换tab都要销毁 + ], + ]) + ]) ]) + // ->itemActions([ + // \amisMake()->DialogAction()->label('新增收获')->level('link') + // ]) ]) ]), ]); diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 8eb482d..bfb4666 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -58,5 +58,8 @@ Route::group([ $router->post('custom-region-wasserstrahl', '\App\Admin\Controllers\DeviceController@wasserstrahlDetail'); + //种植记录 + $router->post('crop-plan-detail', '\App\Admin\Controllers\CropController@planDetail'); + $router->resource('system/settings', \App\Admin\Controllers\SettingController::class); });