'commit'

1 year ago · aeec8d7389
parent 3888064d83
commit aeec8d7389
6 changed files with 132 additions and 7 deletions
--- a/WebRoot/Excel/5fd74c61-440d-4450-8659-31c65cb37b4e.xlsx
+++ b/WebRoot/Excel/5fd74c61-440d-4450-8659-31c65cb37b4e.xlsx
--- a/WebRoot/Excel/b4aed330-ba5b-41d3-9c66-690f4da47f32.xlsx
+++ b/WebRoot/Excel/b4aed330-ba5b-41d3-9c66-690f4da47f32.xlsx
--- a/WebRoot/Excel/d66fe317-aba4-460d-a544-b07e07e6af65.xlsx
+++ b/WebRoot/Excel/d66fe317-aba4-460d-a544-b07e07e6af65.xlsx
--- a/WebRoot/view/jrgl/rzgl/index.html
+++ b/WebRoot/view/jrgl/rzgl/index.html
@ -95,6 +95,8 @@
        return null;
      }

+      
+
    });
  </script>
 </body>
--- a/WebRoot/view/jrgl/rzgl/test.html
+++ b/WebRoot/view/jrgl/rzgl/test.html
@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title></title>
+  <link rel="stylesheet" href="../../../component/pear/css/pear.css" />
+  <style>
+    .woo-tool-text-delimiter {
+      width: 1px;
+      height: 12px;
+      background: #EEEEEE;
+      display: inline-block;
+      margin: 0 6px 0 4px;
+    }
+
+    .woo-theme-color {
+      color: #2d8cf0 !important;
+    }
+
+    .woo-tool-span {
+      margin: 0 3px;
+      position: relative;
+      top: -1px;
+      cursor: pointer;
+    }
+
+    .layui-table-tool-temp {
+      padding-right: 0;
+    }
+
+
+    .selected-cell {
+      background-color: #5FB878;
+      /* 选中单元格后的颜色 */
+    }
+  </style>
+  </style>
+</head>
+
+<body class="pear-container layui-form">
+
+  <div class="layui-card">
+    <div class="layui-card-body">
+      <table id="data-table"></table>
+    </div>
+  </div>
+
+  <script src="../../../component/layui/layui.js"></script>
+  <script src="../../../component/pear/pear.js"></script>
+
+  <script>
+    layui.use(['table', 'form', 'jquery', 'common', 'laytpl'], function () {
+      var table = layui.table;
+      var form = layui.form;
+      var $ = layui.jquery;
+      var common = layui.common;
+      var laytpl = layui.laytpl;
+
+      tableRender();
+
+      function tableRender() {
+        table.render({
+          elem: '#data-table',
+          url: '/QingLong/view/jrgl/rzgl/data.json',
+          where: {
+            page: 1,
+            limit: 100,
+            system_id: 0
+          },
+          height: 'full-60',
+          page: {
+            limit: 15
+            , layout: ['count', 'prev', 'page', 'next', 'skip']
+            , prev: "上一页"
+            , next: "下一页"
+          },
+          cols: [[
+            { title: '序号', align: 'center', width: "10%", type: 'numbers' },
+            { title: '操作人', field: 'czr', align: 'center', width: "20%" },
+            { title: '操作时间', field: 'czsj', align: 'center', width: "20%" },
+            { title: '操作IP', field: 'ip', align: 'center', width: "20%" },
+            { title: '行为', field: 'xw', align: 'left' }
+
+          ]],
+          // skin: 'line',
+          defaultToolbar: []
+        });
+      }
+
+      table.on('cell(data-table)', function (obj) {       
+        
+        console.log(obj);
+       
+      });
+
+
+
+
+
+
+      function GetQueryString(name, istop) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
+
+        if (r != null) return unescape(r[2]);
+        return null;
+      }
+
+    });
+  </script>
+</body>
+
+</html>
--- a/WebRoot/view/tb/org/upload_excel.html
+++ b/WebRoot/view/tb/org/upload_excel.html
@ -81,13 +81,21 @@
                elem: '#upload-excel',
                url: '/QingLong/collect/uoloadTemplate',
                exts: 'xlsx',
-                done: function (res) {                    
-                    layer.msg("上传成功！", {
-                        icon: 1,
-                        time: 1500
-                    }, function () {
-                        window.location = "./fields_set.html?job_id=" + res.job_id;
-                    });
+                done: function (res) {
+                    if (res.success) {
+                        layer.msg("上传成功！", {
+                            icon: 1,
+                            time: 1500
+                        }, function () {
+                            window.location = "./fields_set.html?job_id=" + res.job_id;
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2,
+                            time: 4500
+                        });
+                    }
+
                }
            });