Home Explore Help
Register Sign In
kerryzhang
/
xxl-job
Watch 1
Star 1
Fork 1
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

前端组件更新

xueli.xue 8 years ago
parent
ac46b7c817
commit
e4b6303a1e
9 changed files with 16 additions and 836 deletions
Split View Show Diff Stats
  1. 2 2
      xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
  2. 1 2
      xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
  3. 1 2
      xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
  4. 1 1
      xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
  5. 2 3
      xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
  6. 0 210
      xxl-job-admin/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js
  7. 0 274
      xxl-job-admin/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js
  8. 0 335
      xxl-job-admin/src/main/webapp/static/adminlte/plugins/daterangepicker/daterangepicker-bs3.css
  9. 9 7
      xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js

+ 2 - 2
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl View File 

@@ -7,10 +7,10 @@
7 7 
     <!-- Bootstrap 3.3.5 -->
8 8 
     <link rel="stylesheet" href="${request.contextPath}/static/adminlte/bootstrap/css/bootstrap.min.css">
9 9 
     <!-- Font Awesome -->
10 
-    <!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css"> -->
10 
+    <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> -->
11 11 
     <link rel="stylesheet" href="${request.contextPath}/static/plugins/font-awesome-4.5.0/css/font-awesome.min.css">
12 12 
     <!-- Ionicons -->
13 
-    <!-- <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css"> -->
13 
+    <!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css"> -->
14 14 
     <link rel="stylesheet" href="${request.contextPath}/static/plugins/ionicons-2.0.1/css/ionicons.min.css">
15 15 
     <!-- Theme style -->
16 16 
     <link rel="stylesheet" href="${request.contextPath}/static/adminlte/dist/css/AdminLTE-local.min.css">

+ 1 - 2
xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl View File 

@@ -6,8 +6,6 @@
6 6 
 	<@netCommon.commonStyle />
7 7 
 	<!-- DataTables -->
8 8 
   	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.css">
9 
-  	<!-- daterangepicker -->
10 
-  	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker-bs3.css">
11 9 
 </head>
12 10 
 <body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if> ">
13 11 
 <div class="wrapper">
 
@@ -181,6 +179,7 @@
181 179 
 <!-- DataTables -->
182 180 
 <script src="${request.contextPath}/static/adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
183 181 
 <script src="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js"></script>
182 
+<#-- jquery.validate -->
184 183 
 <script src="${request.contextPath}/static/plugins/jquery/jquery.validate.min.js"></script>
185 184 
 <script src="${request.contextPath}/static/js/jobgroup.index.1.js"></script>
186 185 
 </body>

+ 1 - 2
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl View File 

