一些

app/Http/Controllers/FileController.php

@@ -35,12 +35,10 @@ class FileController extends Controller
     {
 
         $group_id = $request->group_id;
-
         $result = $this->mFile->groupSpace($group_id);
         $mbyte =ceil($result/1048576) ;
         $space = 10-$mbyte;
-        $finalspace = array("space"=>$space,"usespace"=>$mbyte);
-        $finalspace = json_encode($finalspace);
+        $finalspace = array(['value'=>$mbyte,'name'=>'已用空间'],['value'=>$space,'name'=>'剩余空间']);
         return $finalspace;
     }
 

resources/views/admin/group/groupinformation.blade.php

@@ -95,6 +95,8 @@
                                 <th>文件夹</th>
                                 <th>所属项目</th>
                                 <th>创建者</th>
+                                <th>Bucket</th>
+                                <th>pointer</th>
                                 {{--<th>操作</th>--}}
                             </tr>
                             </thead>
@@ -116,6 +118,7 @@
                             <td>{{$file->folder_id}}</td>
                             <td>{{$file->fileInProject->name}}</td>
                             <td>{{$file->fileCreator->user_name}}</td>
+                            <td></td>
                             <td>
                                 {{--<a href="{{route('file.get',['id' => $file->id])}}" class="btn btn-info" > 查看详情</a>--}}
                                 {{--<a href="{{route('file.delete',['id' => $file->id])}}" class="btn bg-orange" > 删除</a>--}}
@@ -132,7 +135,7 @@
 
                     <div class="tab-pane" id="settings">
                         <div id="main" style="width: 600px;height:400px;"></div>
-                        <input type="text" value="{{$id}}" id="id">
+                        <input type="hidden" value="{{$id}}" id="id">
                     </div>
                     <!-- /.tab-pane -->
                 </div>
@@ -168,8 +171,8 @@
             url:'{{route('file.groupSpace')}}',
             data:{ group_id:id },
             success:function(data){
-
-
+                option['series'][0]['data']=data;
+                myChart.setOption(option);
             },
             error:function(data){
                 console.log('错误');
@@ -181,8 +184,8 @@
 
     option = {
         title : {
-            text: '当前团队空间使用情况',
-            subtext: '这是真的',
+            text: '团队存储空间使用情况',
+            subtext: '单位：MB',
             x:'center'
         },
         tooltip : {
@@ -201,8 +204,8 @@
                 radius : '55%',
                 center: ['50%', '60%'],
                 data:[
-                    {value:335, name:'全部空间'},
-                    {value:310, name:'已经使用'}
+//                    {value:335, name:'全部空间'},
+//                    {value:310, name:'已经使用'}
                 ],
                 itemStyle: {
                     emphasis: {

routes/web.php

@@ -116,11 +116,7 @@ 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
     });