按需求调整

This commit is contained in:
2021-12-09 16:11:21 +08:00
parent 40b700b091
commit 9871830e9c
4 changed files with 45 additions and 33 deletions

View File

@@ -36,6 +36,7 @@ class IndexController extends AdminController
$grid->column('cover', '封面图片')->image('', 100); $grid->column('cover', '封面图片')->image('', 100);
$grid->column('category.title', '所属分类'); $grid->column('category.title', '所属分类');
$grid->column('status', '状态')->switch(); $grid->column('status', '状态')->switch();
$grid->column('sort', '序号')->editable();
$grid->column('created_at', '创建时间'); $grid->column('created_at', '创建时间');
return $grid; return $grid;
} }
@@ -49,8 +50,7 @@ class IndexController extends AdminController
$form->image('cover', '封面') $form->image('cover', '封面')
->move('person/'.date('Y/m/d')) ->move('person/'.date('Y/m/d'))
->removable() ->removable()
->uniqueName() ->uniqueName();
->required();
$form->select('category_id', '所属分类') $form->select('category_id', '所属分类')
->options(function () { ->options(function () {
@@ -66,24 +66,25 @@ class IndexController extends AdminController
$form->embeds('information', '基本信息', function ($form) { $form->embeds('information', '基本信息', function ($form) {
$form->text('duty', '职务'); $form->text('duty', '职务');
$form->text('tenure', '任期'); // $form->text('tenure', '任期');
$form->text('rank', '职称'); $form->text('rank', '职称');
$form->text('education', '学历'); $form->text('education', '学历');
$form->text('mobile', '电话'); // $form->text('mobile', '电话');
$form->text('email', '电子邮件'); $form->text('email', '电子邮件');
$form->text('address', '通讯地址'); // $form->text('address', '通讯地址');
$form->text('part_job', '学术兼职'); $form->text('direction', '研究方向');
}); });
$form->ueditor('direction', '研究方向')->rules('required', ['required' => '研究方向不能为空']); $form->ueditor('part_job', '学术兼职');
// $form->ueditor('content', '简历')->rules('required', ['required' => '简历不能为空']); // $form->ueditor('content', '简历')->rules('required', ['required' => '简历不能为空']);
$form->ueditor('outcome', '成果获奖情况')->rules('required', ['required' => '成果获奖情况不能为空']); $form->ueditor('outcome', '成果获奖情况');
$form->ueditor('thesis', '发表专著及论文选列')->rules('required', ['required' => '发表专著及论文选列不能为空']); $form->ueditor('thesis', '发表专著及论文选列');
$form->ueditor('project', '主要科研项目')->rules('required', ['required' => '主要科研项目不能为空']); $form->ueditor('project', '主要科研项目');
$form->datetime('created_at', '发布时间'); $form->datetime('created_at', '发布时间');
$form->switch('status', '状态')->default(1); $form->switch('status', '状态')->default(1);
$form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
return $form; return $form;
} }

View File

@@ -33,7 +33,7 @@ class CategoryController extends Controller
->where('status', 1) ->where('status', 1)
->latest('sort') ->latest('sort')
->latest('created_at') ->latest('created_at')
->paginate(8); ->paginate();
$parent = $category; $parent = $category;
if ($category->childrens->isEmpty() && $category->parent) { if ($category->childrens->isEmpty() && $category->parent) {

View File

@@ -450,12 +450,14 @@ img {max-width: 100%;}
.tdrcList-label li a::after{content: '';position: absolute;left: 0;top: 7px;width: 6px;height: 6px;background-color: #fe904f;border-radius: 3px;} .tdrcList-label li a::after{content: '';position: absolute;left: 0;top: 7px;width: 6px;height: 6px;background-color: #fe904f;border-radius: 3px;}
.tdrcTop{overflow: hidden;margin: 20px 0; border-radius: 5px;background: #f4f8fe;padding: 20px; box-sizing: border-box; position: relative;} .tdrcTop{overflow: hidden;margin: 20px 0; border-radius: 5px;background: #f4f8fe;padding: 20px; box-sizing: border-box; position: relative;}
.tdrcBrief{width: calc(100% - 200px);}
.tdrcBrief-name {border-bottom: 1px solid #dce3ef;font-weight: 700;font-size: 22px; margin-bottom: 20px; width: calc(100% - 200px)} .tdrcBrief-name {border-bottom: 1px solid #dce3ef;font-weight: 700;font-size: 22px; margin-bottom: 20px; width: calc(100% - 200px)}
.tdrcBrief-name span {position: relative;display: inline-block;padding-bottom: 10px; } .tdrcBrief-name span {position: relative;display: inline-block;padding-bottom: 10px; }
.tdrcBrief-name span::after{content: '';position: absolute;left: 0;bottom: 0; width: 100%;height: 4px;background-color: #203175;} .tdrcBrief-name span::after{content: '';position: absolute;left: 0;bottom: 0; width: 100%;height: 4px;background-color: #203175;}
.tdrcCont-label {margin-bottom: 30px;} .tdrcCont-label {margin-bottom: 30px;}
.tdrcBrief-label li {line-height: 30px; color: #203175} .tdrcBrief-label li {line-height: 30px; color: #203175; display: flex;}
.tdrcBrief-label li>span {display: inline-block;color: #000; width: 100px; text-align: right; font-weight: 600; margin-right: 20px;} .tdrcBrief-label li>span {display: inline-block;color: #000; width: 100px; text-align: right; font-weight: 600; margin-right: 20px;}
.tdrcBrief-label li>p {width: calc(100% - 120px);}
.tdrcImg {width: 170px; padding-top: 28%; position: absolute; overflow: hidden; top: 30px; right: 20px;} .tdrcImg {width: 170px; padding-top: 28%; position: absolute; overflow: hidden; top: 30px; right: 20px;}
.tdrcCont-title {background: #f4f8fe; line-height: 44px; border-left: #203175 6px solid; padding-left: 15px; font-weight: 700;font-size: 18px; color: #203175; margin-bottom: 20px;} .tdrcCont-title {background: #f4f8fe; line-height: 44px; border-left: #203175 6px solid; padding-left: 15px; font-weight: 700;font-size: 18px; color: #203175; margin-bottom: 20px;}
.tdrcCont-text {font-size: 16px; line-height: 32px;} .tdrcCont-text {font-size: 16px; line-height: 32px;}

View File

@@ -26,7 +26,7 @@
@if($value) @if($value)
<li> <li>
<span>{{ $resume->getInformationName($key) }}</span> <span>{{ $resume->getInformationName($key) }}</span>
{{ $value }} <p>{{ $value }}</p>
</li> </li>
@endif @endif
@endforeach @endforeach
@@ -43,30 +43,39 @@
{{-- {!! $resume->content !!}--}} {{-- {!! $resume->content !!}--}}
{{-- </div>--}} {{-- </div>--}}
{{-- </div>--}} {{-- </div>--}}
<div class="tdrcCont-label"> @if($resume->direction)
<div class="tdrcCont-title">研究方向</div> <div class="tdrcCont-label">
<div class="tdrcCont-text"> <div class="tdrcCont-title">学术兼职</div>
{!! $resume->direction !!} <div class="tdrcCont-text">
{!! $resume->direction !!}
</div>
</div> </div>
</div> @endif
<div class="tdrcCont-label"> @if($resume->project)
<div class="tdrcCont-title">成果获奖情况</div> <div class="tdrcCont-label">
<div class="tdrcCont-text"> <div class="tdrcCont-title">主要科研项目</div>
{!! $resume->outcome !!} <div class="tdrcCont-text">
{!! $resume->project !!}
</div>
</div> </div>
</div> @endif
<div class="tdrcCont-label"> @if($resume->outcome)
<div class="tdrcCont-title">发表专著及论文选列</div> <div class="tdrcCont-label">
<div class="tdrcCont-text"> <div class="tdrcCont-title">成果获奖情况</div>
{!! $resume->thesis !!} <div class="tdrcCont-text">
{!! $resume->outcome !!}
</div>
</div> </div>
</div> @endif
<div class="tdrcCont-label"> @if($resume->thesis)
<div class="tdrcCont-title">主要科研项目</div> <div class="tdrcCont-label">
<div class="tdrcCont-text"> <div class="tdrcCont-title">发表专著及论文选列</div>
{!! $resume->project !!} <div class="tdrcCont-text">
{!! $resume->thesis !!}
</div>
</div> </div>
</div> @endif
</div> </div>
</div> </div>
</div> </div>