From ce6b658841713f6d8af0418e08038db8bef0bebc Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Wed, 1 Dec 2021 16:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AE=80=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Resume/IndexController.php    | 19 ++++----
 app/Models/Resume.php                         | 20 ++++++++
 resources/views/resume/show.blade.php         | 46 +++++++------------
 3 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/app/Admin/Controllers/Resume/IndexController.php b/app/Admin/Controllers/Resume/IndexController.php
index 430f7bb..e5e5fd0 100644
--- a/app/Admin/Controllers/Resume/IndexController.php
+++ b/app/Admin/Controllers/Resume/IndexController.php
@@ -66,18 +66,19 @@ class IndexController extends AdminController
 
         $form->embeds('information', '基本信息', function ($form) {
             $form->text('duty', '职务');
-            $form->text('rank', '职称')->required();
-            $form->text('education', '学历')->required();
-            $form->text('mobile', '电话')->required();
-            $form->text('email', '电子邮件')->required();
-            $form->text('address', '通讯地址')->required();
+            $form->text('rank', '职称');
+            $form->text('education', '学历');
+            $form->text('mobile', '电话');
+            $form->text('email', '电子邮件');
+            $form->text('address', '通讯地址');
+            $form->text('part_job', '学术兼职');
         });
 
 
-        $form->textarea('direction', '研究方向');
-        $form->ueditor('content', '简历')->rules('required', ['required' => '简历不能为空']);
-        $form->ueditor('outcome', '代表成果')->rules('required', ['required' => '代表成果不能为空']);
-        $form->ueditor('project', '承担科研项目情况')->rules('required', ['required' => '承担科研项目情况不能为空']);
+        $form->ueditor('direction', '主要科研项目')->required();
+//        $form->ueditor('content', '简历')->rules('required', ['required' => '简历不能为空']);
+        $form->ueditor('outcome', '成果获奖情况')->required();
+        $form->ueditor('project', '发表专著及论文选列')->required();
         $form->datetime('created_at', '发布时间');
 
         $form->switch('status', '状态')->default(1);
diff --git a/app/Models/Resume.php b/app/Models/Resume.php
index c84daa5..6111de9 100644
--- a/app/Models/Resume.php
+++ b/app/Models/Resume.php
@@ -57,9 +57,29 @@ class Resume extends Model
      * @Date: 2021/12/1 13:11
      * @param $key
      * @param  string  $default
+     * @return array|\ArrayAccess|mixed
      */
     public function getInformation($key, string $default = '')
     {
         return Arr::get($this->information, $key, $default);
     }
+
+    /**
+     * Notes: 获取基本信息名称
+     *
+     * @Author: 玄尘
+     * @Date: 2021/12/1 15:53
+     */
+    public function getInformationName($key): string
+    {
+        return [
+                   'duty'      => '职务',
+                   'rank'      => '职称',
+                   'education' => '学历',
+                   'mobile'    => '电话',
+                   'email'     => '电子邮件',
+                   'address'   => '通讯地址',
+                   'part_job'  => '学术兼职',
+               ][$key] ?? '未知';
+    }
 }
diff --git a/resources/views/resume/show.blade.php b/resources/views/resume/show.blade.php
index 1f736dc..46eb189 100644
--- a/resources/views/resume/show.blade.php
+++ b/resources/views/resume/show.blade.php
@@ -22,26 +22,14 @@
                             <div class="tdrcBrief">
                                 <div class="tdrcBrief-name"><span>{{ $resume->name }}</span></div>
                                 <ul class="tdrcBrief-label">
-                                    @if($resume->getInformation('duty'))
-                                        <li>
-                                            <span>职务：</span>{{ $resume->getInformation('duty') }}
-                                        </li>
-                                    @endif
-                                    <li>
-                                        <span>职称：</span>{{ $resume->getInformation('rank') }}
-                                    </li>
-                                    <li>
-                                        <span>学历：</span>{{ $resume->getInformation('education') }}
-                                    </li>
-                                    <li>
-                                        <span>电话：</span>{{ $resume->getInformation('mobile') }}
-                                    </li>
-                                    <li>
-                                        <span>电子邮件：</span>{{ $resume->getInformation('email') }}
-                                    </li>
-                                    <li>
-                                        <span>通讯地址：</span>{{ $resume->getInformation('address') }}
-                                    </li>
+                                    @foreach($resume->information as $key=>$value)
+                                        @if($value)
+                                            <li>
+                                                <span>{{ $resume->getInformationName($key) }}：</span>
+                                                {{ $value }}
+                                            </li>
+                                        @endif
+                                    @endforeach
                                 </ul>
                             </div>
                             <div class="ce-img tdrcImg">
@@ -49,26 +37,26 @@
                             </div>
                         </div>
                         <div class="tdrcCont">
+                            {{--                            <div class="tdrcCont-label">--}}
+                            {{--                                <div class="tdrcCont-title">简历</div>--}}
+                            {{--                                <div class="tdrcCont-text">--}}
+                            {{--                                    {!! $resume->content !!}--}}
+                            {{--                                </div>--}}
+                            {{--                            </div>--}}
                             <div class="tdrcCont-label">
-                                <div class="tdrcCont-title">简历</div>
-                                <div class="tdrcCont-text">
-                                    {!! $resume->content !!}
-                                </div>
-                            </div>
-                            <div class="tdrcCont-label">
-                                <div class="tdrcCont-title">研究方向</div>
+                                <div class="tdrcCont-title">主要科研项目</div>
                                 <div class="tdrcCont-text">
                                     {{ $resume->direction }}
                                 </div>
                             </div>
                             <div class="tdrcCont-label">
-                                <div class="tdrcCont-title">代表成果</div>
+                                <div class="tdrcCont-title">成果获奖情况</div>
                                 <div class="tdrcCont-text">
                                     {!! $resume->outcome !!}
                                 </div>
                             </div>
                             <div class="tdrcCont-label">
-                                <div class="tdrcCont-title">承担科研项目情况</div>
+                                <div class="tdrcCont-title">发表专著及论文选列</div>
                                 <div class="tdrcCont-text">
                                     {!! $resume->project !!}
                                 </div>