Merge pull request #592 from midoks/dev

细节优化

class/core/mw.py

@@ -1305,6 +1305,9 @@ def getClientIp():
 def checkDomainPanel():
     tmp = getHost()
     domain = readFile('data/bind_domain.pl')
+
+    port = 7200
+    if os.path.exists('data/port.pl'):
         port = readFile('data/port.pl').strip()
 
     scheme = 'http'

route/static/app/public.js

@@ -1351,6 +1351,7 @@ function execLog(){
  * @param {String} dateFormat 返回的日期格式，默认为'H:i:s'
  */
 function getSFM(seconds, dateFormat = 'H:i:s') {
+
 	var obj = {};
  	obj.H = Number.parseInt(seconds / 3600);
  	obj.i = Number.parseInt((seconds - obj.H * 3600) / 60);
@@ -1373,37 +1374,35 @@ function getSFM(seconds, dateFormat = 'H:i:s') {
 function remind(a){
 	a = a == undefined ? 1 : a;
 	$.post("/task/list", "table=tasks&result=2,4,6,8&limit=10&p=" + a, function(g) {
-		// console.log(g);
-		var e = "";
+		var e = '';
 		var f = false;
 		var task_count = 0;
 		for(var d = 0; d < g.data.length; d++) {
-			if(g.data[d].status != '1'){
-				task_count++;
-				e += '<tr>\
-						<td><input type="checkbox"></td>\
-						<td>\
-							<div class="titlename c3">\
-								<span>'+g.data[d].name+'</span>\
-								<span class="rs-status">【'+lan.bt.task_the+'】<span>\
-								<span class="rs-time">耗时['+ getSFM(g.data[d].end - g.data[d].start) +']</span>\
-							</div>\
-						</td>\
-						<td class="text-right c3">'+g.data[d].addtime+'</td>\
-					</tr>';
-			} else{
+			var status = g.data[d].status;
+			var status_text = '已经完成';
+			var cos_text = '';
+			if (status == '1'){
+				status_text = '完成';
+				cos_text = '耗时['+getSFM(g.data[d].end - g.data[d].start)+']'
+			} else if (status == '0'){
+				status_text = '正在处理';
+				cos_text = '等待中..';
+			} else if (status == '-1'){
+				status_text = '安装中';
+				cos_text = '..';
+			}
+
 			e += '<tr>\
 				<td><input type="checkbox"></td>\
 				<td>\
 					<div class="titlename c3">'+g.data[d].name+'</span>\
-								<span class="rs-status">【'+lan.bt.task_ok+'】<span>\
-								<span class="rs-time">安装等待中...</span>\
+						<span class="rs-status">【'+status_text+'】<span>\
+						<span class="rs-time">'+cos_text+'</span>\
 					</div>\
 				</td>\
 				<td class="text-right c3">'+g.data[d].addtime+'</td>\
 			</tr>';
 		}
-		}
 		var con = '<div class="divtable"><table class="table table-hover">\
 					<thead>\
 						<tr>\
@@ -1412,7 +1411,8 @@ function remind(a){
 						</tr>\
 					</thead>\
 					<tbody id="remind">'+e+'</tbody>\
-					</table></div>\
+					</table>\
+				</div>\
 				<div class="mtb15" style="height:32px">\
 					<div class="pull-left buttongroup" style="display:none;">\
 						<button class="btn btn-default btn-sm mr5 rs-del" disabled="disabled">'+lan.public.del+'</button>\
@@ -1429,9 +1429,9 @@ function remind(a){
 
 		$("#Rs-checkAll").click(function(){
 			if($(this).prop("checked")){
-				$("#remind").find("input").prop("checked",true)
+				$("#remind").find("input").prop("checked",true);
 			} else {
-				$("#remind").find("input").prop("checked",false)
+				$("#remind").find("input").prop("checked",false);
 			}
 		});
 	},'json');

task.py

@@ -77,7 +77,7 @@ def openresty_cmd(method = 'reload'):
         return True
 
     sys_initd = '/etc/init.d/openresty'
-    if os.path.exists(install_initd):
+    if os.path.exists(sys_initd):
         os.system(sys_initd + ' ' + method)
         return True