Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284

module/execution/css/all.css

@@ -6,3 +6,4 @@ body {margin-bottom: 25px;}
 #myTable input[type=checkbox] {margin: 0px}
 
 .table-footer .pager{z-index: 10}
+#myTable .scrollbar {z-index: 11}

module/execution/view/all.html.php

@@ -102,7 +102,6 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN());
   <script>
   cols = JSON.parse(cols);
   data = JSON.parse(data);
-  console.log(cols);
   const options = {
       height: 'auto',
       striped: true,
@@ -124,7 +123,6 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN());
   function toggleActions(changes)
   {
       checkItems = this.getChecks();
-      $.cookie('checkedItem', checkItems.join(','), {expires: config.cookieLife, path: config.webRoot});
 
       if(checkItems.length > 0)
       {
@@ -136,6 +134,13 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN());
       }
   }
 
+  $(".export").modalTrigger({width:650, type:'iframe', shown: setCookie});
+
+  function setCookie()
+  {
+      $.cookie('checkedItem', checkItems.join(','), {expires: config.cookieLife, path: config.webRoot});
+  }
+
   $('#myTable').dtable(options);
 
   $('#batchEditBtn').click(function()