xiugai

src/web/templates/private/customer_history.html

@@ -113,8 +113,8 @@
                                                 <div class="col-sm-2">
                                                     <select class="form-control selectpicker" id="extfiledselect">
                                                         <option value="2">高级字段包</option>
-                                                        <option value="1">初级字段包</option>
-                                                        <option value="3">特殊字段包</option>
+                                                        <option value="1">标准字段包</option>
+                                                        <option value="3">深信服字段包</option>
                                                     </select>
                                                     <script>
                                                         $('#extfiledselect').on("change", function () {

src/web/templates/private/historylog_list.html

@@ -160,11 +160,14 @@
                     }
                 },
                 {
-                    "data": "updatetime",
-                    render: function(val) {
-                        var dt = new Date()
-                        dt.setTime(parseInt(val) * 1000)
-                        return dt.format("yyyy-MM-dd hh:mm:ss")
+                    "data": "finishtime",
+                    render: function(val) {
+                        if (val === undefined){
+                            return "未执行"
+                        }
+                        var dt = new Date()
+                        dt.setTime(parseInt(val) * 1000)
+                        return dt.format("yyyy-MM-dd hh:mm:ss")
                     }
                 },
                 {
@@ -280,7 +283,7 @@
                     "data": "finishtime",
                     render: function(val) {
                         if (val === undefined){
-                            return 未执行
+                            return "未执行"
                         }
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000)