'commit'

2 years ago · c0089b2920
parent a24b94288b
commit c0089b2920
12 changed files with 125 additions and 11 deletions
--- a/WebRoot/Excel/7d9fb296-de59-4af1-a1d3-74cae440a009.xlsx
+++ b/WebRoot/Excel/7d9fb296-de59-4af1-a1d3-74cae440a009.xlsx
--- a/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.xlsx
+++ b/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.xlsx
--- a/WebRoot/Excel/cbd5582f-398b-4775-93f1-bbf48e44003c.xlsx
+++ b/WebRoot/Excel/cbd5582f-398b-4775-93f1-bbf48e44003c.xlsx
--- a/WebRoot/view/tb/exportPdf.html
+++ b/WebRoot/view/tb/exportPdf.html
@ -0,0 +1,61 @@
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title></title>
+    <link rel="stylesheet" href="../../component/pear/css/pear.css" />
+
+    <style mce_bogus="1">
+        body {
+            margin: 0px;
+        }
+
+        iframe {
+            border: 0px;
+        }
+    </style>
+</head>
+
+
+<body scroll="no">
+    <div id="pdfView"></div>
+    <script id="pdfScript" type="text/html">
+    <iframe id="frame3d" name="frame3d" frameborder="0" width="100%" scrolling="auto"
+            onload="this.style.height=document.body.clientHeight" height="100%" src="{{d.url}}"></iframe>
+</script>
+
+    <script src="../../component/layui/layui.js"></script>
+    <script src="../../component/pear/pear.js"></script>
+    <script src="../../component/pear/base64.js"></script>
+    <script>
+        layui.use(function () {
+            var $ = layui.jquery;
+            var laytpl = layui.laytpl;
+
+            var _url = Base64.decode(GetQueryString("url"));           
+
+            
+
+            $(document).attr("title", "查看");
+
+            var data = { "url": _url };
+
+            var pdfTpl = pdfScript.innerHTML,
+                pdfView = document.getElementById('pdfView');
+            laytpl(pdfTpl).render(data, function (html) {
+                pdfView.innerHTML = html;
+            });
+
+            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/iconfont/demo_index.html
+++ b/WebRoot/view/tb/iconfont/demo_index.html
@ -54,6 +54,12 @@
      <div class="content unicode" style="display: block;">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63e;</span>
+                <div class="name">查看</div>
+                <div class="code-name">&amp;#xe63e;</div>
+              </li>
+          
            <li class="dib">
              <span class="icon iconfont">&#xe627;</span>
                <div class="name">填报</div>
@ -126,9 +132,9 @@
 <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1703575426590') format('woff2'),
-       url('iconfont.woff?t=1703575426590') format('woff'),
-       url('iconfont.ttf?t=1703575426590') format('truetype');
+  src: url('iconfont.woff2?t=1703642321690') format('woff2'),
+       url('iconfont.woff?t=1703642321690') format('woff'),
+       url('iconfont.ttf?t=1703642321690') format('truetype');
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -154,6 +160,15 @@
      <div class="content font-class">
        <ul class="icon_lists dib-box">
          
+          <li class="dib">
+            <span class="icon iconfont icon-chakan"></span>
+            <div class="name">
+              查看
+            </div>
+            <div class="code-name">.icon-chakan
+            </div>
+          </li>
+          
          <li class="dib">
            <span class="icon iconfont icon-tianbao"></span>
            <div class="name">
@ -262,6 +277,14 @@
      <div class="content symbol">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-chakan"></use>
+                </svg>
+                <div class="name">查看</div>
+                <div class="code-name">#icon-chakan</div>
+            </li>
+          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
                  <use xlink:href="#icon-tianbao"></use>
--- a/WebRoot/view/tb/iconfont/iconfont.css
+++ b/WebRoot/view/tb/iconfont/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 4386424 */
-  src: url('iconfont.woff2?t=1703575426590') format('woff2'),
-       url('iconfont.woff?t=1703575426590') format('woff'),
-       url('iconfont.ttf?t=1703575426590') format('truetype');
+  src: url('iconfont.woff2?t=1703642321690') format('woff2'),
+       url('iconfont.woff?t=1703642321690') format('woff'),
+       url('iconfont.ttf?t=1703642321690') format('truetype');
 }

 .iconfont {
@ -13,6 +13,10 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-chakan:before {
+  content: "\e63e";
+}
+
 .icon-tianbao:before {
  content: "\e627";
 }
--- a/WebRoot/view/tb/iconfont/iconfont.js
+++ b/WebRoot/view/tb/iconfont/iconfont.js
--- a/WebRoot/view/tb/iconfont/iconfont.json
+++ b/WebRoot/view/tb/iconfont/iconfont.json
@ -5,6 +5,13 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "1305463",
+      "name": "查看",
+      "font_class": "chakan",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
    {
      "icon_id": "3401483",
      "name": "填报",
--- a/WebRoot/view/tb/iconfont/iconfont.ttf
+++ b/WebRoot/view/tb/iconfont/iconfont.ttf
--- a/WebRoot/view/tb/iconfont/iconfont.woff
+++ b/WebRoot/view/tb/iconfont/iconfont.woff
--- a/WebRoot/view/tb/iconfont/iconfont.woff2
+++ b/WebRoot/view/tb/iconfont/iconfont.woff2
--- a/WebRoot/view/tb/school/task_list.html
+++ b/WebRoot/view/tb/school/task_list.html
@ -39,9 +39,15 @@
    </div>

    <script type="text/html" id="table-bar">
-        <button type="button" class="layui-btn layui-btn-sm" title="填报" lay-event="report">
-            <i class="iconfont icon-tianbao"></i> 填报
-        </button>        
+        {{#  if(d.is_finish === 0){ }}
+            <button type="button" class="layui-btn layui-btn-sm" title="填报" lay-event="report"  style="font-size: 12px !important;">
+                <i class="iconfont icon-tianbao"></i> 填报
+            </button>
+        {{#  } else { }}
+            <button type="button" class="layui-btn layui-btn-sm" title="填报" lay-event="view" style="font-size: 12px !important;">
+                <i class="iconfont icon-chakan"></i> 查看
+            </button>
+        {{#  } }}
    </script>

    <script src="../../../component/layui/layui.js"></script>
@ -92,13 +98,22 @@
                        { title: '操作', align: 'center', width: "10%", toolbar: '#table-bar' }
                    ]],
                    skin: 'line',
-                    defaultToolbar: []
+                    defaultToolbar: [],
+                    parseData: function (res) {
+                        var data = res.data;
+                        for (var i = 0; i < data.length; i++) {  
+                            res.data[i].is_finish = isFinish;
+                        }
+                        return res;
+                    }
                });
            }

            table.on('tool(data-table)', function (obj) {
                if (obj.event === 'report') {
                    window.report(obj);
+                }else{
+                    window.view(obj);
                }
            });

@ -117,6 +132,10 @@
                }
            }

+            window.view = function (obj) {
+                console.log(obj.data);
+            }
+
            window.refresh = function (param) {
                table.reload('data-table');
            }