'commit'

WebRoot/view/tb/org/task_list.html

@@ -6,6 +6,36 @@
     <title></title>
     <link rel="stylesheet" href="../../../component/pear/css/pear.css" />
     <link rel="stylesheet" href="../iconfont/iconfont.css" />
+    <style>
+        .layui-progress-text {
+            position: relative;
+            top: -27px;
+            line-height: 18px;
+            font-size: 12px;
+            color: #5f5f5f;
+        }
+
+        .layui-progress {
+            position: relative;
+            height: 11px;
+            border-radius: 20px;
+            background-color: #eee;
+        }
+
+        .layui-progress-bar {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 0;
+            max-width: 100%;
+            height: 11px;
+            border-radius: 20px;
+            text-align: right;
+            background-color: #16b777;
+            transition: all .3s;
+            -webkit-transition: all .3s;
+        }
+    </style>
 
 </head>
 
@@ -37,9 +67,12 @@
             <table id="data-table"></table>
             <script type="text/html" id="progress-Templet">
                 {{#  if(d.publish_state === 1){ }}
-                <div class="layui-progress layui-progress-big" lay-filter="fill_progress" lay-showpercent="true" style="margin-top: 8px;cursor: pointer;" onclick='progress("{{= d.job_id }}","{{= d.total_count }}","{{= d.finish_count }}")'>
+                <!-- <div class="layui-progress layui-progress-big" lay-filter="fill_progress" lay-showpercent="true" style="margin-top: 8px;cursor: pointer;" onclick='progress("{{= d.job_id }}","{{= d.total_count }}","{{= d.finish_count }}")'>
                     <div class="layui-progress-bar" lay-percent="{{= d.fill_progress }}"></div>
-                </div>
+                </div> -->
+                <div class="layui-progress" lay-showpercent="true" style="margin-top: 18px;">
+                    <div class="layui-progress-bar" lay-percent="{{= d.finish_count }} / {{= d.total_count }}"></div>
+                  </div>
                 {{# } else { }}
                     {{= d.fill_progress }}
                 {{#  } }}
@@ -252,7 +285,7 @@
                     title: '复制任务',
                     shade: 0.1,
                     area: ['450px', '200px'],
-                    content: './clone_task.html?job_id=' + obj.data.job_id+ '&job_name=' + Base64.encode(obj.data.job_name)
+                    content: './clone_task.html?job_id=' + obj.data.job_id + '&job_name=' + Base64.encode(obj.data.job_name)
                 });
             }