liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

Compare commits

base: liutk:ac066bacf94e425abf7f83c8818d4050229ffbb7
Branches Tags
liutk:main
liutk:develop
..
compare: liutk:ed5591710dda69a63e6905dcc88555f6708d462a
Branches Tags
liutk:main
liutk:develop

No commits in common. "ac066bacf94e425abf7f83c8818d4050229ffbb7" and "ed5591710dda69a63e6905dcc88555f6708d462a" have entirely different histories.
ac066bacf9 ... ed5591710d

2 changed files with 51 additions and 61 deletions
Show Stats Expand all files Collapse all files

19
app/Admin/Controllers/CustomRegionController.php
View File

@ -130,20 +130,7 @@ class CustomRegionController extends AdminController
amisMake()->Panel()->title('种植记录') amisMake()->Panel()->title('种植记录')
->className('Panel--success') ->className('Panel--success')
->body([ ->body([
\amisMake()->Button()->className('absolute top-2 right-4')->actionType('dialog')->label('新增')->dialog([ \amisMake()->Table()->title('')
"title"=> "新增表单",
"body"=> [
"type"=> "form",
"api"=> "post:/amis/api/mock2/sample",
"body"=> [
\amisMake()->TextControl()->label('作物名称'),
\amisMake()->TextControl()->label('负责人'),
\amisMake()->TextControl()->label('种植面积'),
\amisMake()->DateControl()->label('种植时间'),
]
]
])->level('primary'),
\amisMake()->CRUDTable()->title('')
->data([ ->data([
'items' => [ 'items' => [
[ [
@ -157,11 +144,11 @@ class CustomRegionController extends AdminController
->columns([ ->columns([
amisMake()->TableColumn()->name('name')->label('名称'), amisMake()->TableColumn()->name('name')->label('名称'),
amisMake()->TableColumn()->name('name1')->label('负责人'), amisMake()->TableColumn()->name('name1')->label('负责人'),
amisMake()->TableColumn()->name('area')->label('种植面积'), amisMake()->TableColumn()->name('area')->label('种植范围'),
amisMake()->TableColumn()->name('time1')->label('开始时间'), amisMake()->TableColumn()->name('time1')->label('开始时间'),
]) ])
->itemActions([ ->itemActions([
\amisMake()->DialogAction()->label('收获记录')->level('link') // amisMake()->DialogAction()->label('收获记录')->level('link')
]) ])
]) ])
]), ]),

93
app/Admin/Controllers/DeviceController.php
View File

@ -430,47 +430,46 @@ class DeviceController extends AdminController
return amisMake()->Grid()->columns([ return amisMake()->Grid()->columns([
amisMake()->Wrapper()->sm(6)->body([ amisMake()->Wrapper()->sm(6)->body([
amisMake()->Panel()->title('智能开关设置') amisMake()->Panel()->title('智能开关设置')
->subFormMode('horizontal')
->labelWidth(100) ->labelWidth(100)
->className('Panel--success') ->className('Panel--success')
->body([ ->body([
\amisMake()->Form()->title('')->mode('horizontal')->body([ amisMake()->FieldSetControl()->title('智能开启')->body([
amisMake()->FieldSetControl()->title('智能开启')->body([ \amisMake()->SwitchControl()->name('is_enable')->label('开关'),
\amisMake()->SwitchControl()->name('open_is_enable')->label('开关'), \amisMake()->ConditionBuilderControl()->label('条件')->fields([
\amisMake()->ConditionBuilderControl()->label('条件')->fields([ [
[ 'label' => '温度', 'type'=>'number','step'=>'0.01','name'=>'q',
'label' => '温度', 'type'=>'number','step'=>'0.01','name'=>'q', 'operators'=> [
'operators'=> [ 'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between',
'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between', // 'is_empty', 'is_not_empty'
// 'is_empty', 'is_not_empty' ]
] ],
], [
[ 'label' => '湿度', 'type'=>'number','step'=>'0.01','name'=>'x',
'label' => '湿度', 'type'=>'number','step'=>'0.01','name'=>'x', 'operators'=> [
'operators'=> [ 'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between',
'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between', // 'is_empty', 'is_not_empty'
// 'is_empty', 'is_not_empty' ]
] ],
],
]),
]), ]),
amisMake()->FieldSetControl()->title('智能关闭')->body([ ]),
\amisMake()->SwitchControl()->name('close_is_enable')->label('开关'), amisMake()->FieldSetControl()->title('智能关闭')->body([
\amisMake()->ConditionBuilderControl()->label('条件')->fields([ \amisMake()->SwitchControl()->name('is_enable')->label('开关'),
[ \amisMake()->ConditionBuilderControl()->label('条件')->fields([
'label' => '温度', 'type'=>'number','step'=>'0.01','name'=>'q', [
'operators'=> [ 'label' => '温度', 'type'=>'number','step'=>'0.01','name'=>'q',
'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between', 'operators'=> [
// 'is_empty', 'is_not_empty' 'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between',
] // 'is_empty', 'is_not_empty'
], ]
[ ],
'label' => '湿度', 'type'=>'number','step'=>'0.01','name'=>'x', [
'operators'=> [ 'label' => '湿度', 'type'=>'number','step'=>'0.01','name'=>'x',
'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between', 'operators'=> [
// 'is_empty', 'is_not_empty' 'equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal', 'between', 'not_between',
] // 'is_empty', 'is_not_empty'
], ]
]), ],
]), ]),
]), ]),
]) ])
@ -494,6 +493,9 @@ class DeviceController extends AdminController
amisMake()->TableColumn()->name('name1')->label('状态'), amisMake()->TableColumn()->name('name1')->label('状态'),
amisMake()->TableColumn()->name('time1')->label('执行时间'), amisMake()->TableColumn()->name('time1')->label('执行时间'),
]) ])
->itemActions([
// amisMake()->DialogAction()->label('收获记录')->level('link')
])
]) ])
]), ]),
]); ]);
@ -510,14 +512,12 @@ class DeviceController extends AdminController
->labelWidth(80) ->labelWidth(80)
->className('Panel--success') ->className('Panel--success')
->body([ ->body([
\amisMake()->Form()->title('')->mode('horizontal')->body([ amisMake()->FieldSetControl()->title('定时喷灌')->body([
amisMake()->FieldSetControl()->title('定时喷灌')->body([ \amisMake()->SwitchControl()->name('is_enable')->label('开关'),
\amisMake()->SwitchControl()->name('is_enable')->label('开关'), \amisMake()->ArrayControl()->name('config')->label('定时')->items([
\amisMake()->ArrayControl()->name('config')->label('定时')->items([ amisMake()->ComboControl()->items([
amisMake()->ComboControl()->items([ \amisMake()->InputTimeRange(),
\amisMake()->InputTimeRange(), \amisMake()->TextControl()->name('input')->label('喷灌量')->labelWidth(30),
\amisMake()->TextControl()->name('input')->label('喷灌量')->labelWidth(30),
]),
]), ]),
]), ]),
]), ]),
@ -542,6 +542,9 @@ class DeviceController extends AdminController
amisMake()->TableColumn()->name('name1')->label('状态'), amisMake()->TableColumn()->name('name1')->label('状态'),
amisMake()->TableColumn()->name('time1')->label('执行时间'), amisMake()->TableColumn()->name('time1')->label('执行时间'),
]) ])
->itemActions([
// amisMake()->DialogAction()->label('收获记录')->level('link')
])
]) ])
]), ]),
]); ]);