Merge branch 'dev-master' of 120.27.221.179:gxx123/workbiu-admin into dev-master

app/Http/Controllers/FileController.php

@@ -38,7 +38,8 @@ class FileController extends Controller
 
         $result = $this->mFile->groupSpace($group_id);
         $mbyte =ceil($result/1048576) ;
-        $finalspace = array("usespace"=>$mbyte);
+        $space = 10-$mbyte;
+        $finalspace = array("space"=>$space,"usespace"=>$mbyte);
         $finalspace = json_encode($finalspace);
         return $finalspace;
     }
@@ -48,7 +49,8 @@ class FileController extends Controller
         $group_id = $request->group_id;
         $result = $this->mFile->groupSpace($group_id);
         $mbyte = $result/1048576;
-        $finalspace = array("usespace"=>$mbyte);
+        $space = 10-$mbyte;
+        $finalspace = array("space"=>$space,"usespace"=>$mbyte);
         $finalspace = json_encode($finalspace);
         return $finalspace;
     }

routes/web.php

@@ -116,7 +116,11 @@ Route::get('/',function (){return view('login');})->name('admin.login');
         Route::get('get_all','FileController@getAll')->name('file.getAll');
         Route::delete('delete_file','FileController@delete')->name('file.delete');
         Route::get('group_space','FileController@groupSpace')->name('file.groupSpace');
+<<<<<<< HEAD
+        Route::get('oss_space','FileController@ossSpace')->name('file.ossSpace');
+=======
         Route::get('oss_space','FileController@ossSpace')->name('file.ossspace');
+>>>>>>> b17167244102ea0cfb09e3d1f3cb459cddf1c995
     });