Merge branch 'master-500-log' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-log-ztq

@@ -286,7 +286,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
 
 
         function initpolicyParam() {
         function initpolicyParam() {
             $.ajax({
             $.ajax({
-                url: "http://192.168.0.44:8080" + "/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token=" + accessToken,
+                url: domainName + "/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token=" + accessToken,
                 method: "get",
                 method: "get",
                 success(res) {
                 success(res) {
                     if (res.code == 200)
                     if (res.code == 200)
@@ -295,7 +295,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
                 }
                 }
             });
             });
             $.ajax({
             $.ajax({
-                url: "http://192.168.0.44:8080" + "/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token=" + accessToken,
+                url: domainName + "/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token=" + accessToken,
                 method: "get",
                 method: "get",
                 success(res) {
                 success(res) {
                     if (res.code == 200)
                     if (res.code == 200)
@@ -304,7 +304,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
                 }
                 }
             });
             });
             admin.req({
             admin.req({
-                url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken,
+                url: domainName + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken,
                 async: false,
                 async: false,
                 success: function (res) {
                 success: function (res) {
                     // 资源类型下拉框
                     // 资源类型下拉框

@@ -25,7 +25,12 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
         laydate.render({
         laydate.render({
             elem: '.alarm_subscribe_times'
             elem: '.alarm_subscribe_times'
             ,type: 'time'
             ,type: 'time'
-            ,range: true
+            ,range: true,
+            trigger: 'click',
+            ready: function(date){
+                $(".alarm_subscribe_times").removeAttr("lay-key");
+                $(this).attr("lay-key","1");
+            },
         });
         });
 
 
         if(data && data.id){
         if(data && data.id){
@@ -172,7 +177,12 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
             laydate.render({
             laydate.render({
                 elem: alarm_subscribe_times
                 elem: alarm_subscribe_times
                 ,type: 'time'
                 ,type: 'time'
-                ,range: true
+                ,range: true,
+                trigger: 'click',
+                ready: function(date){
+                    $(alarm_subscribe_times).removeAttr("lay-key");
+                    $(this).attr("lay-key","1");
+                },
             });
             });
 
 
             //全天
             //全天