dev
parent
c351cc169f
commit
3670332227
|
|
@ -271,7 +271,7 @@ class DeviceController extends Controller
|
|||
}
|
||||
}else{
|
||||
//调整截至到当前小时
|
||||
$h = date('h');
|
||||
$h = date('H');
|
||||
for ($i = 0; $i < ($h+1); $i++) {
|
||||
$xKeys[] = date('Y-m-d').' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ class AgriculturalBaseSeeder extends Seeder
|
|||
['name' => '普润镇', 'type' => 2, 'description' => '', 'areas' => '58370', 'workforce' => '212'],
|
||||
];
|
||||
DB::table('agricultural_bases')->truncate();
|
||||
DB::table('base_crops')->truncate();
|
||||
try {
|
||||
DB::begintransaction();
|
||||
$this->createBases($bases);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class EndpointPermissionSeeder extends Seeder
|
|||
'citydata_statistics' => ['name' => '全市基础数据', 'curd' => ['index', 'edit']],
|
||||
//全市基础数据
|
||||
'agricultural_basic' => ['name' => '基地数据', 'curd' => true],
|
||||
'town_street' => ['name' => '城镇数据', 'curd' => true],
|
||||
'town_street' => ['name' => '城镇数据', 'curd' => ['index', 'edit']],
|
||||
//农作物数据
|
||||
'crops' => ['name' => '基地农作物', 'curd' => true],
|
||||
'town_crops' => ['name' => '镇街农作物', 'curd' => true],
|
||||
|
|
|
|||
Loading…
Reference in New Issue