Browse Source

Merge branch 'master' of hyq/kmall-pt into master

黄亚琴 6 years ago
parent
commit
75cf3c8094

+ 10 - 2
kmall-admin/src/main/webapp/statics/plugins/jqgrid/jquery.jqGrid.min.js

@@ -314,8 +314,16 @@ Oa=d.p.datatype;d.p.hidegrid===!0&&($(".ui-jqgrid-titlebar-close",e.cDiv).click(
 b,c=$.isFunction(d.p.onHeaderClick),f=".ui-jqgrid-bdiv, .ui-jqgrid-hdiv, .ui-jqgrid-toppager, .ui-jqgrid-pager, .ui-jqgrid-sdiv",g=this;return d.p.toolbar[0]===!0&&("both"===d.p.toolbar[1]&&(f+=", #"+$(e.ubDiv).attr("id")),f+=", #"+$(e.uDiv).attr("id")),b=$(f,"#gview_"+$.jgrid.jqID(d.p.id)).length,"visible"===d.p.gridstate?$(f,"#gbox_"+$.jgrid.jqID(d.p.id)).slideUp("fast",function(){b--,0===b&&($("span",g).removeClass(Ka).addClass(La),d.p.gridstate="hidden",$("#gbox_"+$.jgrid.jqID(d.p.id)).hasClass("ui-resizable")&&$(".ui-resizable-handle","#gbox_"+$.jgrid.jqID(d.p.id)).hide(),$(d).triggerHandler("jqGridHeaderClick",[d.p.gridstate,a]),c&&(Ea||d.p.onHeaderClick.call(d,d.p.gridstate,a)))}):"hidden"===d.p.gridstate&&$(f,"#gbox_"+$.jgrid.jqID(d.p.id)).slideDown("fast",function(){b--,0===b&&($("span",g).removeClass(La).addClass(Ka),Ea&&(d.p.datatype=Oa,S(),Ea=!1),d.p.gridstate="visible",$("#gbox_"+$.jgrid.jqID(d.p.id)).hasClass("ui-resizable")&&$(".ui-resizable-handle","#gbox_"+$.jgrid.jqID(d.p.id)).show(),$(d).triggerHandler("jqGridHeaderClick",[d.p.gridstate,a]),c&&(Ea||d.p.onHeaderClick.call(d,d.p.gridstate,a)))}),!1}),Ea&&(d.p.datatype="local",$(".ui-jqgrid-titlebar-close",e.cDiv).trigger("click")))}else
 $(e.cDiv).hide(),d.p.toppager||$(e.hDiv).addClass(k(d.p.styleUI+".common","cornertop",!0));if($(e.hDiv).after(e.bDiv).mousemove(function(a){return e.resizing?(e.dragMove(a),!1):void
 0}),$(".ui-jqgrid-labels",e.hDiv).bind("selectstart",function(){return!1}),$(document).bind("mouseup.jqGrid"+d.p.id,function(){return e.resizing?(e.dragEnd(!0),!1):!0}),"rtl"===d.p.direction&&$(d).bind("jqGridAfterGridComplete.setRTLPadding",function(){var
-a=e.bDiv.offsetWidth-e.bDiv.clientWidth;d.p.scrollOffset=a,$("div:first",e.hDiv).css({paddingLeft:a+"px"}),e.hDiv.scrollLeft=e.bDiv.scrollLeft}),d.formatCol=A,d.sortData=W,d.updatepager=P,d.refreshIndex=K,d.setHeadCheckBox=T,d.constructTr=L,d.formatter=function(a,b,c,d,e){return C(a,b,c,d,e)},$.extend(e,{populate:S,emptyRows:I,beginReq:Q,endReq:R}),this.grid=e,d.addXmlData=function(a){M(a)},d.addJSONData=function(a){N(a)},this.grid.cols=this.rows[0].cells,$(d).triggerHandler("jqGridInitGrid"),$.isFunction(d.p.onInitGrid)&&d.p.onInitGrid.call(d),S(),d.p.hiddengrid=!1,d.p.responsive){var
-Pa="onorientationchange"in
+a=e.bDiv.offsetWidth-e.bDiv.clientWidth;d.p.scrollOffset=a,$("div:first",e.hDiv).css({paddingLeft:a+"px"}),e.hDiv.scrollLeft=e.bDiv.scrollLeft}),d.formatCol=A,d.sortData=W,d.updatepager=P,d.refreshIndex=K,d.setHeadCheckBox=T,d.constructTr=L,d.formatter=function(a,b,c,d,e){return C(a,b,c,d,e)},$.extend(e,{populate:S,emptyRows:I,beginReq:Q,endReq:R}),this.grid=e,d.addXmlData=function(a){M(a)},d.addJSONData=function(a){N(a)},this.grid.cols=this.rows[0].cells,$(d).triggerHandler("jqGridInitGrid"),$.isFunction(d.p.onInitGrid)&&d.p.onInitGrid.call(d),S(),d.p.hiddengrid=!1,d.p.responsive){
+    $.bind('jqGridSelectAll',function(e,checkFlag){
+        if(e.isTrigger===2){
+            return;
+        }
+        $('#cb_'+ts.id).attr('checked', (checkFlag===false));
+        $("#cb_"+ts.id).trigger("click");
+        $('#cb_'+ts.id).attr('checked', !(checkFlag===false));
+    });
+    var Pa="onorientationchange"in
 window,Qa=Pa?"orientationchange":"resize";$(window).on(Qa,function(){$(d).jqGrid("resizeGrid")})}}})},$.jgrid.extend({getGridParam:function(a,b){var
 c,d=this[0];if(d&&d.grid){if(void
 0===b&&"string"!=typeof

+ 25 - 30
kmall-schedule/src/main/webapp/index.html

@@ -6,49 +6,44 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!--bootstrap-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/bootstrap.min.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/statics/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/statics/css/font-awesome.min.css">
     <!--main-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/main.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/iview.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/style.css">
+    <link rel="stylesheet" href="/statics/css/main.css">
+    <link rel="stylesheet" href="/statics/css/iview.css">
+    <link rel="stylesheet" href="/statics/css/style.css">
     <!--jqgrid-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/plugins/jqgrid/ui.jqgrid-bootstrap.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/plugins/ztree/css/metroStyle/metroStyle.css">
+    <link rel="stylesheet" href="/statics/plugins/jqgrid/ui.jqgrid-bootstrap.css">
+    <link rel="stylesheet" href="/statics/plugins/ztree/css/metroStyle/metroStyle.css">
     <!--treegrid-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.css">
-    <!--富文本-->
-    <!--<link rel="stylesheet" href='http://localhost:8081/statics/plugins/froala_editor/css/froala_editor.min.css'/>-->
+    <link rel="stylesheet" href="/statics/plugins/treegrid/jquery.treegrid.css">
 
     <!--jquery-->
-    <script src="http://localhost:8081/statics/libs/jquery.min.js"></script>
+    <script src="/statics/libs/jquery.min.js"></script>
     <!--layer-->
-    <script src="http://localhost:8081/statics/plugins/layer/layer.js"></script>
+    <script src="/statics/plugins/layer/layer.js"></script>
     <!--bootstrap-->
-    <script src="http://localhost:8081/statics/libs/bootstrap.min.js"></script>
+    <script src="/statics/libs/bootstrap.min.js"></script>
     <!--vue-->
-    <script src="http://localhost:8081/statics/libs/vue.min.js"></script>
-    <script src="http://localhost:8081/statics/libs/iview.min.js"></script>
-    <!--qrcode-->
-    <!--<script src="http://localhost:8081/statics/qrcode/jquery.qrcode.min.js"></script>-->
-    <!--<script src="http://localhost:8081/statics/qrcode/utf.js"></script>-->
+    <script src="/statics/libs/vue.min.js"></script>
+    <script src="/statics/libs/iview.min.js"></script>
     <!-- print -->
-    <script src="http://localhost:8081/statics/jquery.print.js"></script>
+    <script src="/statics/jquery.print.js"></script>
     <!--jqgrid-->
-    <script src="http://localhost:8081/statics/plugins/jqgrid/grid.locale-cn.js"></script>
-    <script src="http://localhost:8081/statics/plugins/jqgrid/jquery.jqGrid.min.js"></script>
+    <script src="/statics/plugins/jqgrid/grid.locale-cn.js"></script>
+    <script src="/statics/plugins/jqgrid/jquery.jqGrid.min.js"></script>
     <!--ztree-->
-    <script src="http://localhost:8081/statics/plugins/ztree/jquery.ztree.all.min.js"></script>
+    <script src="/statics/plugins/ztree/jquery.ztree.all.min.js"></script>
     <!--treegrid-->
-    <script src="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.extension.js"></script>
-    <script src="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.min.js"></script>
-    <script src="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.bootstrap3.js"></script>
-    <script src="http://localhost:8081/statics/plugins/treegrid/tree.table.js"></script>
+    <script src="/statics/plugins/treegrid/jquery.treegrid.extension.js"></script>
+    <script src="/statics/plugins/treegrid/jquery.treegrid.min.js"></script>
+    <script src="/statics/plugins/treegrid/jquery.treegrid.bootstrap3.js"></script>
+    <script src="/statics/plugins/treegrid/tree.table.js"></script>
 
 
-    <script src="http://localhost:8081/statics/libs/jquery-extend.js"></script>
-    <script src="http://localhost:8081/statics/libs/iNotify.js"></script>
-    <script src="http://localhost:8081/js/common.js"></script>
+    <script src="/statics/libs/jquery-extend.js"></script>
+    <script src="/statics/libs/iNotify.js"></script>
+    <script src="/js/common.js"></script>
 </head>
 <body>
 <div id="rrapp" v-cloak>
@@ -125,6 +120,6 @@
     </Row>
 </div>
 
-<script src="http://localhost:8081/js/sys/schedule.js"></script>
+<script src="/js/sys/schedule.js"></script>
 </body>
 </html>

+ 25 - 30
kmall-schedule/src/main/webapp/schedule_log.html

@@ -6,49 +6,45 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!--bootstrap-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/bootstrap.min.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/statics/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/statics/css/font-awesome.min.css">
     <!--main-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/main.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/iview.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/css/style.css">
+    <link rel="stylesheet" href="/statics/css/main.css">
+    <link rel="stylesheet" href="/statics/css/iview.css">
+    <link rel="stylesheet" href="/statics/css/style.css">
     <!--jqgrid-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/plugins/jqgrid/ui.jqgrid-bootstrap.css">
-    <link rel="stylesheet" href="http://localhost:8081/statics/plugins/ztree/css/metroStyle/metroStyle.css">
+    <link rel="stylesheet" href="/statics/plugins/jqgrid/ui.jqgrid-bootstrap.css">
+    <link rel="stylesheet" href="/statics/plugins/ztree/css/metroStyle/metroStyle.css">
     <!--treegrid-->
-    <link rel="stylesheet" href="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.css">
-    <!--富文本-->
-    <!--<link rel="stylesheet" href='http://localhost:8081/statics/plugins/froala_editor/css/froala_editor.min.css'/>-->
+    <link rel="stylesheet" href="/statics/plugins/treegrid/jquery.treegrid.css">
 
     <!--jquery-->
-    <script src="http://localhost:8081/statics/libs/jquery.min.js"></script>
+    <script src="/statics/libs/jquery.min.js"></script>
     <!--layer-->
-    <script src="http://localhost:8081/statics/plugins/layer/layer.js"></script>
+    <script src="/statics/plugins/layer/layer.js"></script>
     <!--bootstrap-->
-    <script src="http://localhost:8081/statics/libs/bootstrap.min.js"></script>
+    <script src="/statics/libs/bootstrap.min.js"></script>
     <!--vue-->
-    <script src="http://localhost:8081/statics/libs/vue.min.js"></script>
-    <script src="http://localhost:8081/statics/libs/iview.min.js"></script>
-    <!--qrcode-->
-    <!--<script src="http://localhost:8081/statics/qrcode/jquery.qrcode.min.js"></script>-->
-    <!--<script src="http://localhost:8081/statics/qrcode/utf.js"></script>-->
+    <script src="/statics/libs/vue.min.js"></script>
+    <script src="/statics/libs/iview.min.js"></script>
     <!-- print -->
-    <script src="http://localhost:8081/statics/jquery.print.js"></script>
+    <script src="/statics/jquery.print.js"></script>
     <!--jqgrid-->
-    <script src="http://localhost:8081/statics/plugins/jqgrid/grid.locale-cn.js"></script>
-    <script src="http://localhost:8081/statics/plugins/jqgrid/jquery.jqGrid.min.js"></script>
+    <script src="/statics/plugins/jqgrid/grid.locale-cn.js"></script>
+    <script src="/statics/plugins/jqgrid/jquery.jqGrid.min.js"></script>
     <!--ztree-->
-    <script src="http://localhost:8081/statics/plugins/ztree/jquery.ztree.all.min.js"></script>
+    <script src="/statics/plugins/ztree/jquery.ztree.all.min.js"></script>
     <!--treegrid-->
-    <script src="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.extension.js"></script>
-    <script src="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.min.js"></script>
-    <script src="http://localhost:8081/statics/plugins/treegrid/jquery.treegrid.bootstrap3.js"></script>
-    <script src="http://localhost:8081/statics/plugins/treegrid/tree.table.js"></script>
+    <script src="/statics/plugins/treegrid/jquery.treegrid.extension.js"></script>
+    <script src="/statics/plugins/treegrid/jquery.treegrid.min.js"></script>
+    <script src="/statics/plugins/treegrid/jquery.treegrid.bootstrap3.js"></script>
+    <script src="/statics/plugins/treegrid/tree.table.js"></script>
 
 
-    <script src="http://localhost:8081/statics/libs/jquery-extend.js"></script>
-    <script src="http://localhost:8081/statics/libs/iNotify.js"></script>
-    <script src="http://localhost:8081/js/common.js"></script>
+    <script src="/statics/libs/jquery-extend.js"></script>
+    <script src="/statics/libs/iNotify.js"></script>
+    <script src="/js/common.js"></script>
+    <script src="/js/sys/schedule_log.js"></script>
 </head>
 <body>
 <div id="rrapp">
@@ -66,6 +62,5 @@
         <div id="jqGridPager"></div>
     </div>
 
-    <script src="http://localhost:8081/js/sys/schedule_log.js"></script>
 </body>
 </html>