Toggle navigation
Toggle navigation
This project
Loading...
Sign in
monitor_v3
/
hg-monitor-web
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
袁晋鹏
3 years ago
Commit
ffb6737494de348adde85e6fa726508b47569438
1 parent
09cf821f
修改时间范围点击问题和资产维修记录编辑问题
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
40 additions
and
13 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/assetsRepairAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/assetsrepair.js
hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js
hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js
hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
hg-monitor-web-base/src/main/resources/static/src/views/assets/repair.html
hg-monitor-web-base/src/main/resources/static/src/views/machineroom/enterDevice.html
hg-monitor-web-base/src/main/resources/static/src/views/machineroom/enterStaff.html
hg-monitor-web-base/src/main/resources/static/src/views/machineroom/routeAdjust.html
hg-monitor-web-base/src/main/resources/static/src/views/workreport/view/index.html
hg-monitor-web-base/src/main/resources/static/src/controller/assetsRepairAdd.js
View file @
ffb6737
...
...
@@ -101,6 +101,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
// 初始化下拉框
function
loadSelect
()
{
admin
.
req
({
url
:
domainName
+
'/api-room/assetsrepair/findAssetsRepairList'
}).
done
(
function
(
response
)
{
...
...
@@ -130,6 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
});
$
(
'#slt-repairadd-res'
).
html
(
options
);
form
.
render
();
fromAssignment
()
})
}
...
...
hg-monitor-web-base/src/main/resources/static/src/controller/assetsrepair.js
View file @
ffb6737
...
...
@@ -23,8 +23,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
//日期范围选择
laydate
.
render
({
elem
:
'#dateLimit'
elem
:
'#
repair
dateLimit'
,
range
:
'~'
,
trigger
:
'click'
,
ready
:
function
(
date
){
$
(
"#repairdateLimit"
).
removeAttr
(
"lay-key"
);
$
(
this
).
attr
(
"lay-key"
,
"1"
);
},
done
:
function
(
value
)
{
dateLimit
=
value
if
(
dateLimit
==
''
)
{
...
...
hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js
View file @
ffb6737
...
...
@@ -22,8 +22,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
//日期范围选择
laydate
.
render
({
elem
:
'#dateLimit'
,
range
:
'~'
,
elem
:
'#devicedateLimit'
,
range
:
'~'
,
trigger
:
'click'
,
ready
:
function
(
date
){
$
(
"#devicedateLimit"
).
removeAttr
(
"lay-key"
);
$
(
this
).
attr
(
"lay-key"
,
"1"
);
},
done
:
function
(
value
)
{
dateLimit
=
value
if
(
dateLimit
==
''
)
{
...
...
hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js
View file @
ffb6737
...
...
@@ -20,8 +20,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
//日期范围选择
laydate
.
render
({
elem
:
'#dateLimit'
,
range
:
'~'
,
elem
:
'#staffdateLimit'
,
range
:
'~'
,
trigger
:
'click'
,
ready
:
function
(
date
){
$
(
"#staffdateLimit"
).
removeAttr
(
"lay-key"
);
$
(
this
).
attr
(
"lay-key"
,
"1"
);
},
done
:
function
(
value
)
{
dateLimit
=
value
if
(
dateLimit
==
''
)
{
...
...
hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
View file @
ffb6737
...
...
@@ -19,8 +19,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
//日期范围选择
laydate
.
render
({
elem
:
'#dateLimit'
,
range
:
'~'
,
elem
:
'#routedateLimit'
,
range
:
'~'
,
trigger
:
'click'
,
ready
:
function
(
date
){
$
(
"#routedateLimit"
).
removeAttr
(
"lay-key"
);
$
(
this
).
attr
(
"lay-key"
,
"1"
);
},
done
:
function
(
value
)
{
dateLimit
=
value
if
(
dateLimit
==
''
)
{
...
...
hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
View file @
ffb6737
...
...
@@ -45,7 +45,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
//日期范围选择
laydate
.
render
({
elem
:
'#dateLimit'
,
range
:
'~'
,
,
range
:
'~'
,
trigger
:
'click'
,
ready
:
function
(
date
){
$
(
"#dateLimit"
).
removeAttr
(
"lay-key"
);
$
(
this
).
attr
(
"lay-key"
,
"1"
);
},
done
:
function
(
value
)
{
dateLimit
=
value
if
(
dateLimit
==
''
)
{
...
...
hg-monitor-web-base/src/main/resources/static/src/views/assets/repair.html
View file @
ffb6737
...
...
@@ -63,7 +63,7 @@
</div>
<div
class=
"layui-inline"
style=
"margin-left: 10px"
>
<div
class=
"layui-input-inline"
style=
"width: auto"
>
<input
type=
"text"
name=
"dateLimit"
id=
"dateLimit"
autocomplete=
"off"
<input
type=
"text"
name=
"dateLimit"
id=
"
repair
dateLimit"
autocomplete=
"off"
class=
"layui-input"
readonly
placeholder=
"其他日期范围"
>
</div>
</div>
...
...
hg-monitor-web-base/src/main/resources/static/src/views/machineroom/enterDevice.html
View file @
ffb6737
...
...
@@ -39,7 +39,7 @@
</div>
<div
class=
"layui-inline"
style=
"margin-left: 10px"
>
<div
class=
"layui-input-inline"
style=
"width: auto"
>
<input
type=
"text"
name=
"dateLimit"
id=
"dateLimit"
autocomplete=
"off"
<input
type=
"text"
name=
"dateLimit"
id=
"d
eviced
ateLimit"
autocomplete=
"off"
class=
"layui-input"
readonly
placeholder=
"其他日期范围"
>
</div>
</div>
...
...
hg-monitor-web-base/src/main/resources/static/src/views/machineroom/enterStaff.html
View file @
ffb6737
...
...
@@ -39,7 +39,7 @@
</div>
<div
class=
"layui-inline"
style=
"margin-left: 10px"
>
<div
class=
"layui-input-inline"
style=
"width: auto"
>
<input
type=
"text"
name=
"dateLimit"
id=
"dateLimit"
autocomplete=
"off"
<input
type=
"text"
name=
"dateLimit"
id=
"
staff
dateLimit"
autocomplete=
"off"
class=
"layui-input"
readonly
placeholder=
"其他日期范围"
>
</div>
</div>
...
...
hg-monitor-web-base/src/main/resources/static/src/views/machineroom/routeAdjust.html
View file @
ffb6737
...
...
@@ -56,7 +56,7 @@
</div>
<div
class=
"layui-inline"
style=
"margin-left: 10px"
>
<div
class=
"layui-input-inline"
style=
"width: auto"
>
<input
type=
"text"
name=
"dateLimit"
id=
"dateLimit"
autocomplete=
"off"
<input
type=
"text"
name=
"dateLimit"
id=
"
route
dateLimit"
autocomplete=
"off"
class=
"layui-input"
readonly
placeholder=
"日期范围"
>
</div>
</div>
...
...
hg-monitor-web-base/src/main/resources/static/src/views/workreport/view/index.html
View file @
ffb6737
...
...
@@ -112,7 +112,7 @@
<!-- <div class="pie-chart" id="chart-noRead-report"></div>-->
</div>
</div>
<div
class=
"layui-card-body"
style=
"margin-top:
1
0px;"
>
<div
class=
"layui-card-body"
style=
"margin-top:
3
0px;"
>
<div
class=
"warn-btns"
>
<!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-workreport-set-read">
<i class="layui-icon"></i>勾选标记为已读
...
...
Please
register
or
login
to post a comment