Authored by 王涛

Merge branch 'master-v32-xwx' into 'master'

宁夏-自动化巡检-添加数据源失败



See merge request !392
@@ -100,7 +100,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', ' @@ -100,7 +100,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'view', '
100 }); 100 });
101 101
102 $('.link-delete-analysissql').unbind('click').on('click', function () { 102 $('.link-delete-analysissql').unbind('click').on('click', function () {
103 - deleteByIdList([$(this).data(id)]) 103 + deleteByIdList([$(this).data('id')])
104 }); 104 });
105 105
106 form.on('switch(switch-analysissql-sync)', function (obj) { 106 form.on('switch(switch-analysissql-sync)', function (obj) {
@@ -147,7 +147,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat @@ -147,7 +147,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat
147 jdbcurl = setJdbcUrlValue('instance',instance); 147 jdbcurl = setJdbcUrlValue('instance',instance);
148 } 148 }
149 } 149 }
150 - $('input[name="url"]').val(jdbcurl); 150 + $('input[name="url"]').val(jdbcurl+'&serverTimezone=GMT%2B8');
151 }); 151 });
152 152
153 form.render(); 153 form.render();