Skip to content

W
workbiu-admin
Commit af6b63e4 authored by mengyixi's avatar mengyixi
Browse files
Options

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

parents 96273125 70174a84
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 95 deletions
resources/views/admin/file/filetables.blade.php 0 → 100644
View file @ af6b63e4
@extends('admin/dashboard')
@section('content')
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
团队列表
{{--<small>advanced tables</small>--}}
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>
<li><a href="#">Tables</a></li>
<li class="active">Data tables</li>
</ol>
</section>
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
{{--<h3 class="box-title">Hover Data Table</h3>--}}
</div>
<!-- /.box-header -->
<div class="box-body">
<form action="#">
<div class="row">
<div class="col-lg-6">
<div class="input-group">
<input type="text" class="form-control" placeholder="文件名称" name="search">
<span class="input-group-btn">
<button class="btn btn-default" > 搜索 </button>
</span>
</div><!-- /input-group -->
</div><!-- /.col-lg-6 -->
</div><!-- /.row -->
</form>
<br>
<table id="example2" class="table table-bordered table-hover">
<thead>
<tr>
<th>ID</th>
<th>文件名</th>
<th>类型</th>
<th>size</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
{{--@if($groups == null)--}}
<tbody>
<tr>
<td colspan="8" style="text-align: center;color: red"> 数据暂无 </td>
</tr>
</tbody>
</table>
{{--@else--}}
{{--@foreach($groups as $group)--}}
<tbody>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>
</td>
</tr>
</tbody>
</table>
{{--{{ $result->appends(['search' => $params])->links() }}--}}
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
@endsection
\ No newline at end of file
resources/views/admin/group/groupinformation.blade.php
View file @ af6b63e4
......@@ -56,7 +56,7 @@
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="#activity" data-toggle="tab">团队成员</a></li>
<li><a href="#timeline" data-toggle="tab">Timeline</a></li>
<li><a href="#timeline" data-toggle="tab">团队文件</a></li>
<li><a href="#settings" data-toggle="tab">Settings</a></li>
<li><a href="{{route('group.invitePage',['group_id' => $groups->id])}}" > 邀请新成员</a></li>
</ul>
......@@ -85,100 +85,40 @@
<!-- /.tab-pane -->
<div class="tab-pane" id="timeline">
<h3> 这里没写code </h3>
<!-- The timeline -->
{{--<ul class="timeline timeline-inverse">--}}
{{--<!-- timeline time label -->--}}
{{--<li class="time-label">--}}
{{--<span class="bg-red">--}}
{{--10 Feb. 2014--}}
{{--</span>--}}
{{--</li>--}}
{{--<!-- /.timeline-label -->--}}
{{--<!-- timeline item -->--}}
{{--<li>--}}
{{--<i class="fa fa-envelope bg-blue"></i>--}}
{{--<div class="timeline-item">--}}
{{--<span class="time"><i class="fa fa-clock-o"></i> 12:05</span>--}}
{{--<h3 class="timeline-header"><a href="#">Support Team</a> sent you an email</h3>--}}
{{--<div class="timeline-body">--}}
{{--Etsy doostang zoodles disqus groupon greplin oooj voxy zoodles,--}}
{{--weebly ning heekya handango imeem plugg dopplr jibjab, movity--}}
{{--jajah plickers sifteo edmodo ifttt zimbra. Babblely odeo kaboodle--}}
{{--quora plaxo ideeli hulu weebly balihoo...--}}
{{--</div>--}}
{{--<div class="timeline-footer">--}}
{{--<a class="btn btn-primary btn-xs">Read more</a>--}}
{{--<a class="btn btn-danger btn-xs">Delete</a>--}}
{{--</div>--}}
{{--</div>--}}
{{--</li>--}}
{{--<!-- END timeline item -->--}}
{{--<!-- timeline item -->--}}
{{--<li>--}}
{{--<i class="fa fa-user bg-aqua"></i>--}}
{{--<div class="timeline-item">--}}
{{--<span class="time"><i class="fa fa-clock-o"></i> 5 mins ago</span>--}}
{{--<h3 class="timeline-header no-border"><a href="#">Sarah Young</a> accepted your friend request--}}
{{--</h3>--}}
{{--</div>--}}
{{--</li>--}}
{{--<!-- END timeline item -->--}}
{{--<!-- timeline item -->--}}
{{--<li>--}}
{{--<i class="fa fa-comments bg-yellow"></i>--}}
{{--<div class="timeline-item">--}}
{{--<span class="time"><i class="fa fa-clock-o"></i> 27 mins ago</span>--}}
<table id="example2" class="table table-bordered table-hover">
<thead>
<tr>
<th>ID</th>
<th>文件名</th>
<th>类型</th>
<th>size</th>
<th>状态</th>
<th>所属项目</th>
<th>操作</th>
</tr>
</thead>
{{--@if($groups == null)--}}
<tbody>
<tr>
<td colspan="8" style="text-align: center;color: red"> 数据暂无 </td>
</tr>
</tbody>
</table>
{{--@else--}}
{{--@foreach($groups as $group)--}}
<tbody>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
{{--<h3 class="timeline-header"><a href="#">Jay White</a> commented on your post</h3>--}}
{{--<div class="timeline-body">--}}
{{--Take me to your leader!--}}
{{--Switzerland is small and neutral!--}}
{{--We are more like Germany, ambitious and misunderstood!--}}
{{--</div>--}}
{{--<div class="timeline-footer">--}}
{{--<a class="btn btn-warning btn-flat btn-xs">View comment</a>--}}
{{--</div>--}}
{{--</div>--}}
{{--</li>--}}
{{--<!-- END timeline item -->--}}
{{--<!-- timeline time label -->--}}
{{--<li class="time-label">--}}
{{--<span class="bg-green">--}}
{{--3 Jan. 2014--}}
{{--</span>--}}
{{--</li>--}}
{{--<!-- /.timeline-label -->--}}
{{--<!-- timeline item -->--}}
{{--<li>--}}
{{--<i class="fa fa-camera bg-purple"></i>--}}
{{--<div class="timeline-item">--}}
{{--<span class="time"><i class="fa fa-clock-o"></i> 2 days ago</span>--}}
{{--<h3 class="timeline-header"><a href="#">Mina Lee</a> uploaded new photos</h3>--}}
{{--<div class="timeline-body">--}}
{{--<img src="http://placehold.it/150x100" alt="..." class="margin">--}}
{{--<img src="http://placehold.it/150x100" alt="..." class="margin">--}}
{{--<img src="http://placehold.it/150x100" alt="..." class="margin">--}}
{{--<img src="http://placehold.it/150x100" alt="..." class="margin">--}}
{{--</div>--}}
{{--</div>--}}
{{--</li>--}}
{{--<!-- END timeline item -->--}}
{{--<li>--}}
{{--<i class="fa fa-clock-o bg-gray"></i>--}}
{{--</li>--}}
{{--</ul>--}}
</div>
<!-- /.tab-pane -->
......
routes/web.php
View file @ af6b63e4
......@@ -113,7 +113,6 @@ Route::get('/',function (){return view('login');})->name('admin.login');
});
Route::group(['prefix'=>'file'],function (){
Route::get('get_all','FileController@getAll')->name('file.getAll');
});
......
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