Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
杨建斌
/
page
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
1
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
8300fec1
authored
2018-03-22 21:55:14 +0800
by
yangjianbin
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge branch 'develop' of
http://g.28ms.com:8000/yangjianbin/page
into develop
2 parents
be477444
9210bd36
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
21 deletions
application/views/tool/add.php
application/views/tool/web.php
application/views/tool/add.php
View file @
8300fec
...
...
@@ -67,7 +67,7 @@
} else {
layer.alert('请求成功');
setTimeout(function () {
layer_
close
(
);
layer_
load('应用工具', '
<?=
site_url
(
'tool/web'
);
?>
'
);
},
500
);
}
...
...
application/views/tool/web.php
View file @
8300fec
...
...
@@ -102,26 +102,7 @@
]
});
$.fn.dataTableExt.afnFiltering.push(
function (oSettings, aData, iDataIndex) {
var min = document.getElementById('min').value;
var max = document.getElementById('max').value;
var iDateCol = 12;
var dateMin = new Date(aData[iDateCol]);
var dateMax = new Date(aData[iDateCol]);
if (min === '' && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
return true;
else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
return true;
return false;
}
);
$('.table_search').on('change', function () {
$('.table_search').on('keyup', function () {
search = $(this).val();
column = $(this).attr('column');
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment