Commit b1716724 authored by gxx's avatar gxx

修改了bug

parent ea4a18d3
...@@ -35,7 +35,7 @@ class FileController extends Controller ...@@ -35,7 +35,7 @@ class FileController extends Controller
{ {
$group_id = $request->group_id; $group_id = $request->group_id;
$result = $this->mFile->groupSpace($group_id); $result = $this->mFile->groupSpace($group_id);
$mbyte = $result/1048576; $mbyte =ceil($result/1048576) ;
$finalspace = array("usespace"=>$mbyte); $finalspace = array("usespace"=>$mbyte);
$finalspace = json_encode($finalspace); $finalspace = json_encode($finalspace);
return $finalspace; return $finalspace;
......
...@@ -62,7 +62,10 @@ class FileService implements FileServiceContract ...@@ -62,7 +62,10 @@ class FileService implements FileServiceContract
public function groupSpace($group_id) public function groupSpace($group_id)
{ {
$files = File::where(["group"=>$group_id])->get(); $files = File::where(["group_id"=>$group_id])->get();
if ($files->isEmpty()){
return null;
}
$space = 0; $space = 0;
foreach ($files as $file) foreach ($files as $file)
{ {
...@@ -74,7 +77,7 @@ class FileService implements FileServiceContract ...@@ -74,7 +77,7 @@ class FileService implements FileServiceContract
public function ossSpace($group_id) public function ossSpace($group_id)
{ {
$files = File::where(["group"=>$group_id])->get()->unique("pointer"); $files = File::where(["group_id"=>$group_id])->get()->unique("pointer");
$space = 0; $space = 0;
foreach ($files as $file) foreach ($files as $file)
{ {
......
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
<div class="tab-pane" id="settings"> <div class="tab-pane" id="settings">
<div id="main" style="width: 600px;height:400px;"></div> <div id="main" style="width: 600px;height:400px;"></div>
<input type="text" value="">
</div> </div>
<!-- /.tab-pane --> <!-- /.tab-pane -->
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
type:'get', type:'get',
url:'{{route('file.groupSpace')}}', url:'{{route('file.groupSpace')}}',
success:function(data){ success:function(data){
//console.log(data); console.log(data);
if (data == ''){ if (data == ''){
alert(111); alert(111);
......
...@@ -115,7 +115,7 @@ Route::get('/',function (){return view('login');})->name('admin.login'); ...@@ -115,7 +115,7 @@ Route::get('/',function (){return view('login');})->name('admin.login');
Route::group(['prefix'=>'file'],function (){ Route::group(['prefix'=>'file'],function (){
Route::get('get_all','FileController@getAll')->name('file.getAll'); Route::get('get_all','FileController@getAll')->name('file.getAll');
Route::delete('delete_file','FileController@delete')->name('file.delete'); Route::delete('delete_file','FileController@delete')->name('file.delete');
Route::get('group_space','FileController@groupSpace')->name('file.groupspace'); Route::get('group_space','FileController@groupSpace')->name('file.groupSpace');
Route::get('oss_space','FileController@ossSpace')->name('file.ossspace'); Route::get('oss_space','FileController@ossSpace')->name('file.ossspace');
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment