xuanchen/new_haai
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改样式

Browse Source
This commit is contained in:
徐永宾
2020-09-18 14:04:26 +08:00
parent b8024dcace
commit 2c3d38f69b
8 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PatentController.php
View File

@@ -52,7 +52,7 @@ class PatentController extends Controller
}) })
->latest('sort') ->latest('sort')
->latest() ->latest()
->paginate(); ->paginate(2);
return view('patents.list', compact('patents')); return view('patents.list', compact('patents'));
} }

1
public/assets/index/css/style.css
View File

@@ -1128,6 +1128,7 @@ img {
.paper-table td { .paper-table td {
text-align: center; text-align: center;
height: 40px; height: 40px;
padding: 10px;
} }
/* 组织机构-研究所简介 */ /* 组织机构-研究所简介 */

4
resources/views/category/cgzh.blade.php
View File

@@ -37,7 +37,7 @@
<a class="nowrap" href="{{ $article->link }}"> <a class="nowrap" href="{{ $article->link }}">
<i class="fa fa-angle-double-right"></i> <i class="fa fa-angle-double-right"></i>
{{ $article->title }} {{ $article->title }}
<span>{{ $article->created_at }}</span> <span>{{ $article->created_at->format('Y-m-d') }}</span>
</a> </a>
</li> </li>
@endif @endif
@@ -66,7 +66,7 @@
<a class="nowrap" href="{{ $article->link }}"> <a class="nowrap" href="{{ $article->link }}">
<i class="fa fa-angle-double-right"></i> <i class="fa fa-angle-double-right"></i>
{{ $article->title }} {{ $article->title }}
<span>{{ $article->created_at }}</span> <span>{{ $article->created_at->format('Y-m-d') }}</span>
</a> </a>
</li> </li>
@endif @endif

2
resources/views/index/index.blade.php
View File

@@ -188,7 +188,7 @@
style="background-image: url({{ $advert->cover_path }});" style="background-image: url({{ $advert->cover_path }});"
href="{{ $advert->url }}" href="{{ $advert->url }}"
> >
<span>{{ $advert->title }}</span> {{-- <span>{{ $advert->title }}</span>--}}
</a> </a>
@endforeach @endforeach
@endif @endif

15
resources/views/patents/list.blade.php
View File

@@ -23,14 +23,15 @@
<i class="fa fa-caret-right"></i> <i class="fa fa-caret-right"></i>
<a href="{{ url()->current() }}">{{ request()->type=='patent'?'专利':'论文' }}</a> <a href="{{ url()->current() }}">{{ request()->type=='patent'?'专利':'论文' }}</a>
</div> </div>
@include('patents.'.request()->type, ['patents' => $patents]) @include('patents.'.request()->type, ['patents' => $patents])
</div>
<!-- 分页 --> <!-- 分页 -->
{{-- <div class="pages">--}} <div class="pages">
{{-- @if ($patents->isNotEmpty())--}} @if ($patents->isNotEmpty())
{{-- {{ $patents->links('layouts.pagination') }}--}} {{ $patents->appends(request()->all())->links('layouts.pagination') }}
{{-- @endif--}} @endif
{{-- </div>--}} </div>
</div>
</div> </div>
<!-- end content --> <!-- end content -->
@endsection @endsection

14
resources/views/patents/paper.blade.php
View File

@@ -19,7 +19,7 @@
<li class="paper-form-inputs"> <li class="paper-form-inputs">
<label>发表年度</label> <label>发表年度</label>
<select name="year"> <select name="year">
<option value="">{{ $i }}选择年度</option> <option value="">选择年度</option>
@for ($i = 2020; $i > 2000; $i--) @for ($i = 2020; $i > 2000; $i--)
<option value="{{ $i }}" @if (request()->year==$i) selected @endif>{{ $i }}年度</option> <option value="{{ $i }}" @if (request()->year==$i) selected @endif>{{ $i }}年度</option>
@endfor @endfor
@@ -33,16 +33,16 @@
<!-- 论文表格 --> <!-- 论文表格 -->
<table class="paper-table" border="1" bordercolor="#d1d1d1"> <table class="paper-table" border="1" bordercolor="#d1d1d1">
<tr> <tr>
<th width="500">论文题目</th> <th width="300">论文题目</th>
<th>刊物名称</th> <th width="300">刊物名称</th>
<th>刊物作者</th> <th width="400">刊物作者</th>
<th>发表年度</th> <th width="200">发表年度</th>
</tr> </tr>
@foreach ($patents as $patent) @foreach ($patents as $patent)
<tr data-herf="{{ $patent->link }}"> <tr data-herf="{{ $patent->link }}">
<td>{{ $patent->title }}</td> <td>{{ $patent->title }}</td>
<td>{{ $patent->publication }}</td> <td>{{ $patent->publication??'---' }}</td>
<td>{{ $patent->nickname }}</td> <td>{{ $patent->nickname??'---' }}</td>
<td>{{ $patent->created_at->format('Y-m-d') }}</td> <td>{{ $patent->created_at->format('Y-m-d') }}</td>
</tr> </tr>
@endforeach @endforeach

16
resources/views/patents/patent.blade.php
View File

@@ -34,18 +34,18 @@
<!-- 论文表格 --> <!-- 论文表格 -->
<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1"> <table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
<tr> <tr>
<th width="500">专利名称</th> <th width="300">专利名称</th>
<th>专利号</th> <th width="200">专利号</th>
<th>专利类别</th> <th width="200">专利类别</th>
<th>申请日期</th> <th width="200">申请日期</th>
<th>第一发明人</th> <th width="300">第一发明人</th>
</tr> </tr>
@foreach ($patents as $patent) @foreach ($patents as $patent)
<tr data-href="{{ $patent->link }}"> <tr data-href="{{ $patent->link }}">
<td>{{ $patent->title }}</td> <td>{{ $patent->title }}</td>
<td>{{ $patent->number }}</td> <td>{{ $patent->number??'---' }}</td>
<td>{{ $patent->category->title }}</td> <td>{{ $patent->category->title??'---' }}</td>
<td>{{ $patent->application }}</td> <td>{{ $patent->application??'---' }}</td>
<td>{{ $patent->nickname }}</td> <td>{{ $patent->nickname }}</td>
</tr> </tr>
@endforeach @endforeach

28
resources/views/patents/show.blade.php
View File

@@ -12,32 +12,32 @@
@if ($patent->type=='patent') @if ($patent->type=='patent')
<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1"> <table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
<tr> <tr>
<th width="500">专利名称</th> <th width="300">专利名称</th>
<th>专利号</th> <th width="200">专利号</th>
<th>专利类别</th> <th width="200">专利类别</th>
<th>申请日期</th> <th width="200">申请日期</th>
<th>第一发明人</th> <th width="300">第一发明人</th>
</tr> </tr>
<tr> <tr>
<td>{{ $patent->title }}</td> <td>{{ $patent->title }}</td>
<td>{{ $patent->number }}</td> <td>{{ $patent->number??'---' }}</td>
<td>{{ $patent->category->title }}</td> <td>{{ $patent->category->title??'---' }}</td>
<td>{{ $patent->application }}</td> <td>{{ $patent->application??'---' }}</td>
<td>{{ $patent->nickname }}</td> <td>{{ $patent->nickname }}</td>
</tr> </tr>
</table> </table>
@else @else
<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1"> <table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
<tr> <tr>
<th width="500">论文题目</th> <th width="300">论文题目</th>
<th>刊物名称</th> <th width="200">刊物名称</th>
<th>刊物作者</th> <th width="200">刊物作者</th>
<th>发表年度</th> <th width="200">发表年度</th>
</tr> </tr>
<tr> <tr>
<td>{{ $patent->title }}</td> <td>{{ $patent->title }}</td>
<td>{{ $patent->publication }}</td> <td>{{ $patent->publication??'---' }}</td>
<td>{{ $patent->nickname }}</td> <td>{{ $patent->nickname??'---' }}</td>
<td>{{ $patent->created_at->format('Y-m-d') }}</td> <td>{{ $patent->created_at->format('Y-m-d') }}</td>
</tr> </tr>
</table> </table>