@@ -265,9 +265,8 @@ public class DemoGlueJobHandler extends IJobHandler {
265 265 
 <script src="${request.contextPath}/static/adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
266 266 
 <script src="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js"></script>
267 267 
 <script src="${request.contextPath}/static/plugins/jquery/jquery.validate.min.js"></script>
268 
-<!-- daterangepicker -->
268 
+<!-- moment -->
269 269 
 <script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/moment.min.js"></script>
270 
-<script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker.js"></script>
271 270 
 <script src="${request.contextPath}/static/js/jobinfo.index.1.js"></script>
272 271 
 </body>
273 272 
 </html>

+ 1 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl View File 

@@ -47,7 +47,7 @@
47 47 
         <pre style="font-size:12px;position: absolute; height:100%;width:100%;" id="logConsolePre" >
48 48 
             <div id="logConsole"></div>
49 49 
             <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
50 
-            <div><hr><i class="fa fa-fw fa-hand-pointer-o"></i><hr></div>
50 
+            <div><hr><i class2="fa fa-fw fa-hand-pointer-o"></i><hr></div>
51 51 
         </pre>
52 52 
     </div>
53 53

+ 2 - 3
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl View File 

@@ -7,7 +7,7 @@
7 7 
 	<!-- DataTables -->
8 8 
   	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.css">
9 9 
   	<!-- daterangepicker -->
10 
-  	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker-bs3.css">
10 
+  	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker.css">
11 11 
 </head>
12 12 
 <body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if> ">
13 13 
 <div class="wrapper">

@@ -56,8 +56,7 @@
56 56 
                 		<span class="input-group-addon">
57 57 
 	                  		调度时间
58 58 
 	                	</span>
59 
-	                	<input type="text" class="form-control" id="filterTime" readonly
60 
-	                		value2="<#if triggerTimeStart?exists && triggerTimeEnd?exists >${triggerTimeStart?if_exists?string('yyyy-MM-dd HH:mm:ss')} - ${triggerTimeEnd?if_exists?string('yyyy-MM-dd HH:mm:ss')}</#if>"  >
59 
+	                	<input type="text" class="form-control" id="filterTime" readonly >
61 60 
 	              	</div>
62 61 
 	            </div>
63 62

+ 0 - 210
xxl-job-admin/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js View File 

@@ -1,210 +0,0 @@
1 
-/*
2 
- * Author: Abdullah A Almsaeed
3 
- * Date: 4 Jan 2014
4 
- * Description:
5 
- *      This is a demo file used only for the main dashboard (index.html)
6 
- **/
7 
-
8 
-$(function () {
9 
-
10 
-  "use strict";
11 
-
12 
-  //Make the dashboard widgets sortable Using jquery UI
13 
-  $(".connectedSortable").sortable({
14 
-    placeholder: "sort-highlight",
15 
-    connectWith: ".connectedSortable",
16 
-    handle: ".box-header, .nav-tabs",
17 
-    forcePlaceholderSize: true,
18 
-    zIndex: 999999
19 
-  });
20 
-  $(".connectedSortable .box-header, .connectedSortable .nav-tabs-custom").css("cursor", "move");
21 
-
22 
-  //jQuery UI sortable for the todo list
23 
-  $(".todo-list").sortable({
24 
-    placeholder: "sort-highlight",
25 
-    handle: ".handle",
26 
-    forcePlaceholderSize: true,
27 
-    zIndex: 999999
28 
-  });
29 
-
30 
-  //bootstrap WYSIHTML5 - text editor
31 
-  $(".textarea").wysihtml5();
32 
-
33 
-  $('.daterange').daterangepicker({
34 
-    ranges: {
35 
-      'Today': [moment(), moment()],
36 
-      'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
37 
-      'Last 7 Days': [moment().subtract(6, 'days'), moment()],
38 
-      'Last 30 Days': [moment().subtract(29, 'days'), moment()],
39 
-      'This Month': [moment().startOf('month'), moment().endOf('month')],
40 
-      'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
41 
-    },
42 
-    startDate: moment().subtract(29, 'days'),
43 
-    endDate: moment()
44 
-  }, function (start, end) {
45 
-    window.alert("You chose: " + start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
46 
-  });
47 
-
48 
-  /* jQueryKnob */
49 
-  $(".knob").knob();
50 
-
51 
-  //jvectormap data
52 
-  var visitorsData = {
53 
-    "US": 398, //USA
54 
-    "SA": 400, //Saudi Arabia
55 
-    "CA": 1000, //Canada
56 
-    "DE": 500, //Germany
57 
-    "FR": 760, //France
58 
-    "CN": 300, //China
59 
-    "AU": 700, //Australia
60 
-    "BR": 600, //Brazil
61 
-    "IN": 800, //India
62 
-    "GB": 320, //Great Britain
63 
-    "RU": 3000 //Russia
64 
-  };
65 
-  //World map by jvectormap
66 
-  $('#world-map').vectorMap({
67 
-    map: 'world_mill_en',
68 
-    backgroundColor: "transparent",
69 
-    regionStyle: {
70 
-      initial: {
71 
-        fill: '#e4e4e4',
72 
-        "fill-opacity": 1,
73 
-        stroke: 'none',
74 
-        "stroke-width": 0,
75 
-        "stroke-opacity": 1
76 
-      }
77 
-    },
78 
-    series: {
79 
-      regions: [{
80 
-        values: visitorsData,
81 
-        scale: ["#92c1dc", "#ebf4f9"],
82 
-        normalizeFunction: 'polynomial'
83 
-      }]
84 
-    },
85 
-    onRegionLabelShow: function (e, el, code) {
86 
-      if (typeof visitorsData[code] != "undefined")
87 
-        el.html(el.html() + ': ' + visitorsData[code] + ' new visitors');
88 
-    }
89 
-  });
90 
-
91 
-  //Sparkline charts
92 
-  var myvalues = [1000, 1200, 920, 927, 931, 1027, 819, 930, 1021];
93 
-  $('#sparkline-1').sparkline(myvalues, {
94 
-    type: 'line',
95 
-    lineColor: '#92c1dc',
96 
-    fillColor: "#ebf4f9",
97 
-    height: '50',
98 
-    width: '80'
99 
-  });
100 
-  myvalues = [515, 519, 520, 522, 652, 810, 370, 627, 319, 630, 921];
101 
-  $('#sparkline-2').sparkline(myvalues, {
102 
-    type: 'line',
103 
-    lineColor: '#92c1dc',
104 
-    fillColor: "#ebf4f9",
105 
-    height: '50',
106 
-    width: '80'
107 
-  });
108 
-  myvalues = [15, 19, 20, 22, 33, 27, 31, 27, 19, 30, 21];
109 
-  $('#sparkline-3').sparkline(myvalues, {
110 
-    type: 'line',
111 
-    lineColor: '#92c1dc',
112 
-    fillColor: "#ebf4f9",
113 
-    height: '50',
114 
-    width: '80'
115 
-  });
116 
-
117 
-  //The Calender
118 
-  $("#calendar").datepicker();
119 
-
120 
-  //SLIMSCROLL FOR CHAT WIDGET
121 
-  $('#chat-box').slimScroll({
122 
-    height: '250px'
123 
-  });
124 
-
125 
-  /* Morris.js Charts */
126 
-  // Sales chart
127 
-  var area = new Morris.Area({
128 
-    element: 'revenue-chart',
129 
-    resize: true,
130 
-    data: [
131 
-      {y: '2011 Q1', item1: 2666, item2: 2666},
132 
-      {y: '2011 Q2', item1: 2778, item2: 2294},
133 
-      {y: '2011 Q3', item1: 4912, item2: 1969},
134 
-      {y: '2011 Q4', item1: 3767, item2: 3597},
135 
-      {y: '2012 Q1', item1: 6810, item2: 1914},
136 
-      {y: '2012 Q2', item1: 5670, item2: 4293},
137 
-      {y: '2012 Q3', item1: 4820, item2: 3795},
138 
-      {y: '2012 Q4', item1: 15073, item2: 5967},
139 
-      {y: '2013 Q1', item1: 10687, item2: 4460},
140 
-      {y: '2013 Q2', item1: 8432, item2: 5713}
141 
-    ],
142 
-    xkey: 'y',
143 
-    ykeys: ['item1', 'item2'],
144 
-    labels: ['Item 1', 'Item 2'],
145 
-    lineColors: ['#a0d0e0', '#3c8dbc'],
146 
-    hideHover: 'auto'
147 
-  });
148 
-  var line = new Morris.Line({
149 
-    element: 'line-chart',
150 
-    resize: true,
151 
-    data: [
152 
-      {y: '2011 Q1', item1: 2666},
153 
-      {y: '2011 Q2', item1: 2778},
154 
-      {y: '2011 Q3', item1: 4912},
155 
-      {y: '2011 Q4', item1: 3767},
156 
-      {y: '2012 Q1', item1: 6810},
157 
-      {y: '2012 Q2', item1: 5670},
158 
-      {y: '2012 Q3', item1: 4820},
159 
-      {y: '2012 Q4', item1: 15073},
160 
-      {y: '2013 Q1', item1: 10687},
161 
-      {y: '2013 Q2', item1: 8432}
162 
-    ],
163 
-    xkey: 'y',
164 
-    ykeys: ['item1'],
165 
-    labels: ['Item 1'],
166 
-    lineColors: ['#efefef'],
167 
-    lineWidth: 2,
168 
-    hideHover: 'auto',
169 
-    gridTextColor: "#fff",
170 
-    gridStrokeWidth: 0.4,
171 
-    pointSize: 4,
172 
-    pointStrokeColors: ["#efefef"],
173 
-    gridLineColor: "#efefef",
174 
-    gridTextFamily: "Open Sans",
175 
-    gridTextSize: 10
176 
-  });
177 
-
178 
-  //Donut Chart
179 
-  var donut = new Morris.Donut({
180 
-    element: 'sales-chart',
181 
-    resize: true,
182 
-    colors: ["#3c8dbc", "#f56954", "#00a65a"],
183 
-    data: [
184 
-      {label: "Download Sales", value: 12},
185 
-      {label: "In-Store Sales", value: 30},
186 
-      {label: "Mail-Order Sales", value: 20}
187 
-    ],
188 
-    hideHover: 'auto'
189 
-  });
190 
-
191 
-  //Fix for charts under tabs
192 
-  $('.box ul.nav a').on('shown.bs.tab', function () {
193 
-    area.redraw();
194 
-    donut.redraw();
195 
-    line.redraw();
196 
-  });
197 
-
198 
-  /* The todo list plugin */
199 
-  $(".todo-list").todolist({
200 
-    onCheck: function (ele) {
201 
-      window.console.log("The element has been checked");
202 
-      return ele;
203 
-    },
204 
-    onUncheck: function (ele) {
205 
-      window.console.log("The element has been unchecked");
206 
-      return ele;
207 
-    }
208 
-  });
209 
-
210 
-});

+ 0 - 274
xxl-job-admin/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js View File 

@@ -1,274 +0,0 @@
1 
-$(function () {
2 
-
3 
-  'use strict';
4 
-
5 
-  /* ChartJS
6 
-   * -------
7 
-   * Here we will create a few charts using ChartJS
8 
-   */
9 
-
10 
-  //-----------------------
11 
-  //- MONTHLY SALES CHART -
12 
-  //-----------------------
13 
-
14 
-  // Get context with jQuery - using jQuery's .get() method.
15 
-  var salesChartCanvas = $("#salesChart").get(0).getContext("2d");
16 
-  // This will get the first returned node in the jQuery collection.
17 
-  var salesChart = new Chart(salesChartCanvas);
18 
-
19 
-  var salesChartData = {
20 
-    labels: ["January", "February", "March", "April", "May", "June", "July"],
21 
-    datasets: [
22 
-      {
23 
-        label: "Electronics",
24 
-        fillColor: "rgb(210, 214, 222)",
25 
-        strokeColor: "rgb(210, 214, 222)",
26 
-        pointColor: "rgb(210, 214, 222)",
27 
-        pointStrokeColor: "#c1c7d1",
28 
-        pointHighlightFill: "#fff",
29 
-        pointHighlightStroke: "rgb(220,220,220)",
30 
-        data: [65, 59, 80, 81, 56, 55, 40]
31 
-      },
32 
-      {
33 
-        label: "Digital Goods",
34 
-        fillColor: "rgba(60,141,188,0.9)",
35 
-        strokeColor: "rgba(60,141,188,0.8)",
36 
-        pointColor: "#3b8bba",
37 
-        pointStrokeColor: "rgba(60,141,188,1)",
38 
-        pointHighlightFill: "#fff",
39 
-        pointHighlightStroke: "rgba(60,141,188,1)",
40 
-        data: [28, 48, 40, 19, 86, 27, 90]
41 
-      }
42 
-    ]
43 
-  };
44 
-
45 
-  var salesChartOptions = {
46 
-    //Boolean - If we should show the scale at all
47 
-    showScale: true,
48 
-    //Boolean - Whether grid lines are shown across the chart
49 
-    scaleShowGridLines: false,
50 
-    //String - Colour of the grid lines
51 
-    scaleGridLineColor: "rgba(0,0,0,.05)",
52 
-    //Number - Width of the grid lines
53 
-    scaleGridLineWidth: 1,
54 
-    //Boolean - Whether to show horizontal lines (except X axis)
55 
-    scaleShowHorizontalLines: true,
56 
-    //Boolean - Whether to show vertical lines (except Y axis)
57 
-    scaleShowVerticalLines: true,
58 
-    //Boolean - Whether the line is curved between points
59 
-    bezierCurve: true,
60 
-    //Number - Tension of the bezier curve between points
61 
-    bezierCurveTension: 0.3,
62 
-    //Boolean - Whether to show a dot for each point
63 
-    pointDot: false,
64 
-    //Number - Radius of each point dot in pixels
65 
-    pointDotRadius: 4,
66 
-    //Number - Pixel width of point dot stroke
67 
-    pointDotStrokeWidth: 1,
68 
-    //Number - amount extra to add to the radius to cater for hit detection outside the drawn point
69 
-    pointHitDetectionRadius: 20,
70 
-    //Boolean - Whether to show a stroke for datasets
71 
-    datasetStroke: true,
72 
-    //Number - Pixel width of dataset stroke
73 
-    datasetStrokeWidth: 2,
74 
-    //Boolean - Whether to fill the dataset with a color
75 
-    datasetFill: true,
76 
-    //String - A legend template
77 
-    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%=datasets[i].label%></li><%}%></ul>",
78 
-    //Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
79 
-    maintainAspectRatio: true,
80 
-    //Boolean - whether to make the chart responsive to window resizing
81 
-    responsive: true
82 
-  };
83 
-
84 
-  //Create the line chart
85 
-  salesChart.Line(salesChartData, salesChartOptions);
86 
-
87 
-  //---------------------------
88 
-  //- END MONTHLY SALES CHART -
89 
-  //---------------------------
90 
-
91 
-  //-------------
92 
-  //- PIE CHART -
93 
-  //-------------
94 
-  // Get context with jQuery - using jQuery's .get() method.
95 
-  var pieChartCanvas = $("#pieChart").get(0).getContext("2d");
96 
-  var pieChart = new Chart(pieChartCanvas);
97 
-  var PieData = [
98 
-    {
99 
-      value: 700,
100 
-      color: "#f56954",
101 
-      highlight: "#f56954",
102 
-      label: "Chrome"
103 
-    },
104 
-    {
105 
-      value: 500,
106 
-      color: "#00a65a",
107 
-      highlight: "#00a65a",
108 
-      label: "IE"
109 
-    },
110 
-    {
111 
-      value: 400,
112 
-      color: "#f39c12",
113 
-      highlight: "#f39c12",
114 
-      label: "FireFox"
115 
-    },
116 
-    {
117 
-      value: 600,
118 
-      color: "#00c0ef",
119 
-      highlight: "#00c0ef",
120 
-      label: "Safari"
121 
-    },
122 
-    {
123 
-      value: 300,
124 
-      color: "#3c8dbc",
125 
-      highlight: "#3c8dbc",
126 
-      label: "Opera"
127 
-    },
128 
-    {
129 
-      value: 100,
130 
-      color: "#d2d6de",
131 
-      highlight: "#d2d6de",
132 
-      label: "Navigator"
133 
-    }
134 
-  ];
135 
-  var pieOptions = {
136 
-    //Boolean - Whether we should show a stroke on each segment
137 
-    segmentShowStroke: true,
138 
-    //String - The colour of each segment stroke
139 
-    segmentStrokeColor: "#fff",
140 
-    //Number - The width of each segment stroke
141 
-    segmentStrokeWidth: 1,
142 
-    //Number - The percentage of the chart that we cut out of the middle
143 
-    percentageInnerCutout: 50, // This is 0 for Pie charts
144 
-    //Number - Amount of animation steps
145 
-    animationSteps: 100,
146 
-    //String - Animation easing effect
147 
-    animationEasing: "easeOutBounce",
148 
-    //Boolean - Whether we animate the rotation of the Doughnut
149 
-    animateRotate: true,
150 
-    //Boolean - Whether we animate scaling the Doughnut from the centre
151 
-    animateScale: false,
152 
-    //Boolean - whether to make the chart responsive to window resizing
153 
-    responsive: true,
154 
-    // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
155 
-    maintainAspectRatio: false,
156 
-    //String - A legend template
157 
-    legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>",
158 
-    //String - A tooltip template
159 
-    tooltipTemplate: "<%=value %> <%=label%> users"
160 
-  };
161 
-  //Create pie or douhnut chart
162 
-  // You can switch between pie and douhnut using the method below.
163 
-  pieChart.Doughnut(PieData, pieOptions);
164 
-  //-----------------
165 
-  //- END PIE CHART -
166 
-  //-----------------
167 
-
168 
-  /* jVector Maps
169 
-   * ------------
170 
-   * Create a world map with markers
171 
-   */
172 
-  $('#world-map-markers').vectorMap({
173 
-    map: 'world_mill_en',
174 
-    normalizeFunction: 'polynomial',
175 
-    hoverOpacity: 0.7,
176 
-    hoverColor: false,
177 
-    backgroundColor: 'transparent',
178 
-    regionStyle: {
179 
-      initial: {
180 
-        fill: 'rgba(210, 214, 222, 1)',
181 
-        "fill-opacity": 1,
182 
-        stroke: 'none',
183 
-        "stroke-width": 0,
184 
-        "stroke-opacity": 1
185 
-      },
186 
-      hover: {
187 
-        "fill-opacity": 0.7,
188 
-        cursor: 'pointer'
189 
-      },
190 
-      selected: {
191 
-        fill: 'yellow'
192 
-      },
193 
-      selectedHover: {}
194 
-    },
195 
-    markerStyle: {
196 
-      initial: {
197 
-        fill: '#00a65a',
198 
-        stroke: '#111'
199 
-      }
200 
-    },
201 
-    markers: [
202 
-      {latLng: [41.90, 12.45], name: 'Vatican City'},
203 
-      {latLng: [43.73, 7.41], name: 'Monaco'},
204 
-      {latLng: [-0.52, 166.93], name: 'Nauru'},
205 
-      {latLng: [-8.51, 179.21], name: 'Tuvalu'},
206 
-      {latLng: [43.93, 12.46], name: 'San Marino'},
207 
-      {latLng: [47.14, 9.52], name: 'Liechtenstein'},
208 
-      {latLng: [7.11, 171.06], name: 'Marshall Islands'},
209 
-      {latLng: [17.3, -62.73], name: 'Saint Kitts and Nevis'},
210 
-      {latLng: [3.2, 73.22], name: 'Maldives'},
211 
-      {latLng: [35.88, 14.5], name: 'Malta'},
212 
-      {latLng: [12.05, -61.75], name: 'Grenada'},
213 
-      {latLng: [13.16, -61.23], name: 'Saint Vincent and the Grenadines'},
214 
-      {latLng: [13.16, -59.55], name: 'Barbados'},
215 
-      {latLng: [17.11, -61.85], name: 'Antigua and Barbuda'},
216 
-      {latLng: [-4.61, 55.45], name: 'Seychelles'},
217 
-      {latLng: [7.35, 134.46], name: 'Palau'},
218 
-      {latLng: [42.5, 1.51], name: 'Andorra'},
219 
-      {latLng: [14.01, -60.98], name: 'Saint Lucia'},
220 
-      {latLng: [6.91, 158.18], name: 'Federated States of Micronesia'},
221 
-      {latLng: [1.3, 103.8], name: 'Singapore'},
222 
-      {latLng: [1.46, 173.03], name: 'Kiribati'},
223 
-      {latLng: [-21.13, -175.2], name: 'Tonga'},
224 
-      {latLng: [15.3, -61.38], name: 'Dominica'},
225 
-      {latLng: [-20.2, 57.5], name: 'Mauritius'},
226 
-      {latLng: [26.02, 50.55], name: 'Bahrain'},
227 
-      {latLng: [0.33, 6.73], name: 'São Tomé and Príncipe'}
228 
-    ]
229 
-  });
230 
-
231 
-  /* SPARKLINE CHARTS
232 
-   * ----------------
233 
-   * Create a inline charts with spark line
234 
-   */
235 
-
236 
-  //-----------------
237 
-  //- SPARKLINE BAR -
238 
-  //-----------------
239 
-  $('.sparkbar').each(function () {
240 
-    var $this = $(this);
241 
-    $this.sparkline('html', {
242 
-      type: 'bar',
243 
-      height: $this.data('height') ? $this.data('height') : '30',
244 
-      barColor: $this.data('color')
245 
-    });
246 
-  });
247 
-
248 
-  //-----------------
249 
-  //- SPARKLINE PIE -
250 
-  //-----------------
251 
-  $('.sparkpie').each(function () {
252 
-    var $this = $(this);
253 
-    $this.sparkline('html', {
254 
-      type: 'pie',
255 
-      height: $this.data('height') ? $this.data('height') : '90',
256 
-      sliceColors: $this.data('color')
257 
-    });
258 
-  });
259 
-
260 
-  //------------------
261 
-  //- SPARKLINE LINE -
262 
-  //------------------
263 
-  $('.sparkline').each(function () {
264 
-    var $this = $(this);
265 
-    $this.sparkline('html', {
266 
-      type: 'line',
267 
-      height: $this.data('height') ? $this.data('height') : '90',
268 
-      width: '100%',
269 
-      lineColor: $this.data('linecolor'),
270 
-      fillColor: $this.data('fillcolor'),
271 
-      spotColor: $this.data('spotcolor')
272 
-    });
273 
-  });
274 
-});

+ 0 - 335
xxl-job-admin/src/main/webapp/static/adminlte/plugins/daterangepicker/daterangepicker-bs3.css View File 

@@ -1,335 +0,0 @@
1 
-/*!
2 
- * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
3 
- *
4 
- * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
5 
- * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
6 
- *
7 
- * Built for http://www.improvely.com
8 
- */
9 
-
10 
- .daterangepicker.dropdown-menu {
11 
-  max-width: none;
12 
-  z-index: 3000;
13 
-}
14 
-
15 
-.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
16 
-  float: left;
17 
-  margin: 4px;
18 
-}
19 
-
20 
-.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
21 
-.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
22 
-  float: right;
23 
-  margin: 4px;
24 
-}
25 
-
26 
-.daterangepicker.single .ranges, .daterangepicker.single .calendar {
27 
-  float: none;
28 
-}
29 
-
30 
-.daterangepicker .ranges {
31 
-  width: 160px;
32 
-  text-align: left;
33 
-}
34 
-
35 
-.daterangepicker .ranges .range_inputs>div {
36 
-  float: left;
37 
-}
38 
-
39 
-.daterangepicker .ranges .range_inputs>div:nth-child(2) {
40 
-  padding-left: 11px;
41 
-}
42 
-
43 
-.daterangepicker .calendar {
44 
-  display: none;
45 
-  max-width: 270px;
46 
-}
47 
-
48 
-.daterangepicker.show-calendar .calendar {
49 
-    display: block;
50 
-}
51 
-
52 
-.daterangepicker .calendar.single .calendar-date {
53 
-  border: none;
54 
-}
55 
-
56 
-.daterangepicker .calendar th, .daterangepicker .calendar td {
57 
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
58 
-  white-space: nowrap;
59 
-  text-align: center;
60 
-  min-width: 32px;
61 
-}
62 
-
63 
-.daterangepicker .daterangepicker_start_input label,
64 
-.daterangepicker .daterangepicker_end_input label {
65 
-  color: #333;
66 
-  display: block;
67 
-  font-size: 11px;
68 
-  font-weight: normal;
69 
-  height: 20px;
70 
-  line-height: 20px;
71 
-  margin-bottom: 2px;
72 
-  text-shadow: #fff 1px 1px 0px;
73 
-  text-transform: uppercase;
74 
-  width: 74px;
75 
-}
76 
-
77 
-.daterangepicker .ranges input {
78 
-  font-size: 11px;
79 
-}
80 
-
81 
-.daterangepicker .ranges .input-mini {
82 
-  border: 1px solid #ccc;
83 
-  border-radius: 4px;
84 
-  color: #555;
85 
-  display: block;
86 
-  font-size: 11px;
87 
-  height: 30px;
88 
-  line-height: 30px;
89 
-  vertical-align: middle;
90 
-  margin: 0 0 10px 0;
91 
-  padding: 0 6px;
92 
-  width: 74px;
93 
-}
94 
-
95 
-.daterangepicker .ranges ul {
96 
-  list-style: none;
97 
-  margin: 0;
98 
-  padding: 0;
99 
-}
100 
-
101 
-.daterangepicker .ranges li {
102 
-  font-size: 13px;
103 
-  background: #f5f5f5;
104 
-  border: 1px solid #f5f5f5;
105 
-  color: #08c;
106 
-  padding: 3px 12px;
107 
-  margin-bottom: 8px;
108 
-  -webkit-border-radius: 5px;
109 
-  -moz-border-radius: 5px;
110 
-  border-radius: 5px;
111 
-  cursor: pointer;
112 
-}
113 
-
114 
-.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
115 
-  background: #08c;
116 
-  border: 1px solid #08c;
117 
-  color: #fff;
118 
-}
119 
-
120 
-.daterangepicker .calendar-date {
121 
-  border: 1px solid #ddd;
122 
-  padding: 4px;
123 
-  border-radius: 4px;
124 
-  background: #fff;
125 
-}
126 
-
127 
-.daterangepicker .calendar-time {
128 
-  text-align: center;
129 
-  margin: 8px auto 0 auto;
130 
-  line-height: 30px;
131 
-}
132 
-
133 
-.daterangepicker {
134 
-  position: absolute;
135 
-  background: #fff;
136 
-  top: 100px;
137 
-  left: 20px;
138 
-  padding: 4px;
139 
-  margin-top: 1px;
140 
-  -webkit-border-radius: 4px;
141 
-  -moz-border-radius: 4px;
142 
-  border-radius: 4px;
143 
-}
144 
-
145 
-.daterangepicker.opensleft:before {
146 
-  position: absolute;
147 
-  top: -7px;
148 
-  right: 9px;
149 
-  display: inline-block;
150 
-  border-right: 7px solid transparent;
151 
-  border-bottom: 7px solid #ccc;
152 
-  border-left: 7px solid transparent;
153 
-  border-bottom-color: rgba(0, 0, 0, 0.2);
154 
-  content: '';
155 
-}
156 
-
157 
-.daterangepicker.opensleft:after {
158 
-  position: absolute;
159 
-  top: -6px;
160 
-  right: 10px;
161 
-  display: inline-block;
162 
-  border-right: 6px solid transparent;
163 
-  border-bottom: 6px solid #fff;
164 
-  border-left: 6px solid transparent;
165 
-  content: '';
166 
-}
167 
-
168 
-.daterangepicker.openscenter:before {
169 
-  position: absolute;
170 
-  top: -7px;
171 
-  left: 0;
172 
-  right: 0;
173 
-  width: 0;
174 
-  margin-left: auto;
175 
-  margin-right: auto;
176 
-  display: inline-block;
177 
-  border-right: 7px solid transparent;
178 
-  border-bottom: 7px solid #ccc;
179 
-  border-left: 7px solid transparent;
180 
-  border-bottom-color: rgba(0, 0, 0, 0.2);
181 
-  content: '';
182 
-}
183 
-
184 
-.daterangepicker.openscenter:after {
185 
-  position: absolute;
186 
-  top: -6px;
187 
-  left: 0;
188 
-  right: 0;
189 
-  width: 0;
190 
-  margin-left: auto;
191 
-  margin-right: auto;
192 
-  display: inline-block;
193 
-  border-right: 6px solid transparent;
194 
-  border-bottom: 6px solid #fff;
195 
-  border-left: 6px solid transparent;
196 
-  content: '';
197 
-}
198 
-
199 
-.daterangepicker.opensright:before {
200 
-  position: absolute;
201 
-  top: -7px;
202 
-  left: 9px;
203 
-  display: inline-block;
204 
-  border-right: 7px solid transparent;
205 
-  border-bottom: 7px solid #ccc;
206 
-  border-left: 7px solid transparent;
207 
-  border-bottom-color: rgba(0, 0, 0, 0.2);
208 
-  content: '';
209 
-}
210 
-
211 
-.daterangepicker.opensright:after {
212 
-  position: absolute;
213 
-  top: -6px;
214 
-  left: 10px;
215 
-  display: inline-block;
216 
-  border-right: 6px solid transparent;
217 
-  border-bottom: 6px solid #fff;
218 
-  border-left: 6px solid transparent;
219 
-  content: '';
220 
-}
221 
-
222 
-.daterangepicker.dropup{
223 
-  margin-top: -5px;
224 
-}
225 
-.daterangepicker.dropup:before{
226 
-  top: initial;
227 
-  bottom:-7px;
228 
-  border-bottom: initial;
229 
-  border-top: 7px solid #ccc;
230 
-}
231 
-.daterangepicker.dropup:after{
232 
-  top: initial;
233 
-  bottom:-6px;
234 
-  border-bottom: initial;
235 
-  border-top: 6px solid #fff;
236 
-}
237 
-
238 
-.daterangepicker table {
239 
-  width: 100%;
240 
-  margin: 0;
241 
-}
242 
-
243 
-.daterangepicker td, .daterangepicker th {
244 
-  text-align: center;
245 
-  width: 20px;
246 
-  height: 20px;
247 
-  -webkit-border-radius: 4px;
248 
-  -moz-border-radius: 4px;
249 
-  border-radius: 4px;
250 
-  cursor: pointer;
251 
-  white-space: nowrap;
252 
-}
253 
-
254 
-.daterangepicker td.off {
255 
-  color: #999;
256 
-}
257 
-
258 
-.daterangepicker td.disabled, .daterangepicker option.disabled {
259 
-  color: #999;
260 
-}
261 
-
262 
-.daterangepicker td.available:hover, .daterangepicker th.available:hover {
263 
-  background: #eee;
264 
-}
265 
-
266 
-.daterangepicker td.in-range {
267 
-  background: #ebf4f8;
268 
-  -webkit-border-radius: 0;
269 
-  -moz-border-radius: 0;
270 
-  border-radius: 0;
271 
-}
272 
-
273 
-.daterangepicker td.start-date {
274 
-  -webkit-border-radius: 4px 0 0 4px;
275 
-  -moz-border-radius: 4px 0 0 4px;
276 
-  border-radius: 4px 0 0 4px;
277 
-}
278 
-
279 
-.daterangepicker td.end-date {
280 
-  -webkit-border-radius: 0 4px 4px 0;
281 
-  -moz-border-radius: 0 4px 4px 0;
282 
-  border-radius: 0 4px 4px 0;
283 
-}
284 
-
285 
-.daterangepicker td.start-date.end-date {
286 
-  -webkit-border-radius: 4px;
287 
-  -moz-border-radius: 4px;
288 
-  border-radius: 4px;
289 
-}
290 
-
291 
-.daterangepicker td.active, .daterangepicker td.active:hover {
292 
-  background-color: #357ebd;
293 
-  border-color: #3071a9;
294 
-  color: #fff;
295 
-}
296 
-
297 
-.daterangepicker td.week, .daterangepicker th.week {
298 
-  font-size: 80%;
299 
-  color: #ccc;
300 
-}
301 
-
302 
-.daterangepicker select.monthselect, .daterangepicker select.yearselect {
303 
-  font-size: 12px;
304 
-  padding: 1px;
305 
-  height: auto;
306 
-  margin: 0;
307 
-  cursor: default;
308 
-}
309 
-
310 
-.daterangepicker select.monthselect {
311 
-  margin-right: 2%;
312 
-  width: 56%;
313 
-}
314 
-
315 
-.daterangepicker select.yearselect {
316 
-  width: 40%;
317 
-}
318 
-
319 
-.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
320 
-  width: 50px;
321 
-  margin-bottom: 0;
322 
-}
323 
-
324 
-.daterangepicker_start_input {
325 
-  float: left;
326 
-}
327 
-
328 
-.daterangepicker_end_input {
329 
-  float: left;
330 
-  padding-left: 11px
331 
-}
332 
-
333 
-.daterangepicker th.month {
334 
-  width: auto;
335 
-}

