Merge branch 'master' of http://112.124.40.88:5510/root/BeijingSafeguard

04.系统编码/App/Content/scripts/beijing/result-list.js

@@ -72,7 +72,7 @@
         list.empty();
 
         points.forEach(function (point) {
-            var time = moment(point[2], "YYYYMMDD_HHmmss");
+            var time = moment(point[3], "YYYYMMDD_HHmmss");
             var label = "<li time='{0}'>{1}</li>".format(point[2], time.format("YYYY-MM-DD HH:mm"));
             list.append(label);
         });

04.系统编码/App/Content/scripts/menggu/realtime-panel.js

@@ -220,7 +220,6 @@
             success: function (result) {
                 this.TaskStopped();
                 this.MessageBox("warning", result.info);
-                this.Parent.HistoryPanel.ReloadDataGrid();
             }.bind(this),
             complete: function () {
                 $('.param-label').removeClass('label-shade');
@@ -251,7 +250,8 @@
             url: '/Menggu/AddTask',
             data: this.GetTaskParams(taskId),
             success: function (result) {
-                console.log(result);
+                this.Parent.HistoryPanel.InitDateTimes();
+                this.Parent.HistoryPanel.ReloadDataGrid();
             }.bind(this)
         });
     };

04.系统编码/App/Content/scripts/menggu/result-list.js

@@ -72,7 +72,7 @@
         list.empty();
 
         points.forEach(function (point) {
-            var time = moment(point[2], "YYYYMMDD_HHmmss");
+            var time = moment(point[3], "YYYYMMDD_HHmmss");
             var label = "<li time='{0}'>{1}</li>".format(point[2], time.format("YYYY-MM-DD HH:mm"));
             list.append(label);
         });