From 9f96c52458ec04fe9c65279b4aef3d5f6de514d1 Mon Sep 17 00:00:00 2001
From: bobi <bobi1234@foxmail.com>
Date: Mon, 2 Sep 2019 09:17:33 +0800
Subject: [PATCH] add:task.html

---
 lib/layui/lay/okmodules/okMock.js |  3 ++
 pages/often/task.html             | 59 ++++++++++++++-----------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/lib/layui/lay/okmodules/okMock.js b/lib/layui/lay/okmodules/okMock.js
index 64836ab..9be7450 100644
--- a/lib/layui/lay/okmodules/okMock.js
+++ b/lib/layui/lay/okmodules/okMock.js
@@ -26,6 +26,9 @@ layui.define([], function(exprots) {
             article: {
                 list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/article/list"
             },
+			task: {
+			    list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/task/list"
+			},
             product: {
                 list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/product/list"
             },
diff --git a/pages/often/task.html b/pages/often/task.html
index f690eb3..13dbdab 100644
--- a/pages/often/task.html
+++ b/pages/often/task.html
@@ -37,6 +37,7 @@
         <script src="../../lib/layui/layui.js"></script>
         <script>
             layui.use(["element", "table", "form", "laydate", "okLayer", "okUtils", "okMock"], function () {
+				var element = layui.element;
                 var table = layui.table;
                 var form = layui.form;
                 var util = layui.util;
@@ -52,7 +53,7 @@
 
                 var articleTable = table.render({
                     elem: "#tableId",
-                    url: okMock.api.article.list,
+                    url: okMock.api.task.list,
                     limit: 20,
                     page: true,
                     even: true,
@@ -61,16 +62,18 @@
                     cols: [[
                         {type: "checkbox", fixed: "left"},
                         {field: "guid", title: "GUID", width: 280, sort: true},
-                        {field: "title", title: "标题", width: 350},
-                        {field: "url", title: "链接", width: 250, templet: "#urlTpl"},
-                        {field: "publisher", title: "发布者", width: 100},
-                        {field: "readSize", title: "阅读量", width: 80},
-                        {field: "isTop", title: "是否置顶", width: 100, align: "center", templet: "#topTpl"},
-                        {field: "status", title: "发布状态", width: 110, align: "center", templet: "#statusTpl"},
+                        {field: "name", title: "任务名称", width: 350},
+						{field: "createTime", title: "任务创建时间", width: 150},
+						{field: "startTime", title: "任务开始时间", width: 150},
+						{field: "endTime", title: "任务结束时间", width: 150},
+                        {field: "createUser", title: "任务创建人", width: 100},
+                        {field: "progress", title: "任务进度", width: 200, templet: "#progressTpl"},
+                        {field: "status", title: "任务状态", width: 110, align: "center", templet: "#statusTpl"},
                         {title: "操作", width: 100, align: "center", fixed: "right", templet: "#operationTpl"}
                     ]],
                     done: function (res, curr, count) {
-                        console.log(res, curr, count)
+                        console.log(res, curr, count);
+						element.init();
                     }
                 });
 
@@ -189,34 +192,26 @@
                 <button class="layui-btn layui-btn-sm" lay-event="add">添加文章</button>
             </div>
         </script>
-        <!-- 链接模板 -->
-        <script type="text/html" id="urlTpl">
-            <a href="{{d.url}}" target="_blank">{{d.url}}</a>
-        </script>
-        <!-- 是否指顶模板
-            <input type="checkbox" name="isTop" value="{{d.isTop}}" lay-skin="switch" lay-text="是|否" {{ d.isTop== true ? 'checked' : ''}}>
-        -->
-        <script type="text/html" id="topTpl">
-            {{#  if(d.isTop == true){ }}
-            <span class="layui-btn layui-btn-normal layui-btn-xs">已置顶</span>
-            {{#  } else if(d.isTop == false) { }}
-            <span class="layui-btn layui-btn-warm layui-btn-xs">未置顶</span>
-            {{#  } }}
-        </script>
-        <!-- 发布状态模板
-            <input type="checkbox" name="top" value="{{d.status}}" lay-skin="switch" lay-text="已发布|未发布" {{ d.status== true ? 'checked' : ''}}>
-        -->
-        <script type="text/html" id="statusTpl">
-            {{#  if(d.status == true){ }}
-            <span class="layui-btn layui-btn-normal layui-btn-xs">已发布</span>
-            {{#  } else if(d.status == false) { }}
-            <span class="layui-btn layui-btn-warm layui-btn-xs">未发布</span>
-            {{#  } }}
-        </script>
         <!-- 行工具栏模板 -->
         <script type="text/html" id="operationTpl">
             <a href="javascript:" title="编辑" lay-event="edit"><i class="layui-icon">&#xe642;</i></a>
             <a href="javascript:" title="删除" lay-event="del"><i class="layui-icon">&#xe640;</i></a>
         </script>
+		<!-- 任务进度 -->
+		<script type="text/html" id="progressTpl">
+			<div class="layui-progress">
+			  <div class="layui-progress-bar" lay-percent="{{d.progress}}"></div>
+			</div>
+		</script>
+		<!-- 任务状态 -->
+		<script type="text/html" id="statusTpl">
+		    {{#  if(d.status == 0){ }}
+				<span class="layui-btn layui-btn-normal layui-btn-xs">未开始</span>
+		    {{#  } else if(d.status == 1) { }}
+				<span class="layui-btn layui-btn-warm layui-btn-xs">进行中</span>
+			{{#  } else if(d.status == 2) { }}
+				<span class="layui-btn layui-btn-danger layui-btn-xs">已完成</span>
+		    {{#  } }}
+		</script>
     </body>
 </html>