+ 9 - 7
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js View File 

@@ -36,13 +36,15 @@ $(function() {
36 36 
 		timePicker12Hour : false,	//是否使用12小时制来显示时间
37 37 
 		format: 'YYYY-MM-DD HH:mm:ss',
38 38 
 		separator : ' - ',
39 
-		ranges : {
40 
-            '最近1小时': [moment().subtract('hours',1), moment()],
41 
-            '今日': [moment().startOf('day'), moment()],
42 
-            '昨日': [moment().subtract('days', 1).startOf('day'), moment().subtract('days', 1).endOf('day')],
43 
-            '最近7日': [moment().subtract('days', 6), moment()],
44 
-            '最近30日': [moment().subtract('days', 29), moment()]
45 
-        },
39 
+		ranges: {
40 
+			'最近1小时': [moment().subtract(1, 'hours'), moment()],
41 
+			'今日': [moment(), moment()],
42 
+			'昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
43 
+			'最近7日': [moment().subtract(6, 'days'), moment()],
44 
+			'最近30日': [moment().subtract(29, 'days'), moment()],
45 
+			'本月': [moment().startOf('month'), moment().endOf('month')],
46 
+			'上个月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
47 
+		},
46 48 
         opens : 'left', //日期选择框的弹出位置
47 49 
         locale : {
48 50 
         	customRangeLabel : '自定义',