调整导航

app/Admin/Controllers/Article/IndexController.php

@@ -56,9 +56,6 @@ class IndexController extends AdminController
                  $form->text('working', '工龄');
                  $form->text('job', '岗位');
              })
-             ->when('in', [56], function (Form $form) {
-                 $form->text('url', '跳转地址');
-             })
              ->rules('required|min:1', [
                  'required' => '必须选择所属分类',
                  'min'      => '必须选择所属分类',

app/Helpers/function.php

@@ -1,99 +1,111 @@
-<?php
-
-use App\Models\Category;
-use App\Models\Article;
-use App\Models\Patent;
-
-function getOneCategory($categoryId, $return = '')
-{
-    $category = Category::find($categoryId);
-    if ($category) {
-        if ($return) {
-            return $category->{$return};
-        }
-
-        return $category;
-    }
-
-    return new Category;
-}
-
-/**
- * Notes: 获取文章分类详情
- * @Author: 玄尘
- * @Date  : 2020/9/10 13:21
- * @param        $categoryId
- * @param string $result
- * @return \App\Models\Article
- */
-function getOneArticleBYCate($categoryId, $result = '')
-{
-    $info = Article::where('category_id', $categoryId)
-                   ->latest('sort')
-                   ->latest()
-                   ->first();
-
-    if ($info) {
-        if ($result) {
-            return $info->{$result};
-        }
-
-        return $info;
-    } else {
-        return '';
-    }
-
-    return new Article;
-}
-
-/**
- * Notes: 获取分类下的文章
- * @Author: 玄尘
- * @Date  : 2020/9/10 10:05
- * @param $categoryId
- * @param $take
- * @return \App\Models\Article
- */
-function getArticlesBYCate($categoryId, $take)
-{
-    $articles = Article::where('category_id', $categoryId)
-                       ->where('status', 1)
-                       ->latest('sort')
-                       ->latest()
-                       ->take($take)
-                       ->get();
-
-    return $articles;
-}
-
-//获取子分类
-function getCateChild($categoryId)
-{
-    return Category::where('status', 1)
-                   ->where('parent_id', $categoryId)
-                   ->orderBy('order', 'asc')
-                   ->get();
-}
-
-//获取顶级分类
-function getTopCate($categoryId)
-{
-    $parent = Category::find($categoryId);
-
-    while ($parent->parent_id != 0) {
-        $parent = $parent->parent;
-    }
-
-    return $parent;
-}
-
-//获取专利和论文
-function getPatent($take, $type = '')
-{
-    return Patent::where('status', 1)
-                 ->when($type, function ($q) use ($type) {
-                     $q->where('type', $type);
-                 })
-                 ->get();
-
-}
+<?php
+
+use App\Models\Advert;
+use App\Models\Category;
+use App\Models\Article;
+use App\Models\Patent;
+
+function getOneCategory($categoryId, $return = '')
+{
+    $category = Category::find($categoryId);
+    if ($category) {
+        if ($return) {
+            return $category->{$return};
+        }
+
+        return $category;
+    }
+
+    return new Category;
+}
+
+/**
+ * Notes: 获取文章分类详情
+ * @Author: 玄尘
+ * @Date  : 2020/9/10 13:21
+ * @param        $categoryId
+ * @param string $result
+ * @return \App\Models\Article
+ */
+function getOneArticleBYCate($categoryId, $result = '')
+{
+    $info = Article::where('category_id', $categoryId)
+                   ->latest('sort')
+                   ->latest()
+                   ->first();
+
+    if ($info) {
+        if ($result) {
+            return $info->{$result};
+        }
+
+        return $info;
+    } else {
+        return '';
+    }
+
+    return new Article;
+}
+
+/**
+ * Notes: 获取分类下的文章
+ * @Author: 玄尘
+ * @Date  : 2020/9/10 10:05
+ * @param $categoryId
+ * @param $take
+ * @return \App\Models\Article
+ */
+function getArticlesBYCate($categoryId, $take)
+{
+    $articles = Article::where('category_id', $categoryId)
+                       ->where('status', 1)
+                       ->latest('sort')
+                       ->latest()
+                       ->take($take)
+                       ->get();
+
+    return $articles;
+}
+
+//获取子分类
+function getCateChild($categoryId)
+{
+    return Category::where('status', 1)
+                   ->where('parent_id', $categoryId)
+                   ->orderBy('order', 'asc')
+                   ->get();
+}
+
+//获取顶级分类
+function getTopCate($categoryId)
+{
+    $parent = Category::find($categoryId);
+
+    while ($parent->parent_id != 0) {
+        $parent = $parent->parent;
+    }
+
+    return $parent;
+}
+
+//获取专利和论文
+function getPatent($take, $type = '')
+{
+    return Patent::where('status', 1)
+                 ->when($type, function ($q) use ($type) {
+                     $q->where('type', $type);
+                 })
+                 ->get();
+
+}
+
+//获取一个图片
+function getOneAdvert($category_id, $value = '')
+{
+    $info = Advert::where('category_id', $category_id)->first();
+    if ($value) {
+        return $info->{$value};
+    }
+
+    return $info;
+}

resources/views/category/person.blade.php

@@ -0,0 +1,55 @@
+@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="results-news-ul">
+                @if ($articles->isNotEmpty())
+                    @foreach ($articles as $article)
+                        <li>
+                            <a class="nowrap" href="{{ $article->link }}">
+                                <i class="fa fa-angle-double-right"></i>
+                                {{ $article->title }}
+                                <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                            </a>
+                        </li>
+                    @endforeach
+                @endif
+
+            </ul>
+            <!-- 分页 -->
+            <div class="pages">
+                @if ($articles->isNotEmpty())
+                    {{ $articles->links('layouts.pagination') }}
+                @endif
+            </div>
+        </div>
+
+    </div>
+    <!-- end content -->
+@endsection

resources/views/category/zzjg.blade.php

@@ -81,7 +81,7 @@
                 </li>
             </ul>
             <!-- 历史沿革 -->
-            <div class="sub-title">
+            <div class="sub-title" id="lsyg">
                 <b><i class="fa fa-clock-o"></i>{{ getOneCategory(50,'title') }}</b>
             </div>
             <div class="org-history">

resources/views/layouts/app.blade.php

@@ -3,6 +3,8 @@
 <head>
     <meta charset="utf-8"/>
     <title>@section('title'){{ config('app.name', '') }}@show</title>
+    <meta content="黑龙江省科学院智能制造研究所" name="Keywords">
+    <meta content="黑龙江省科学院智能制造研究所" name="description">
     <link rel="icon" href="{{ asset('assets/index/img/favicon.ico') }}" mce_href="favicon.ico" type="image/x-icon">
     <link rel="stylesheet" type="text/css" href="{{ asset('assets/index/css/font-awesome.min.css') }}"/>
     <link rel="stylesheet" type="text/css" href="{{ asset('assets/index/css/swiper.min.css') }}"/>
@@ -11,80 +13,80 @@
     @yield('js')
 </head>
 <body>
-<!-- tool -->
-<div class="tool">
-    <div class="container tool-content">
-        <div class="tool-herf">
-            <a href="#">联系我们</a>
-            <span>/</span>
-            <a href="#">网站地图</a>
-            <span>/</span>
-            <a href="#">电子邮箱</a>
-        </div>
-        <form class="tool-search" action="{{ route('article.search') }}">
-            <input name="title" placeholder="输入关键字搜索"/>
-            <button type="submit">
-                <i class="fa fa-search"></i>
-            </button>
-        </form>
-    </div>
-</div>
-<!-- end tool -->
-<!-- header -->
-<header class="header">
-    <div class="container header-content">
-        <img class="header-logo" src="{{ asset('assets/index/img/logo.png') }}" alt="黑龙江省科学院智能制造研究所">
-        <div class="header-text">
-            <p>面向世界科技前沿，面向国家重大需求，面向国民经济主战场，面向人民生命健康，率先实现科学技术跨越发展，率先建成国家创新人才高地，率先建成国家高水平科技智库，率先建设国际一流科研机构。</p>
-            <p class="header-text-sign">——智能制造所办所方针</p>
-        </div>
-    </div>
-</header>
-<!-- end header -->
-
-<!-- Laytool -->
-<div class="laytool" style="display: none">
-    <ul class="laytool-ul">
-        <li>
-            <div class="wechat-code" class="wechat-code">
-                <img class="i" src="{{ asset('assets/index/img/z19_ewm3.jpg') }}">
+    <!-- tool -->
+    <div class="tool">
+        <div class="container tool-content">
+            <div class="tool-herf">
+                <a href="#">联系我们</a>
+                <span>/</span>
+                <a href="#">网站地图</a>
+                <span>/</span>
+                <a href="#">电子邮箱</a>
             </div>
-        </li>
-    </ul>
-</div>
-<!-- end Laytool -->
+            <form class="tool-search" action="{{ route('article.search') }}">
+                <input name="title" placeholder="输入关键字搜索"/>
+                <button type="submit">
+                    <i class="fa fa-search"></i>
+                </button>
+            </form>
+        </div>
+    </div>
+    <!-- end tool -->
+    <!-- header -->
+    <header class="header">
+        <div class="container header-content">
+            <img class="header-logo" src="{{ asset('assets/index/img/logo.png') }}" alt="黑龙江省科学院智能制造研究所">
+            <div class="header-text">
+                <p>面向世界科技前沿，面向国家重大需求，面向国民经济主战场，面向人民生命健康，率先实现科学技术跨越发展，率先建成国家创新人才高地，率先建成国家高水平科技智库，率先建设国际一流科研机构。</p>
+                <p class="header-text-sign">——智能制造所办所方针</p>
+            </div>
+        </div>
+    </header>
+    <!-- end header -->
 
-@include('layouts.header')
+    <!-- Laytool -->
+    <div class="laytool" style="display: none">
+        <ul class="laytool-ul">
+            <li>
+                <div class="wechat-code" class="wechat-code">
+                    <img class="i" src="{{ asset('assets/index/img/z19_ewm3.jpg') }}">
+                </div>
+            </li>
+        </ul>
+    </div>
+    <!-- end Laytool -->
 
-@section('content')
+    @include('layouts.header')
 
-@show
+    @section('content')
 
-@if ($links->isNotEmpty())
+    @show
+
+    @if ($links->isNotEmpty())
     <!-- href -->
     <div class="footer-href">
         <div class="container href-flex">
             @foreach ($links as $link)
-                <a href="{{ $link->url }}" target="_Blank">{{ $link->title}}</a>
+            <a href="{{ $link->url }}" target="_Blank">{{ $link->title}}</a>
             @endforeach
         </div>
     </div>
     <!-- end href -->
-@endif
-<!-- footer -->
-<footer class="footer">
-    <p>版权所有黑龙江省科学院&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;黑ICP备2020005648号-1</p>
-    <p>地址：黑龙江省哈尔滨市南岗区汉水路165号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;邮政编码：150090</p>
-    <p>电话：86-451-82305698&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eMail：webmaster@haai.com.cn</p>
-    <p>© CopyRight 2002-2012,The Instiute of Automation heilongjiang academy of sciences All rights reserved.</p>
-    <img src="{{ asset('assets/index/img/blue.png') }}" alt="事业单位">
-</footer>
-<!-- end footer -->
-<!-- script -->
-<script src="{{ asset('assets/index/js/jquery.min.js') }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ asset('assets/index/js/swiper.min.js') }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ asset('assets/index/js/cjango.js') }}" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript">
+    @endif
+    <!-- footer -->
+    <footer class="footer">
+        <p>版权所有：黑龙江省科学院智能制造研究所&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="https://beian.miit.gov.cn/" style="color: white">黑ICP备2020005648号-1</a></p>
+        <p>地址：黑龙江省哈尔滨市南岗区汉水路165号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;邮政编码：150090</p>
+        <p>电话：0451-82300045&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eMail：webmaster@haai.com.cn</p>
+        <p>© CopyRight 2020-2030,Heilongjiang Academy of Sciences Intelligent Manufacturing Research Institute.</p>
+        <img src="{{ asset('assets/index/img/blue.png') }}" alt="事业单位">
+    </footer>
+    <!-- end footer -->
+    <!-- script -->
+    <script src="{{ asset('assets/index/js/jquery.min.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ asset('assets/index/js/swiper.min.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ asset('assets/index/js/cjango.js') }}" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript">
 
     // 导航栏
     $(function () {

resources/views/layouts/header.blade.php

@@ -216,27 +216,31 @@
                     </div>
                 </div>
             </li>
+            {{-- 人才队伍--}}
             <li class="nav-ul-li @if (isset($parent) && $parent->id==config('haai.category.rcdw')) show @endif">
                 <a href="{{ getOneCategory(config('haai.category.rcdw'),'link') }}">{{ getOneCategory(config('haai.category.rcdw'),'title') }}</a>
                 <div class="nav-layer hide">
                     <div class="nav-layer-item nav-talent-left">
                         <!-- 高级职称专家 -->
-                        <div class="nav-layer-title">
-                            <span>{{ getOneCategory(29,'title') }}</span>
+                        {{-- <div class="nav-layer-title">--}}
+                        {{--                            <span>{{ getOneCategory(29,'title') }}</span>--}}
+                        {{--                        </div>--}}
+                        {{--                        <ul class="nav-talent-ul">--}}
+                        {{--                            @if (getArticlesBYCate(29,14)->isNotEmpty())--}}
+                        {{--                                @foreach (getArticlesBYCate(29,14) as $article)--}}
+                        {{--                                    <li>--}}
+                        {{--                                        <a href="{{  $article->link }}">--}}
+                        {{--                                            <span class="nav-talent-cover" style="background-image: url({{ $article->cover_path }});"></span>--}}
+                        {{--                                            <h3 class="nowrap nav-talent-name">{{ $article->title }}</h3>--}}
+                        {{--                                            <p class="nowrap nav-talent-job">{{ $article->job }}</p>--}}
+                        {{--                                        </a>--}}
+                        {{--                                    </li>--}}
+                        {{--                                @endforeach--}}
+                        {{--                            @endif--}}
+                        {{--                        </ul>--}}
+                        <div style="text-align:center">
+                            <img src="{{ getOneAdvert(61,'cover_path') }}" style="width:100%;margin-top:17px" alt="">
                         </div>
-                        <ul class="nav-talent-ul">
-                            @if (getArticlesBYCate(29,14)->isNotEmpty())
-                                @foreach (getArticlesBYCate(29,14) as $article)
-                                    <li>
-                                        <a href="{{  $article->link }}">
-                                            <span class="nav-talent-cover" style="background-image: url({{ $article->cover_path }});"></span>
-                                            <h3 class="nowrap nav-talent-name">{{ $article->title }}</h3>
-                                            <p class="nowrap nav-talent-job">{{ $article->job }}</p>
-                                        </a>
-                                    </li>
-                                @endforeach
-                            @endif
-                        </ul>
                     </div>
                     <div class="nav-layer-item nav-talent-right">
                         <!-- 省级领军人才梯队 -->