Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

@@ -153,7 +153,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
         form.render();
         form.render();
         if (pollName) {
         if (pollName) {
             var url = common.domainName + '/inspection-report/dataSource/findByPollName';
             var url = common.domainName + '/inspection-report/dataSource/findByPollName';
-            $.get(url, {'pollName': pollName, 'access_token': accessToken}, function (res) {
+            $.get(url, {'pollName': pollName, 'accessToken': accessToken}, function (res) {
                 if (res.object) {
                 if (res.object) {
                     let data = res.object;
                     let data = res.object;
                     var $form = $("#datasourceAddForm");
                     var $form = $("#datasourceAddForm");
@@ -223,26 +223,25 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
         form.on('submit(datasource-add-submit)', function (data) {
         form.on('submit(datasource-add-submit)', function (data) {
             var bean = data.field;
             var bean = data.field;
             var loading = layer.load(2);
             var loading = layer.load(2);
-            $.ajax({
+            admin.req({
                 type: 'post',
                 type: 'post',
                 url: common.domainName + '/inspection-report/dataSource/saveOrUpdate',
                 url: common.domainName + '/inspection-report/dataSource/saveOrUpdate',
                 contentType: "application/json; charset=utf-8",
                 contentType: "application/json; charset=utf-8",
-                data: JSON.stringify(bean),
-                success: function (res) {
-                    layer.close(loading);
-                    if (res.success) {
-                        layer.msg('保存成功', {
-                            offset: '15px'
-                            , icon: 1
-                            , time: 2000
-                        }, function () {
-                            layer.closeAll();
-                            table.reload('datasource_table', {});
-                        })
-                    } else {
-                        layer.msg(res.msg, {offset: '15px', icon: 7, time: 1500});
-                        return false
-                    }
+                data: JSON.stringify(bean)
+            }).done(function (res) {
+                layer.close(loading);
+                if (res.success) {
+                    layer.msg('保存成功', {
+                        offset: '15px'
+                        , icon: 1
+                        , time: 2000
+                    }, function () {
+                        layer.closeAll();
+                        table.reload('datasource_table', {});
+                    })
+                } else {
+                    layer.msg(res.msg, {offset: '15px', icon: 7, time: 1500});
+                    return false
                 }
                 }
             });
             });
 
 
@@ -252,18 +251,17 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
             admin.req({
             admin.req({
                 url: `${common.domainName}/inspection-report/dataSource/findAllDatabase`,
                 url: `${common.domainName}/inspection-report/dataSource/findAllDatabase`,
                 method: 'GET',
                 method: 'GET',
-                async: false,
-                success: function (res) {
-                    data = res.data;
-                    if (res && res.data) {
-                        var options = "<option value=''>=请选择=</option>";
-                        $.each(res.data, function (i, v) {
-                            options += '<option value="' + v + '">' + v + '</option>';
-                        });
-                        $('#instance').html($(options));
-                    }
-                    form.render('select');
+                async: false
+            }).done(function (res) {
+                data = res.data;
+                if (res && res.data) {
+                    var options = "<option value=''>=请选择=</option>";
+                    $.each(res.data, function (i, v) {
+                        options += '<option value="' + v + '">' + v + '</option>';
+                    });
+                    $('#instance').html($(options));
                 }
                 }
+                form.render('select');
             });
             });
         }
         }
 
 

@@ -52,7 +52,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             elem: '#datasource_table'
             elem: '#datasource_table'
             , url: domainName + '/inspection-report/dataSource/page'
             , url: domainName + '/inspection-report/dataSource/page'
             , where: {
             , where: {
-                access_token: accessToken,
+                accessToken: accessToken,
                 datasourceName: $('#datasourceSearchForm').find("input[name='keyword']").val(),
                 datasourceName: $('#datasourceSearchForm').find("input[name='keyword']").val(),
             }
             }
             , height: 'full-200'
             , height: 'full-200'
@@ -217,7 +217,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     curr: 1
                     curr: 1
                 }
                 }
                 , where: {
                 , where: {
-                    access_token: accessToken,
+                    accessToken: accessToken,
                     datasourceName: $('#datasourceSearchForm').find("input[name='keyword']").val(),
                     datasourceName: $('#datasourceSearchForm').find("input[name='keyword']").val(),
                 }
                 }
             });
             });

@@ -493,7 +493,7 @@ layui.define(['table', 'form', 'laydate', 'laytpl', 'common', 'sessions', 'xmSel
                             $.get(url, {
                             $.get(url, {
                                 "pollName": pollName,
                                 "pollName": pollName,
                                 "content": content,
                                 "content": content,
-                                'access_token': accessToken
+                                'accessToken': accessToken
                             }, function (res) {
                             }, function (res) {
                                 if (res.success) {
                                 if (res.success) {
                                     let optionHtml = '<option value="">请选择</option>';
                                     let optionHtml = '<option value="">请选择</option>';