Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
7d5167b3
Commit
7d5167b3
authored
Sep 21, 2018
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时间限制&升级到最新版
parent
f89b4215
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
81 additions
and
5 deletions
+81
-5
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.eot
+0
-0
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg
+45
-0
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.ttf
+0
-0
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.woff
+0
-0
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/laydate.css
+0
-3
src/main/resources/static/ajax/libs/layui/lay/modules/laydate.js
+0
-0
src/main/resources/static/ruoyi/js/common.js
+36
-2
No files found.
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.eot
0 → 100644
View file @
7d5167b3
File added
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg
0 → 100644
View file @
7d5167b3
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<!--
2013-9-30: Created.
-->
<svg>
<metadata>
Created by iconfont
</metadata>
<defs>
<font
id=
"laydate-icon"
horiz-adv-x=
"1024"
>
<font-face
font-family=
"laydate-icon"
font-weight=
"500"
font-stretch=
"normal"
units-per-em=
"1024"
ascent=
"896"
descent=
"-128"
/>
<missing-glyph
/>
<glyph
glyph-name=
"x"
unicode=
"x"
horiz-adv-x=
"1001"
d=
"M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z"
/>
<glyph
glyph-name=
"youyou"
unicode=
""
d=
"M283.648 721.918976 340.873216 780.926976 740.352 383.997952 340.876288-12.925952 283.648 46.077952 619.52 383.997952Z"
horiz-adv-x=
"1024"
/>
<glyph
glyph-name=
"zuozuo"
unicode=
""
d=
"M740.352 721.918976 683.126784 780.926976 283.648 383.997952 683.123712-12.925952 740.352 46.077952 404.48 383.997952Z"
horiz-adv-x=
"1024"
/>
<glyph
glyph-name=
"xiayiye"
unicode=
""
d=
"M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"
horiz-adv-x=
"1024"
/>
<glyph
glyph-name=
"xiayiye1"
unicode=
""
d=
"M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.285422c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"
horiz-adv-x=
"1024"
/>
</font>
</defs></svg>
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.ttf
0 → 100644
View file @
7d5167b3
File added
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.woff
0 → 100644
View file @
7d5167b3
File added
src/main/resources/static/ajax/libs/layui/css/modules/laydate/default/laydate.css
deleted
100644 → 0
View file @
f89b4215
/** layui-v2.3.0-rc1 MIT License By https://www.layui.com */
.laydate-set-ym
,
.layui-laydate
,
.layui-laydate
*,
.layui-laydate-list
{
box-sizing
:
border-box
}
html
#layuicss-laydate
{
display
:
none
;
position
:
absolute
;
width
:
1989px
}
.layui-laydate
*
{
margin
:
0
;
padding
:
0
}
.layui-laydate
{
position
:
absolute
;
z-index
:
66666666
;
margin
:
5px
0
;
border-radius
:
2px
;
font-size
:
14px
;
-webkit-animation-duration
:
.3s
;
animation-duration
:
.3s
;
-webkit-animation-fill-mode
:
both
;
animation-fill-mode
:
both
;
-webkit-animation-name
:
laydate-upbit
;
animation-name
:
laydate-upbit
}
.layui-laydate-main
{
width
:
272px
}
.layui-laydate-content
td
,
.layui-laydate-header
*,
.layui-laydate-list
li
{
transition-duration
:
.3s
;
-webkit-transition-duration
:
.3s
}
@-webkit-keyframes
laydate-upbit
{
from
{
-webkit-transform
:
translate3d
(
0
,
20px
,
0
);
opacity
:
.3
}
to
{
-webkit-transform
:
translate3d
(
0
,
0
,
0
);
opacity
:
1
}}
@keyframes
laydate-upbit
{
from
{
transform
:
translate3d
(
0
,
20px
,
0
);
opacity
:
.3
}
to
{
transform
:
translate3d
(
0
,
0
,
0
);
opacity
:
1
}}
.layui-laydate-static
{
position
:
relative
;
z-index
:
0
;
display
:
inline-block
;
margin
:
0
;
-webkit-animation
:
none
;
animation
:
none
}
.laydate-ym-show
.laydate-next-m
,
.laydate-ym-show
.laydate-prev-m
{
display
:
none
!important
}
.laydate-ym-show
.laydate-next-y
,
.laydate-ym-show
.laydate-prev-y
{
display
:
inline-block
!important
}
.laydate-time-show
.laydate-set-ym
span
[
lay-type
=
month
],
.laydate-time-show
.laydate-set-ym
span
[
lay-type
=
year
],
.laydate-time-show
.layui-laydate-header
.layui-icon
,
.laydate-ym-show
.laydate-set-ym
span
[
lay-type
=
month
]
{
display
:
none
!important
}
.layui-laydate-header
{
position
:
relative
;
line-height
:
30px
;
padding
:
10px
70px
5px
}
.laydate-set-ym
span
,
.layui-laydate-header
i
{
padding
:
0
5px
;
cursor
:
pointer
}
.layui-laydate-header
*
{
display
:
inline-block
;
vertical-align
:
bottom
}
.layui-laydate-header
i
{
position
:
absolute
;
top
:
10px
;
color
:
#999
;
font-size
:
18px
}
.layui-laydate-header
i
.laydate-prev-y
{
left
:
15px
}
.layui-laydate-header
i
.laydate-prev-m
{
left
:
45px
}
.layui-laydate-header
i
.laydate-next-y
{
right
:
15px
}
.layui-laydate-header
i
.laydate-next-m
{
right
:
45px
}
.laydate-set-ym
{
width
:
100%
;
text-align
:
center
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
white-space
:
nowrap
}
.laydate-time-text
{
cursor
:
default
!important
}
.layui-laydate-content
{
position
:
relative
;
padding
:
10px
;
-moz-user-select
:
none
;
-webkit-user-select
:
none
;
-ms-user-select
:
none
}
.layui-laydate-content
table
{
border-collapse
:
collapse
;
border-spacing
:
0
}
.layui-laydate-content
td
,
.layui-laydate-content
th
{
width
:
36px
;
height
:
30px
;
padding
:
5px
;
text-align
:
center
}
.layui-laydate-content
td
{
position
:
relative
;
cursor
:
pointer
}
.laydate-day-mark
{
position
:
absolute
;
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
line-height
:
30px
;
font-size
:
12px
;
overflow
:
hidden
}
.laydate-day-mark
::after
{
position
:
absolute
;
content
:
''
;
right
:
2px
;
top
:
2px
;
width
:
5px
;
height
:
5px
;
border-radius
:
50%
}
.layui-laydate-footer
{
position
:
relative
;
height
:
46px
;
line-height
:
26px
;
padding
:
10px
20px
}
.layui-laydate-footer
span
{
margin-right
:
15px
;
display
:
inline-block
;
cursor
:
pointer
;
font-size
:
12px
}
.layui-laydate-footer
span
:hover
{
color
:
#5FB878
}
.laydate-footer-btns
{
position
:
absolute
;
right
:
10px
;
top
:
10px
}
.laydate-footer-btns
span
{
height
:
26px
;
line-height
:
26px
;
margin
:
0
0
0
-1px
;
padding
:
0
10px
;
border
:
1px
solid
#C9C9C9
;
background-color
:
#fff
;
white-space
:
nowrap
;
vertical-align
:
top
;
border-radius
:
2px
}
.layui-laydate-list
>
li
,
.layui-laydate-range
.layui-laydate-main
{
display
:
inline-block
;
vertical-align
:
middle
}
.layui-laydate-list
{
position
:
absolute
;
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
padding
:
10px
;
background-color
:
#fff
}
.layui-laydate-list
>
li
{
position
:
relative
;
width
:
33.3%
;
height
:
36px
;
line-height
:
36px
;
margin
:
3px
0
;
text-align
:
center
;
cursor
:
pointer
}
.laydate-month-list
>
li
{
width
:
25%
;
margin
:
17px
0
}
.laydate-time-list
>
li
{
height
:
100%
;
margin
:
0
;
line-height
:
normal
;
cursor
:
default
}
.laydate-time-list
p
{
position
:
relative
;
top
:
-4px
;
line-height
:
29px
}
.laydate-time-list
ol
{
height
:
181px
;
overflow
:
hidden
}
.laydate-time-list
>
li
:hover
ol
{
overflow-y
:
auto
}
.laydate-time-list
ol
li
{
width
:
130%
;
padding-left
:
33px
;
line-height
:
30px
;
text-align
:
left
;
cursor
:
pointer
}
.layui-laydate-hint
{
position
:
absolute
;
top
:
115px
;
left
:
50%
;
width
:
250px
;
margin-left
:
-125px
;
line-height
:
20px
;
padding
:
15px
;
text-align
:
center
;
font-size
:
12px
}
.layui-laydate-range
{
width
:
546px
}
.layui-laydate-range
.laydate-main-list-0
.laydate-next-m
,
.layui-laydate-range
.laydate-main-list-0
.laydate-next-y
,
.layui-laydate-range
.laydate-main-list-1
.laydate-prev-m
,
.layui-laydate-range
.laydate-main-list-1
.laydate-prev-y
{
display
:
none
}
.layui-laydate-range
.laydate-main-list-1
.layui-laydate-content
{
border-left
:
1px
solid
#e2e2e2
}
.layui-laydate
,
.layui-laydate-hint
{
border
:
1px
solid
#d2d2d2
;
box-shadow
:
0
2px
4px
rgba
(
0
,
0
,
0
,
.12
);
background-color
:
#fff
;
color
:
#666
}
.layui-laydate-header
{
border-bottom
:
1px
solid
#e2e2e2
}
.layui-laydate-header
i
:hover
,
.layui-laydate-header
span
:hover
{
color
:
#5FB878
}
.layui-laydate-content
{
border-top
:
none
0
;
border-bottom
:
none
0
}
.layui-laydate-content
th
{
font-weight
:
400
;
color
:
#333
}
.layui-laydate-content
td
{
color
:
#666
}
.layui-laydate-content
td
.laydate-selected
{
background-color
:
#00F7DE
}
.laydate-selected
:hover
{
background-color
:
#00F7DE
!important
}
.layui-laydate-content
td
:hover
,
.layui-laydate-list
li
:hover
{
background-color
:
#eaeaea
;
color
:
#333
}
.laydate-time-list
li
ol
{
margin
:
0
;
padding
:
0
;
border
:
1px
solid
#e2e2e2
;
border-left-width
:
0
}
.laydate-time-list
li
:first-child
ol
{
border-left-width
:
1px
}
.laydate-time-list
>
li
:hover
{
background
:
0
0
}
.layui-laydate-content
.laydate-day-next
,
.layui-laydate-content
.laydate-day-prev
{
color
:
#d2d2d2
}
.laydate-selected.laydate-day-next
,
.laydate-selected.laydate-day-prev
{
background-color
:
#f8f8f8
!important
}
.layui-laydate-footer
{
border-top
:
1px
solid
#e2e2e2
}
.layui-laydate-hint
{
color
:
#FF5722
}
.laydate-day-mark
::after
{
background-color
:
#5FB878
}
.layui-laydate-content
td
.layui-this
.laydate-day-mark
::after
{
display
:
none
}
.layui-laydate-footer
span
[
lay-type
=
date
]
{
color
:
#5FB878
}
.layui-laydate
.layui-this
{
background-color
:
#009688
!important
;
color
:
#fff
!important
}
.layui-laydate
.laydate-disabled
,
.layui-laydate
.laydate-disabled
:hover
{
background
:
0
0
!important
;
color
:
#d2d2d2
!important
;
cursor
:
not-allowed
!important
;
-moz-user-select
:
none
;
-webkit-user-select
:
none
;
-ms-user-select
:
none
}
.laydate-theme-molv
{
border
:
none
}
.laydate-theme-molv.layui-laydate-range
{
width
:
548px
}
.laydate-theme-molv
.layui-laydate-main
{
width
:
274px
}
.laydate-theme-molv
.layui-laydate-header
{
border
:
none
;
background-color
:
#009688
}
.laydate-theme-molv
.layui-laydate-header
i
,
.laydate-theme-molv
.layui-laydate-header
span
{
color
:
#f6f6f6
}
.laydate-theme-molv
.layui-laydate-header
i
:hover
,
.laydate-theme-molv
.layui-laydate-header
span
:hover
{
color
:
#fff
}
.laydate-theme-molv
.layui-laydate-content
{
border
:
1px
solid
#e2e2e2
;
border-top
:
none
;
border-bottom
:
none
}
.laydate-theme-molv
.laydate-main-list-1
.layui-laydate-content
{
border-left
:
none
}
.laydate-theme-grid
.laydate-month-list
>
li
,
.laydate-theme-grid
.laydate-year-list
>
li
,
.laydate-theme-grid
.layui-laydate-content
td
,
.laydate-theme-grid
.layui-laydate-content
thead
,
.laydate-theme-molv
.layui-laydate-footer
{
border
:
1px
solid
#e2e2e2
}
.laydate-theme-grid
.laydate-selected
,
.laydate-theme-grid
.laydate-selected
:hover
{
background-color
:
#f2f2f2
!important
;
color
:
#009688
!important
}
.laydate-theme-grid
.laydate-selected.laydate-day-next
,
.laydate-theme-grid
.laydate-selected.laydate-day-prev
{
color
:
#d2d2d2
!important
}
.laydate-theme-grid
.laydate-month-list
,
.laydate-theme-grid
.laydate-year-list
{
margin
:
1px
0
0
1px
}
.laydate-theme-grid
.laydate-month-list
>
li
,
.laydate-theme-grid
.laydate-year-list
>
li
{
margin
:
0
-1px
-1px
0
}
.laydate-theme-grid
.laydate-year-list
>
li
{
height
:
43px
;
line-height
:
43px
}
.laydate-theme-grid
.laydate-month-list
>
li
{
height
:
71px
;
line-height
:
71px
}
\ No newline at end of file
src/main/resources/static/ajax/libs/layui/lay/modules/laydate.js
View file @
7d5167b3
This diff is collapsed.
Click to expand it.
src/main/resources/static/ruoyi/js/common.js
View file @
7d5167b3
...
@@ -30,8 +30,42 @@ $(function() {
...
@@ -30,8 +30,42 @@ $(function() {
if
(
$
(
".select-time"
).
length
>
0
)
{
if
(
$
(
".select-time"
).
length
>
0
)
{
layui
.
use
(
'laydate'
,
function
()
{
layui
.
use
(
'laydate'
,
function
()
{
var
laydate
=
layui
.
laydate
;
var
laydate
=
layui
.
laydate
;
laydate
.
render
({
elem
:
'#startTime'
,
theme
:
'molv'
});
var
startDate
=
laydate
.
render
({
laydate
.
render
({
elem
:
'#endTime'
,
theme
:
'molv'
});
elem
:
'#startTime'
,
max
:
$
(
'#endTime'
).
val
(),
theme
:
'molv'
,
trigger
:
'click'
,
done
:
function
(
value
,
date
)
{
// 结束时间大于开始时间
if
(
value
!==
''
)
{
endDate
.
config
.
min
.
year
=
date
.
year
;
endDate
.
config
.
min
.
month
=
date
.
month
-
1
;
endDate
.
config
.
min
.
date
=
date
.
date
;
}
else
{
endDate
.
config
.
min
.
year
=
''
;
endDate
.
config
.
min
.
month
=
''
;
endDate
.
config
.
min
.
date
=
''
;
}
}
});
var
endDate
=
laydate
.
render
({
elem
:
'#endTime'
,
min
:
$
(
'#startTime'
).
val
(),
theme
:
'molv'
,
trigger
:
'click'
,
done
:
function
(
value
,
date
)
{
// 开始时间小于结束时间
if
(
value
!==
''
)
{
startDate
.
config
.
max
.
year
=
date
.
year
;
startDate
.
config
.
max
.
month
=
date
.
month
-
1
;
startDate
.
config
.
max
.
date
=
date
.
date
;
}
else
{
startDate
.
config
.
max
.
year
=
''
;
startDate
.
config
.
max
.
month
=
''
;
startDate
.
config
.
max
.
date
=
''
;
}
}
});
});
});
}
}
// tree 关键字搜索绑定
// tree 关键字搜索绑定
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment