ops / monitor-ui · Commits

Go to a project

Authored by fanzelei
Commit 1fa1482002c2fd1826b5392fb2b8d4073717fcc4 1 parent 6e54b655

时间控件

Inline Side-by-side
Showing 12 changed files with 9 additions and 11 deletions
@@ -54,5 +54,6 @@ @@ -54,5 +54,6 @@
54 <mvc:resources location="/css/" mapping="/css/**"/> 54 <mvc:resources location="/css/" mapping="/css/**"/>
55 <mvc:resources location="/img/" mapping="/img/**"/> 55 <mvc:resources location="/img/" mapping="/img/**"/>
56 <mvc:resources location="/jsp/" mapping="/jsp/**"/> 56 <mvc:resources location="/jsp/" mapping="/jsp/**"/>
  57 + <mvc:resources location="/fonts/" mapping="/fonts/**"/>
57 <mvc:resources location="/script/" mapping="/script/**"/> 58 <mvc:resources location="/script/" mapping="/script/**"/>
58 </beans> 59 </beans>
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <head> 15 <head>
16 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> 16 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
17 <link rel="stylesheet" href="<%=basePath %>css/bootstrap.min.css"/> 17 <link rel="stylesheet" href="<%=basePath %>css/bootstrap.min.css"/>
  18 + <link rel="stylesheet" href="<%=basePath %>css/bootstrap-datetimepicker.css"/>
18 <link href="<%=basePath %>js/bootstrap-plugin/css/bootstrap.table.css" rel="stylesheet" media="screen"/> 19 <link href="<%=basePath %>js/bootstrap-plugin/css/bootstrap.table.css" rel="stylesheet" media="screen"/>
19 <link rel="stylesheet" href="<%=basePath %>css/bootstrap-responsive.min.css"/> 20 <link rel="stylesheet" href="<%=basePath %>css/bootstrap-responsive.min.css"/>
20 <link rel="stylesheet" href="<%=basePath %>css/fullcalendar.css"/> 21 <link rel="stylesheet" href="<%=basePath %>css/fullcalendar.css"/>
@@ -25,31 +26,27 @@ @@ -25,31 +26,27 @@
25 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/> 26 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/>
26 <link rel="stylesheet" href="<%=basePath %>js/jstree/themes/proton/style.css"/> 27 <link rel="stylesheet" href="<%=basePath %>js/jstree/themes/proton/style.css"/>
27 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/> 28 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/>
28 - <link rel="stylesheet" href="<%=basePath %>css/bootstrap-datetimepicker.css"/>  
29 <link rel="stylesheet" href="<%=basePath %>css/yoho.css"/> 29 <link rel="stylesheet" href="<%=basePath %>css/yoho.css"/>
30 <script src="<%=basePath %>js/jquery-1.12.0.min.js" charset="UTF-8" type="text/javascript"></script> 30 <script src="<%=basePath %>js/jquery-1.12.0.min.js" charset="UTF-8" type="text/javascript"></script>
31 <script src="<%=basePath %>/js/bootstrap.min.js"></script> 31 <script src="<%=basePath %>/js/bootstrap.min.js"></script>
  32 + <script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/moment-with-locales.js" charset="UTF-8" type="text/javascript"></script>
  33 + <script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/bootstrap-datetimepicker.js" charset="UTF-8" type="text/javascript"></script>
32 <script src="<%=basePath %>js/global.js" charset="UTF-8" type="text/javascript"></script> 34 <script src="<%=basePath %>js/global.js" charset="UTF-8" type="text/javascript"></script>
33 - <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.pagination.js" charset="UTF-8"  
34 - type="text/javascript"></script> 35 + <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.pagination.js" charset="UTF-8" type="text/javascript"></script>
35 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.table.js" charset="UTF-8" type="text/javascript"></script> 36 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.table.js" charset="UTF-8" type="text/javascript"></script>
36 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.dialog.js" charset="UTF-8" type="text/javascript"></script> 37 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.dialog.js" charset="UTF-8" type="text/javascript"></script>
37 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.form.js" charset="UTF-8" type="text/javascript"></script> 38 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.form.js" charset="UTF-8" type="text/javascript"></script>
38 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.panel.js" charset="UTF-8" type="text/javascript"></script> 39 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.panel.js" charset="UTF-8" type="text/javascript"></script>
39 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.alerts.js" charset="UTF-8" type="text/javascript"></script> 40 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.alerts.js" charset="UTF-8" type="text/javascript"></script>
40 - <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.accordion.js" charset="UTF-8"  
41 - type="text/javascript"></script>  
42 - <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.breadcrumb.js" charset="UTF-8"  
43 - type="text/javascript"></script>  
44 - <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.validate.js" charset="UTF-8"  
45 - type="text/javascript"></script> 41 + <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.accordion.js" charset="UTF-8" type="text/javascript"></script>
  42 + <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.breadcrumb.js" charset="UTF-8" type="text/javascript"></script>
  43 + <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.validate.js" charset="UTF-8" type="text/javascript"></script>
46 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.form.js" charset="UTF-8" type="text/javascript"></script> 44 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.form.js" charset="UTF-8" type="text/javascript"></script>
47 <script src="<%=basePath %>js/layer/layer.js" charset="UTF-8" type="text/javascript"></script> 45 <script src="<%=basePath %>js/layer/layer.js" charset="UTF-8" type="text/javascript"></script>
48 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.select.js" charset="UTF-8" type="text/javascript"></script> 46 <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.select.js" charset="UTF-8" type="text/javascript"></script>
49 <script src="<%=basePath %>js/jstree/jstree.min.js"></script> 47 <script src="<%=basePath %>js/jstree/jstree.min.js"></script>
50 <script src="<%=basePath %>js/jquery.toaster.js"></script> 48 <script src="<%=basePath %>js/jquery.toaster.js"></script>
51 - <script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/moment-with-locales.js" charset="UTF-8" type="text/javascript"></script>  
52 - <script src="<%=basePath %>js/bootstrap-plugin/datetimepicker/bootstrap-datetimepicker.js" charset="UTF-8" type="text/javascript"></script> 49 +
53 50
54 <script> 51 <script>
55 var contextPath = '<%=basePath %>'; 52 var contextPath = '<%=basePath %>';