From 11cd9f79b8e116f641f5ab1044c74d8f58a8e7e9 Mon Sep 17 00:00:00 2001
From: suwings <suwings@outlook.com>
Date: Sat, 2 Jun 2018 21:21:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper/Schedule.js                          |  2 +-
 public/template/component/console.html      |  4 ++--
 public/template/component/new_schedule.html | 13 +++++++------
 public/template/component/schedule.html     |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/helper/Schedule.js b/helper/Schedule.js
index f364d7bc..3f907c2c 100644
--- a/helper/Schedule.js
+++ b/helper/Schedule.js
@@ -30,7 +30,7 @@ function serverExe(servername, commande) {
         serverModel.sendCommand(servername, commande);
     } catch (err) {
         //默认忽略定时计划任务错误
-        MCSERVER.log("[ Schedule ] [", servername, "] 服务器计划执行时报错 | 已忽略");
+        // MCSERVER.log("[ Schedule ] [", servername, "] 服务器计划执行时报错 | 已忽略");
     }
 
 }
diff --git a/public/template/component/console.html b/public/template/component/console.html
index afd1bdd7..b0c6ae79 100644
--- a/public/template/component/console.html
+++ b/public/template/component/console.html
@@ -115,9 +115,9 @@
 						<div class="col-md-3 col-sm-6" v-on:click="toSchedule()">
 							<div class="PanelItemBlock">
 								<div class="LogV">
-									<span class="glyphicon glyphicon-erase" aria-hidden="true"> </span>
+									<span class="glyphicon glyphicon-indent-right" aria-hidden="true"> </span>
 								</div>
-								<div class="LogK">计划任务</div>
+								<div class="LogK">计划任务项目</div>
 							</div>
 						</div>
 					</div>
diff --git a/public/template/component/new_schedule.html b/public/template/component/new_schedule.html
index 62888763..063bc201 100644
--- a/public/template/component/new_schedule.html
+++ b/public/template/component/new_schedule.html
@@ -10,18 +10,18 @@
                         <table class='PropertiesList' width="80%" style="margin: auto;">
                             <tr>
                                 <th>任务间隔表达式</th>
-                                <th>任务性质</th>
+                                <th>任务次数(0 无限制)</th>
                                 <th>任务指令</th>
                             </tr>
                             <tr>
                                 <th>
-                                    <input type="text" v-model="time" placeholder="*/1 * * * * *">
+                                    <input type="text" v-model="time" placeholder="[不可为空]">
                                 </th>
                                 <th>
-                                    <input type="text" v-model="count" placeholder="未设置">
+                                    <input type="text" v-model="count" placeholder="[不可为空]">
                                 </th>
                                 <th>
-                                    <input style="width: 90%" type="text" v-model="commande" placeholder="如: stop">
+                                    <input style="width: 90%" type="text" v-model="commande" placeholder="如: stop,say Hello,__start__ 等等">
                                 </th>
                             </tr>
                         </table>
@@ -45,10 +45,11 @@
                         </p>
                         <p>其他的您基本使用不到，无需学习过多。</p>
                         <p>
-                            <b>任务性质?</b>
+                            <b>任务次数?</b>
                         </p>
                         <p>数字 0 代表重复任务，不断执行，直到您手动删除掉它。</p>
                         <p>数字大于 0 代表计次任务，代表着执行多少次之后自动删除。</p>
+                        <p>注意：如果在计次次数未归零前，控制面板被关闭，我们只能重新计次。</p>
                         <p>
                             <b>任务指令?</b>
                         </p>
@@ -84,7 +85,7 @@
             el: "#NewSchedule",
             data: {
                 id: obj.id || "",
-                time: obj.time || "",
+                time: obj.time || "* * * * * *",
                 count: obj.count || 0,
                 commande: obj.commande || "",
                 servername: servername
diff --git a/public/template/component/schedule.html b/public/template/component/schedule.html
index c9009740..9f239d5f 100644
--- a/public/template/component/schedule.html
+++ b/public/template/component/schedule.html
@@ -24,7 +24,7 @@
 							<table class='PropertiesList' width="100%">
 								<tr>
 									<th>任务序号</th>
-									<th>任务性质</th>
+									<th>任务次数</th>
 									<th>任务间隔</th>
 									<th>任务指令</th>
 									<th>操作</th>