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

调整页面

Browse Source
This commit is contained in:
徐永宾
2020-09-18 13:45:13 +08:00
parent 46d12cbf68
commit b8024dcace
14 changed files with 268 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/Article/PatentController.php
View File

@@ -59,10 +59,12 @@ class PatentController extends AdminController
return $model->whereIn('type', [Category::TYPE_PATENT]);
}, '专利类别'));
$form->text('number', '专利号');
$form->text('application', '申请日期');
})
->when('paper', function (Form $form) {
$form->text('publication', '刊物名称');
$form->text('year', '发表年度');
})
->required();

5
app/Helpers/function.php
View File

@@ -28,7 +28,10 @@ function getOneCategory($categoryId, $return = '')
*/
function getOneArticleBYCate($categoryId, $result = '')
{
$info = Article::where('category_id', $categoryId)->latest('sort')->latest()->first();
$info = Article::where('category_id', $categoryId)
->latest('sort')
->latest()
->first();
if ($info) {
if ($result) {

19
app/Http/Controllers/CategoryController.php
View File

@@ -30,10 +30,23 @@ class CategoryController extends Controller
//显示文章列表
public function list(Category $category)
{
$articles = Article::where('category_id', $category->id)->where('status', 1)->paginate();
$parent = getTopCate($category->id);
$take = 15;
$template = 'category.list';
return view('category.list', compact('category', 'parent', 'articles'));
if (in_array($category->id, [29, 30])) {
$take = 16;
$template = 'category.persons';
}
$articles = Article::where('category_id', $category->id)
->where('status', 1)
->latest('sort')
->latest()
->paginate($take);
$parent = getTopCate($category->id);
return view($template, compact('category', 'parent', 'articles'));
}
}

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

@@ -20,12 +20,38 @@ class PatentController extends Controller
//显示文章列表
public function list(Request $request)
{
$type = $request->type;
$type = $request->type;
$title = $request->title;
$number = $request->number;
$category_id = $request->category_id;
$nickname = $request->nickname;
$publication = $request->publication;
$year = $request->year;
$patents = Patent::where('status', 1)
->when($type, function ($q) use ($type) {
$q->where('type', $type);
})
->when($title, function ($q) use ($title) {
$q->where('title', 'like', "%{$title}%");
})
->when($number, function ($q) use ($number) {
$q->where('number', $number);
})
->when($category_id, function ($q) use ($category_id) {
$q->where('category_id', $category_id);
})
->when($nickname, function ($q) use ($nickname) {
$q->where('nickname', 'like', "%{$nickname}%");
})
->when($publication, function ($q) use ($publication) {
$q->where('publication', $publication);
})
->when($year, function ($q) use ($year) {
$q->where('year', 'like', "%{$year}%");
})
->latest('sort')
->latest()
->paginate();
return view('patents.list', compact('patents'));

2
resources/views/articles/show.blade.php
View File

@@ -11,7 +11,7 @@
<p class="details-time">{{ $article->created_at }}</p>
<!-- 文章详情 -->
<div class="details-content">
<img src="{{ $article->cover_path }}">
{{-- <img src="{{ $article->cover_path }}">--}}
{!! $article->content !!}
</div>

8
resources/views/category/kxyj.blade.php
View File

@@ -65,7 +65,9 @@
<ul class="kycc-border">
<li>
<div class="lw lw-lg">
<div class="lw-left lw-left-lg">论</br>文</div>
<div class="lw-left lw-left-lg" data-href="{{ route('patents.list',['type'=>'paper']) }}">
论</br>文
</div>
<ul class="lw-center">
@if(getPatent(8,'paper')->isNotEmpty())
@foreach (getPatent(8,'paper') as $paper)
@@ -79,7 +81,9 @@
</li>
<li>
<div class="lw lw-lg">
<div class="lw-left lw-left-lg">专</br>利</div>
<div class="lw-left lw-left-lg" data-href="{{ route('patents.list',['type'=>'patent']) }}">
专</br>利
</div>
<ul class="lw-center">
@if(getPatent(8,'patent')->isNotEmpty())
@foreach (getPatent(8,'patent') as $patent)

22
resources/views/category/list.blade.php
View File

@@ -42,22 +42,14 @@
@endif
</ul>
<!-- 分页 -->
<div class="pages">
@if ($articles->isNotEmpty())
{{ $articles->links('layouts.pagination') }}
@endif
</div>
</div>
<!-- 分页 -->
<div class="pages">
@if ($articles->isNotEmpty())
{{ $articles->links('layouts.pagination') }}
@endif
{{-- <a href="#">上一页</a>--}}
{{-- <a href="#" class="show">1</a>--}}
{{-- <a href="#">2</a>--}}
{{-- <a href="#">3</a>--}}
{{-- <a href="#">4</a>--}}
{{-- <a href="#">5</a>--}}
{{-- <a href="#">...</a>--}}
{{-- <a href="#">10</a>--}}
{{-- <a href="#">下一页</a>--}}
</div>
</div>
<!-- end content -->
@endsection

54
resources/views/category/persons.blade.php Normal file
View File

@@ -0,0 +1,54 @@
@extends('layouts.app')
@section('title', $category->title)
@section('content')
<!-- content -->
<div class="container mian">
<!-- content-nav -->
<nav class="mian-nav">
@if($parent->cover_path)
<img class="mian-nav-cover" src="{{ $parent->cover_path }}" alt="导航封面">
@endif
<ul class="mian-nav-ul">
@if ($parent->children->isNotEmpty())
@foreach ($parent->children as $children)
<li class="show">
<a href="{{ $children->link }}">{{ $children->title }}</a>
</li>
@endforeach
@endif
</ul>
</nav>
<!-- content-content -->
<div class="mian-content">
<div class="mian-content-header">
<a href="#">首页</a>
<i class="fa fa-caret-right"></i>
<a href="{{ $category->link }}">{{ $category->title }}</a>
</div>
<!-- 文章列表 -->
<ul class="rcdw">
@if ($articles->isNotEmpty())
@foreach ($articles as $article)
<li class="rcdw-xh" data-href="{{ $article->link }}">
<span class="rcdw-cover" style="background-image: url({{ $article->cover_path }});"></span>
<div class="rcdw-xxh">
<h3>{{ $article->title }}</h3>
<p>{{ $article->job }}</p>
</div>
</li>
@endforeach
@endif
</ul>
<!-- 分页 -->
<div class="pages">
@if ($articles->isNotEmpty())
{{ $articles->links('layouts.pagination') }}
@endif
</div>
</div>
</div>
<!-- end content -->
@endsection

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

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

4
resources/views/layouts/header.blade.php
View File

@@ -249,7 +249,9 @@
<a class="nav-talent-team-item" style="background-image: url({{ $children->cover_path }});" href="{{ $children->link }}"></a>
@endforeach
@endif
<a class="nav-talent-team-item" style="background-image: url({{ getOneCategory(58,'title') }});" href="{{ getOneCategory(58,'link') }}"></a>
@if (getOneCategory(58,'cover_path'))
<a class="nav-talent-team-item" style="background-image: url({{ getOneCategory(58,'cover_path') }});" href="{{ getOneCategory(58,'link') }}"></a>
@endif
</div>
</div>

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

@@ -9,7 +9,7 @@
<nav class="mian-nav">
<ul class="mian-nav-ul">
<li class="show">
<a href="{{ route('patents.list',['type'=>'pager']) }}">论文</a>
<a href="{{ route('patents.list',['type'=>'paper']) }}">论文</a>
</li>
<li class="show">
<a href=" {{ route('patents.list',['type'=>'patent']) }}">专利</a>
@@ -21,30 +21,16 @@
<div class="mian-content-header">
<a href="#">首页</a>
<i class="fa fa-caret-right"></i>
<a href="{{ url()->current() }}">论文/专利</a>
<a href="{{ url()->current() }}">{{ request()->type=='patent'?'专利':'论文' }}</a>
</div>
<!-- 文章列表 -->
<ul class="results-news-ul">
@if ($patents->isNotEmpty())
@foreach ($patents as $patent)
<li>
<a class="nowrap" href="{{ $patent->link }}">
<i class="fa fa-angle-double-right"></i>
{{ $patent->title }}
<span>{{ $patent->created_at->format('Y-m-d') }}</span>
</a>
</li>
@endforeach
@endif
</ul>
@include('patents.'.request()->type, ['patents' => $patents])
</div>
<!-- 分页 -->
<div class="pages">
@if ($patents->isNotEmpty())
{{ $patents->links('layouts.pagination') }}
@endif
</div>
{{-- <div class="pages">--}}
{{-- @if ($patents->isNotEmpty())--}}
{{-- {{ $patents->links('layouts.pagination') }}--}}
{{-- @endif--}}
{{-- </div>--}}
</div>
<!-- end content -->
@endsection

50
resources/views/patents/paper.blade.php Normal file
View File

@@ -0,0 +1,50 @@
<!-- 论文搜索 -->
<form class="paper-form" action="{{ url()->current()}}">
<label class="paper-form-title">
论文搜索
</label>
<ul class="paper-form-ul">
<li class="paper-form-inputs">
<label>论文题目</label>
<input name="title" value="{{ request()->title }}" placeholder="输入论文题目"/>
</li>
<li class="paper-form-inputs">
<label>论文作者</label>
<input name="nickname" value="{{ request()->nickname }}" placeholder="输入论文题目"/>
</li>
<li class="paper-form-inputs">
<label>刊物名称</label>
<input name="publication" value="{{ request()->publication }}" placeholder="输入论文题目"/>
</li>
<li class="paper-form-inputs">
<label>发表年度</label>
<select name="year">
<option value="">{{ $i }}选择年度</option>
@for ($i = 2020; $i > 2000; $i--)
<option value="{{ $i }}" @if (request()->year==$i) selected @endif>{{ $i }}年度</option>
@endfor
</select>
</li>
</ul>
<input type="hidden" name="type" value="{{ request()->type }}">
<button class="paper-form-btn" type="submit">搜索</button>
</form>
<!-- 论文表格 -->
<table class="paper-table" border="1" bordercolor="#d1d1d1">
<tr>
<th width="500">论文题目</th>
<th>刊物名称</th>
<th>刊物作者</th>
<th>发表年度</th>
</tr>
@foreach ($patents as $patent)
<tr data-herf="{{ $patent->link }}">
<td>{{ $patent->title }}</td>
<td>{{ $patent->publication }}</td>
<td>{{ $patent->nickname }}</td>
<td>{{ $patent->created_at->format('Y-m-d') }}</td>
</tr>
@endforeach
</table>

53
resources/views/patents/patent.blade.php Normal file
View File

@@ -0,0 +1,53 @@
<form class="paper-form" action="{{ url()->current()}}">
<label class="paper-form-title">
专利搜索
</label>
<ul class="paper-form-ul">
<li class="paper-form-inputs">
<label>专利题目</label>
<input name="title" value="{{ request()->title }}" placeholder="输入论文题目"/>
</li>
<li class="paper-form-inputs">
<label>专利类别</label>
<select name="category_id">
@if (getCateChild(16)->isNotEmpty())
<option value="">专利类别</option>
@foreach (getCateChild(16) as $child)
<option value="{{ $child->id }}" @if($child->id==request()->category_id) selected @endif>{{ $child->title }}</option>
@endforeach
@endif
</select>
</li>
<li class="paper-form-inputs">
<label>专利号</label>
<input name="number" value="{{ request()->number }}" placeholder="输入论文题目"/>
</li>
<li class="paper-form-inputs">
<label>第一发明人</label>
<input name="nickname" value="{{ request()->nickname }}" placeholder="输入论文题目"/>
</li>
</ul>
<input type="hidden" name="type" value="{{ request()->type }}">
<button class="paper-form-btn" type="submit">搜索</button>
</form>
<!-- 论文表格 -->
<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
<tr>
<th width="500">专利名称</th>
<th>专利号</th>
<th>专利类别</th>
<th>申请日期</th>
<th>第一发明人</th>
</tr>
@foreach ($patents as $patent)
<tr data-href="{{ $patent->link }}">
<td>{{ $patent->title }}</td>
<td>{{ $patent->number }}</td>
<td>{{ $patent->category->title }}</td>
<td>{{ $patent->application }}</td>
<td>{{ $patent->nickname }}</td>
</tr>
@endforeach
</table>

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

@@ -9,9 +9,42 @@
<!-- 文章标题 -->
<h3 class="details-title">{{ $patent->title }}</h3>
<p class="details-time">{{ $patent->created_at }}</p>
<!-- 文章详情 -->
@if ($patent->type=='patent')
<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
<tr>
<th width="500">专利名称</th>
<th>专利号</th>
<th>专利类别</th>
<th>申请日期</th>
<th>第一发明人</th>
</tr>
<tr>
<td>{{ $patent->title }}</td>
<td>{{ $patent->number }}</td>
<td>{{ $patent->category->title }}</td>
<td>{{ $patent->application }}</td>
<td>{{ $patent->nickname }}</td>
</tr>
</table>
@else
<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
<tr>
<th width="500">论文题目</th>
<th>刊物名称</th>
<th>刊物作者</th>
<th>发表年度</th>
</tr>
<tr>
<td>{{ $patent->title }}</td>
<td>{{ $patent->publication }}</td>
<td>{{ $patent->nickname }}</td>
<td>{{ $patent->created_at->format('Y-m-d') }}</td>
</tr>
</table>
@endif
<!-- 文章详情 -->
<div class="details-content">
<img src="{{ $patent->cover_path }}">
{{-- <img src="{{ $patent->cover_path }}">--}}
{!! $patent->content !!}
</div>