'commit'

2 years ago · d5e082603b
parent 6d287ad3cd
commit d5e082603b
15 changed files with 179 additions and 22 deletions
--- a/WebRoot/Excel/292e5ac9-fa42-4f08-90e1-9937a6c3466c.xlsx
+++ b/WebRoot/Excel/292e5ac9-fa42-4f08-90e1-9937a6c3466c.xlsx
--- a/WebRoot/Excel/2c2697f1-bd86-4175-a080-39c12c24f080.xlsx
+++ b/WebRoot/Excel/2c2697f1-bd86-4175-a080-39c12c24f080.xlsx
--- a/WebRoot/Excel/b6f6adaa-a1d0-4906-a6b8-00318abaed65.xlsx
+++ b/WebRoot/Excel/b6f6adaa-a1d0-4906-a6b8-00318abaed65.xlsx
--- a/WebRoot/view/tb/org/fields_set.html
+++ b/WebRoot/view/tb/org/fields_set.html
@ -226,7 +226,7 @@
                        success: function (result) {
                            if (result.success) {
                                $('#ico' + initSheetIndex).removeClass('dh_ico');
-                                layer.msg("成功！", {
+                                layer.msg("确认成功！", {
                                    icon: 1,
                                    time: 1500
                                });
--- a/WebRoot/view/tb/org/iconfont/demo_index.html
+++ b/WebRoot/view/tb/org/iconfont/demo_index.html
@ -54,6 +54,24 @@
      <div class="content unicode" style="display: block;">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+              <span class="icon iconfont">&#xe650;</span>
+                <div class="name">修改</div>
+                <div class="code-name">&amp;#xe650;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe628;</span>
+                <div class="name">发布</div>
+                <div class="code-name">&amp;#xe628;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b6;</span>
+                <div class="name">删除</div>
+                <div class="code-name">&amp;#xe8b6;</div>
+              </li>
+          
            <li class="dib">
              <span class="icon iconfont">&#xe666;</span>
                <div class="name">导出</div>
@ -102,9 +120,9 @@
 <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1703553854725') format('woff2'),
-       url('iconfont.woff?t=1703553854725') format('woff'),
-       url('iconfont.ttf?t=1703553854725') format('truetype');
+  src: url('iconfont.woff2?t=1703558481696') format('woff2'),
+       url('iconfont.woff?t=1703558481696') format('woff'),
+       url('iconfont.ttf?t=1703558481696') format('truetype');
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -130,6 +148,33 @@
      <div class="content font-class">
        <ul class="icon_lists dib-box">
          
+          <li class="dib">
+            <span class="icon iconfont icon-xiugai"></span>
+            <div class="name">
+              修改
+            </div>
+            <div class="code-name">.icon-xiugai
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fabu"></span>
+            <div class="name">
+              发布
+            </div>
+            <div class="code-name">.icon-fabu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shanchu"></span>
+            <div class="name">
+              删除
+            </div>
+            <div class="code-name">.icon-shanchu
+            </div>
+          </li>
+          
          <li class="dib">
            <span class="icon iconfont icon-daochu"></span>
            <div class="name">
@ -202,6 +247,30 @@
      <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-xiugai"></use>
+                </svg>
+                <div class="name">修改</div>
+                <div class="code-name">#icon-xiugai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fabu"></use>
+                </svg>
+                <div class="name">发布</div>
+                <div class="code-name">#icon-fabu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shanchu"></use>
+                </svg>
+                <div class="name">删除</div>
+                <div class="code-name">#icon-shanchu</div>
+            </li>
+          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
                  <use xlink:href="#icon-daochu"></use>
--- a/WebRoot/view/tb/org/iconfont/iconfont.css
+++ b/WebRoot/view/tb/org/iconfont/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 4386424 */
-  src: url('iconfont.woff2?t=1703553854725') format('woff2'),
-       url('iconfont.woff?t=1703553854725') format('woff'),
-       url('iconfont.ttf?t=1703553854725') format('truetype');
+  src: url('iconfont.woff2?t=1703558481696') format('woff2'),
+       url('iconfont.woff?t=1703558481696') format('woff'),
+       url('iconfont.ttf?t=1703558481696') format('truetype');
 }

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

+.icon-xiugai:before {
+  content: "\e650";
+}
+
+.icon-fabu:before {
+  content: "\e628";
+}
+
+.icon-shanchu:before {
+  content: "\e8b6";
+}
+
 .icon-daochu:before {
  content: "\e666";
 }
--- a/WebRoot/view/tb/org/iconfont/iconfont.js
+++ b/WebRoot/view/tb/org/iconfont/iconfont.js
--- a/WebRoot/view/tb/org/iconfont/iconfont.json
+++ b/WebRoot/view/tb/org/iconfont/iconfont.json
@ -5,6 +5,27 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "567336",
+      "name": "修改",
+      "font_class": "xiugai",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "5769645",
+      "name": "发布",
+      "font_class": "fabu",
+      "unicode": "e628",
+      "unicode_decimal": 58920
+    },
+    {
+      "icon_id": "11372693",
+      "name": "删除",
+      "font_class": "shanchu",
+      "unicode": "e8b6",
+      "unicode_decimal": 59574
+    },
    {
      "icon_id": "12331658",
      "name": "导出",
--- a/WebRoot/view/tb/org/iconfont/iconfont.ttf
+++ b/WebRoot/view/tb/org/iconfont/iconfont.ttf
--- a/WebRoot/view/tb/org/iconfont/iconfont.woff
+++ b/WebRoot/view/tb/org/iconfont/iconfont.woff
--- a/WebRoot/view/tb/org/iconfont/iconfont.woff2
+++ b/WebRoot/view/tb/org/iconfont/iconfont.woff2
--- a/WebRoot/view/tb/org/publish.html
+++ b/WebRoot/view/tb/org/publish.html
@ -93,8 +93,8 @@
        <div class="bottom">
            <div class="button-container">
                <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="publish">
-                    <i class="layui-icon layui-icon-ok"></i>
-                    提交
+                    <i class="layui-icon layui-icon-release"></i>
+                    发布
                </button>

            </div>
@ -258,7 +258,7 @@
                    data: data.field,
                    success: function (result) {
                        if (result.success) {
-                            layer.msg("成功！", {
+                            layer.msg("发布成功！", {
                                icon: 1,
                                time: 1000
                            }, function () {
--- a/WebRoot/view/tb/org/save_excel.html
+++ b/WebRoot/view/tb/org/save_excel.html
@ -17,7 +17,7 @@
        }

        .input-width {
-            max-width: 475px
+            max-width: 470px
        }
    </style>
 </head>
@ -63,9 +63,24 @@
            // 自定义验证
            form.verify({
                taskName: [/^.{2,32}$/, '任务名称长度必须为2到32位']
+            });

+            $.ajax({
+                url: "/QingLong/collect/getJob?job_id="+jobId,
+                async: false,
+                type: 'GET',
+                success: function (res) {
+                    $("#task_name").val(res.job_name);
+                },
+                error: function (xhr, status, error) {
+                    layer.msg("获取信息异常！", {
+                        icon: 2,
+                        time: 1000
+                    });
+                }
            });

+
            form.on('submit(save)', function (data) {
                $.ajax({
                    url: '/QingLong/collect/saveJob',
@ -73,10 +88,10 @@
                    data: {
                        "job_id": jobId,
                        "job_name": $("#task_name").val()
-                    },                    
+                    },
                    success: function (result) {
                        if (result.success) {
-                            layer.msg("成功！", {
+                            layer.msg("保存成功！", {
                                icon: 1,
                                time: 1000
                            }, function () {
--- a/WebRoot/view/tb/org/task_list.html
+++ b/WebRoot/view/tb/org/task_list.html
@ -64,11 +64,11 @@
    <script type="text/html" id="table-bar">
        {{#  if(d.publish_state === 0){ }}
            <button type="button" class="layui-btn layui-btn-sm" title="发布" lay-event="publish">
-                <i class="layui-icon layui-icon-release"></i>
+                <i class="iconfont icon-fabu"></i>
            </button>
            {{#  if(d.is_clone === 0){ }}
                <button type="button" class="layui-btn layui-btn-sm" title="修改" lay-event="update">
-                    <i class="layui-icon layui-icon-edit"></i>
+                    <i class="iconfont icon-xiugai"></i>
                </button>
            {{#  } }}
            <button type="button" class="layui-btn layui-btn-sm" title="重命名" lay-event="rename">
@ -89,7 +89,7 @@
            <i class="iconfont icon-daochu"></i>
        </button>
        <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" title="删除" lay-event="del">
-            <i class="layui-icon layui-icon-delete"></i>
+            <i class="iconfont icon-shanchu"></i>
        </button>
    </script>

@ -164,7 +164,7 @@
            });

            window.publish = function (obj) {
-                if (obj.data.already_check_sheet === obj.data.all_sheet) {
+                if (obj.data.is_save === 1) {
                    layer.open({
                        type: 2,
                        title: '发布任务',
@ -175,7 +175,7 @@

                }
                else {
-                    layer.msg('该任务有未确认的Sheet表，请在修改中进行确认！', {
+                    layer.msg('该任务尚未保存，请在修改中进行保存！', {
                        icon: 3,
                        time: 3000
                    });
--- a/WebRoot/view/tb/org/test.html
+++ b/WebRoot/view/tb/org/test.html
@ -9,13 +9,53 @@
 </head>

 <body>
-    <div class="layui-progress layui-progress-big" lay-showpercent="true">
-        <div class="layui-progress-bar" lay-percent="5 / 10"></div>
-      </div>
+    <div class="layui-form">
+        <div class="layui-input-wrap">
+            <input type="text" lay-affix="clear" placeholder="请输入" class="layui-input">
+        </div>
+        <hr class="ws-space-16">
+        <div class="layui-input-wrap">
+            <input type="text" id="test" lay-affix="clear" placeholder="请输入"
+            class="layui-input input-width">
+        </div>
+        <hr class="ws-space-16">
+        <div class="layui-input-wrap">
+            <input type="text" value="禁用状态时" lay-affix="clear" disabled class="layui-input">
+        </div>
+        <hr class="ws-space-16">
+        <div class="layui-input-wrap">
+            <input type="text" value="只读状态时" lay-affix="clear" readonly class="layui-input">
+        </div>
+    </div>

    <script src="../../../component/layui/layui.js"></script>
    <script src="../../../component/pear/pear.js"></script>

+    <script>
+        layui.use(function () {
+            
+            var $ = layui.jquery;          
+
+
+            $.ajax({
+                url: "/QingLong/collect/getJob?job_id=4",
+                async: false,
+                type: 'GET',
+                success: function (res) {
+                    $("#test").val(res.job_name);
+                },
+                error: function (xhr, status, error) {
+                    layer.msg("获取信息异常！", {
+                        icon: 2,
+                        time: 1000
+                    });
+                }
+            });
+
+
+        });
+    </script>
+
 </body>

 </html>