Skip to content

M
media-resource
Commit 2245b168 by 杨昕
Options

添加时间选择器

parent b21c1893
Pipeline #9889 passed with stages
in 33 seconds
Showing with 252 additions and 19 deletions
app/Model/MediaModel.php
...@@ -52,23 +52,30 @@ class MediaModel extends Eloquent ...@@ -52,23 +52,30 @@ class MediaModel extends Eloquent
$sort = 1; $sort = 1;
} }
if (isset($request->media_id)){ if (isset($request->media_id) && empty($request->media_id)){
$aggregate[]['$match']['_id'] = $request->media_id; $aggregate[]['$match']['_id'] = $request->media_id;
} }
if (isset($request->media_name)){ if (isset($request->media_name) && empty($request->media_name)){
$aggregate[]['$match']['media_name'] = ['$regex' => $request->media_name ]; $aggregate[]['$match']['media_name'] = ['$regex' => $request->media_name ];
} }
if (isset($request->username)){ if (isset($request->username) && !empty($request->username)){
$aggregate[]['$match']['username'] = $request->username; $aggregate[]['$match']['username'] = $request->username;
} }
if (isset($request->desciption)){ if (isset($request->desciption) && !empty($request->desciption)){
$aggregate[]['$match']['description'] = ['$regex' => $request->description ]; $aggregate[]['$match']['description'] = ['$regex' => $request->description ];
} }
if (isset($request->start_time)&& !empty($request->start_time)){
$aggregate[]['$match']['start_time'] = ['$gt' => $request->start_time ];
}
if (isset($request->end_time)&& !empty($request->end_time)){
$aggregate[]['$match']['end_time'] = ['$lt' => $request->end_time ];
}
$aggregate[]['$sort'] = ['create_time' => $sort]; $aggregate[]['$sort'] = ['create_time' => $sort];
$count = sizeof($collection->aggregate($aggregate)->toArray()); $count = sizeof($collection->aggregate($aggregate)->toArray());
......
public/xadmin/extra/date/datepicker.css 0 → 100755
/*!
* Datepicker v1.0.9
* https://fengyuanchen.github.io/datepicker
*
* Copyright 2014-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2019-09-21T06:57:30.334Z
*/
.datepicker-container {
background-color: #fff;
direction: ltr;
font-size: 12px;
left: 0;
line-height: 30px;
position: fixed;
-webkit-tap-highlight-color: transparent;
top: 0;
-ms-touch-action: none;
touch-action: none;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
width: 210px;
z-index: -1;
}
.datepicker-container::before,
.datepicker-container::after {
border: 5px solid transparent;
content: " ";
display: block;
height: 0;
position: absolute;
width: 0;
}
.datepicker-dropdown {
border: 1px solid #ccc;
-webkit-box-shadow: 0 3px 6px #ccc;
box-shadow: 0 3px 6px #ccc;
-webkit-box-sizing: content-box;
box-sizing: content-box;
position: absolute;
z-index: 1;
}
.datepicker-inline {
position: static;
}
.datepicker-top-left,
.datepicker-top-right {
border-top-color: #39f;
}
.datepicker-top-left::before,
.datepicker-top-left::after,
.datepicker-top-right::before,
.datepicker-top-right::after {
border-top: 0;
left: 10px;
top: -5px;
}
.datepicker-top-left::before,
.datepicker-top-right::before {
border-bottom-color: #39f;
}
.datepicker-top-left::after,
.datepicker-top-right::after {
border-bottom-color: #fff;
top: -4px;
}
.datepicker-bottom-left,
.datepicker-bottom-right {
border-bottom-color: #39f;
}
.datepicker-bottom-left::before,
.datepicker-bottom-left::after,
.datepicker-bottom-right::before,
.datepicker-bottom-right::after {
border-bottom: 0;
bottom: -5px;
left: 10px;
}
.datepicker-bottom-left::before,
.datepicker-bottom-right::before {
border-top-color: #39f;
}
.datepicker-bottom-left::after,
.datepicker-bottom-right::after {
border-top-color: #fff;
bottom: -4px;
}
.datepicker-top-right::before,
.datepicker-top-right::after,
.datepicker-bottom-right::before,
.datepicker-bottom-right::after {
left: auto;
right: 10px;
}
.datepicker-panel > ul {
margin: 0;
padding: 0;
width: 102%;
}
.datepicker-panel > ul::before,
.datepicker-panel > ul::after {
content: " ";
display: table;
}
.datepicker-panel > ul::after {
clear: both;
}
.datepicker-panel > ul > li {
background-color: #fff;
cursor: pointer;
float: left;
height: 30px;
list-style: none;
margin: 0;
padding: 0;
text-align: center;
width: 30px;
}
.datepicker-panel > ul > li:hover {
background-color: rgb(229, 242, 255);
}
.datepicker-panel > ul > li.muted,
.datepicker-panel > ul > li.muted:hover {
color: #999;
}
.datepicker-panel > ul > li.highlighted {
background-color: rgb(229, 242, 255);
}
.datepicker-panel > ul > li.highlighted:hover {
background-color: rgb(204, 229, 255);
}
.datepicker-panel > ul > li.picked,
.datepicker-panel > ul > li.picked:hover {
color: #39f;
}
.datepicker-panel > ul > li.disabled,
.datepicker-panel > ul > li.disabled:hover {
background-color: #fff;
color: #ccc;
cursor: default;
}
.datepicker-panel > ul > li.disabled.highlighted,
.datepicker-panel > ul > li.disabled:hover.highlighted {
background-color: rgb(229, 242, 255);
}
.datepicker-panel > ul > li[data-view="years prev"],
.datepicker-panel > ul > li[data-view="year prev"],
.datepicker-panel > ul > li[data-view="month prev"],
.datepicker-panel > ul > li[data-view="years next"],
.datepicker-panel > ul > li[data-view="year next"],
.datepicker-panel > ul > li[data-view="month next"],
.datepicker-panel > ul > li[data-view="next"] {
font-size: 18px;
}
.datepicker-panel > ul > li[data-view="years current"],
.datepicker-panel > ul > li[data-view="year current"],
.datepicker-panel > ul > li[data-view="month current"] {
width: 150px;
}
.datepicker-panel > ul[data-view="years"] > li,
.datepicker-panel > ul[data-view="months"] > li {
height: 52.5px;
line-height: 52.5px;
width: 52.5px;
}
.datepicker-panel > ul[data-view="week"] > li,
.datepicker-panel > ul[data-view="week"] > li:hover {
background-color: #fff;
cursor: default;
}
.datepicker-hide {
display: none;
}
public/xadmin/extra/date/datepicker.zh-CN.js 0 → 100644
// datepicker.zh-CN.js
$.fn.datepicker.languages['zh-CN'] = {
format: 'yyyy年mm月dd日',
days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
daysShort: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
daysMin: ['日', '一', '二', '三', '四', '五', '六'],
months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
monthsShort: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
weekStart: 1,
startView: 0,
yearFirst: true,
yearSuffix: '年'
};
\ No newline at end of file
resources/views/admin/media/media_list.blade.php
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@include('admin.common.commonMedia') @include('admin.common.commonMedia')
<link rel="stylesheet" href="{{asset('xadmin/extra/date/datepicker.css')}}">
<link rel="stylesheet" href="{{ asset('xadmin/extra/datepicker/css/daterangepicker.css')}}"> <script src="{{ asset('xadmin/extra/date/datepicker.js')}}"></script>
<link rel="stylesheet" href="{{ asset('xadmin/extra/datepicker/css/htmleaf-demo.css')}}"> <script src="{{ asset('xadmin/extra/date/datepicker.zh-CN.js')}}"></script>
<script src="{{ asset('xadmin/extra/datepicker/js/moment.js')}}"></script>
<script src="{{ asset('xadmin/extra/datepicker/js/daterangepicker.js')}}"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/datepicker/1.0.9/datepicker.common.js"></script>
<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/datepicker/1.0.9/datepicker.css">
<script src="https://cdn.bootcdn.net/ajax/libs/datepicker/1.0.9/datepicker.js"></script>
<body> <body>
<!--==================================================== <!--====================================================
...@@ -46,11 +38,13 @@ ...@@ -46,11 +38,13 @@
<form> <form>
<input type="text" name="media_name" class="form-input" placeholder="请输入媒资名称" value="{{$name}}" autocomplete="off"> <input type="text" name="media_name" class="form-input" placeholder="请输入媒资名称" value="{{$name}}" autocomplete="off">
<input type="text" name="media_id" class="form-input" placeholder="请输入媒资编号" value="{{$media_id}}" autocomplete="off"> <input type="text" style="width: 200px;" name="media_id" class="form-input" placeholder="请输入媒资编号" value="{{$media_id}}" autocomplete="off">
{{--<input id="endDate" width="312" class="form-input" />--}} <input class="form-input" name="start_time" data-toggle="start_time" autocomplete="off" value="{{$start_time}}" placeholder="请输入开始时间"/>
<input class="form-input" name="end_time" data-toggle="end_time" autocomplete="off" value="{{$end_time}}" placeholder="请输入结束时间"/>
<button type="submit" class="btn btn-primary">搜索</button> <button type="submit" class="btn btn-primary">搜索</button>
</form> </form>
{{--<span style="display: inline-block;height: 40px;line-height: 40px; float: right">共{{$users->total()}}条</span>--}} <span style="display: inline-block;height: 40px;line-height: 40px; float: right">共{{$medias->total()}}条</span>
</div> </div>
<table class="table table-hover"> <table class="table table-hover">
...@@ -226,6 +220,18 @@ ...@@ -226,6 +220,18 @@
} }
$(function () {
$('[data-toggle="start_time"]').datepicker({
format: 'yyyy-mm-dd',
language: 'zh-CN',
});
$('[data-toggle="end_time"]').datepicker({
format: 'yyyy-mm-dd',
language: 'zh-CN',
});
})
</script> </script>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment