Explorar o código

修改-任务列表相关 - udp待定

apple %!s(int64=5) %!d(string=hai) anos
pai
achega
43b712d5c4

+ 2 - 0
src/service/task_rule.go

@@ -85,6 +85,8 @@ func (task *TaskRule) TaskSave() {
 			log.Println("新建-数据")
 			data["i_createtime"] = curtime
 			data["s_createuser"] = user["name"]
+			data["i_updatetime"] = curtime
+
 		}else {
 			log.Println("更新-数据",id)
 			data["i_updatetime"] = curtime

+ 1 - 1
src/web/templates/login.html

@@ -93,7 +93,7 @@ function login(){
 		data:{"email":email,"pwd":pwd},
 		success:function(r){
 			if(r.checked){
-				window.location.href="/service/rule/list"
+				window.location.href="/service/task/list"
 			}else{
 				alert("fail");
 			}

+ 23 - 9
src/web/templates/task/task_list.html

@@ -25,6 +25,7 @@
                             <tr>
                                 <th>编号</th>
                                 <th>任务名称</th>
+                                <th>创建员</th>
                                 <th>修改时间</th>
                                 <th>操作</th>
                                 <th>功能</th>
@@ -75,14 +76,15 @@
                 });
             },
             "columns": [
-                {"data": null,width:"10%"},
+                {"data": null,width:"8%"},
                 {"data": "s_taskname"},
-                {"data": "i_updatetime",width:"20%", render: function (val) {
+                {"data": "s_createuser",width:"8%"},
+                {"data": "i_updatetime",width:"18%", render: function (val) {
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000);
                         return dt.format("yyyy-MM-dd hh-mm-ss")
                     }},
-                {"data": "_id", width:"20%",render: function (val, a, row, pos) {
+                {"data": "_id", width:"18%",render: function (val, a, row, pos) {
                         tmp = '<div>' +
                             '<a class="btn btn-sm btn-primary" href="/service/task/edit?id='+val+'">编辑</a>'+
                             '&nbsp'+'&nbsp'+
@@ -90,14 +92,26 @@
                             '</div>';
                         return tmp
                     }},
-                {"data": "_id", width:"20%",render: function (val, a, row, pos) {
-                        tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" onclick="start_task(\''+val+'\')">启动</a>'+
-                            '&nbsp'+'&nbsp'+
-                            '<a class="btn btn-sm btn-danger" onclick="end_task(\''+val+'\')">关闭</a>'+
-                            '</div>';
+                {"data": "_id", width:"18%",render: function (val, a, row, pos) {
+
+                        if (row.s_isuse=="0") {
+                            //未启动
+                            tmp = '<div>' +
+                                '<a class="btn btn-sm btn-primary" onclick="start_task(\''+val+'\')">启动</a>'+
+                                '&nbsp'+'&nbsp'+
+                                '<a class="btn btn-sm btn-info" disabled="true" onclick="end_task(\''+val+'\')">关闭</a>'+                                '</div>';
+                                '<div>';
+                        } else {
+                            tmp = '<div>'+
+                                '<a class="btn btn-sm btn-primary" disabled="true" onclick="start_task(\''+val+'\')">已启动</a>'+
+                                '&nbsp'+'&nbsp'+
+                                '<a class="btn btn-sm btn-info" onclick="end_task(\''+val+'\')">关闭</a>'+
+                                '</div>';
+                        }
+
                         return tmp
                     }}
+
             ]
         });
     });