Merge branch 'master-mj-joke' into 'master-mj'

feat:页面集成优化

feat:页面集成优化

See merge request !1085

@@ -187,7 +187,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
             var ddicNames = [];
             admin.req({
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/coll_frequency'
-                , method: 'POST'
+                , method: 'get'
                 , async: false
                 , success: function (res) {
                     res.data.sort(compare);

@@ -20,7 +20,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
             var data = [];
             admin.req({
                 url: `${domainName}/api-web/manage/ddic/findSucDdics/collType?access_token=${accessToken}`,
-                method: 'POST',
+                method: 'get',
                 async: false,
                 success: function (res) {
                     data = res.data;

@@ -600,9 +600,9 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 accessToken = sessions.getToken()['access_token'];
             });
             var options = "<option value=''>=请选择=</option>";
-            $.ajax({
+            admin.req({
                 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}`
-                , method: 'POST'
+                , method: 'get'
                 , success: function (res) {
                     if (res && res.data) {
                         var ddiclist = res.data;
@@ -1239,6 +1239,16 @@ layui.define(['xmSelect', 'md5'], function (exports) {
             document.body.removeChild(alink);
         },
 
+        hasPermission: function (permission) {
+            //TODO 后期调整获取checkList方法，目前未获取到，临时屏蔽
+            // var checkList = localStorage.getItem("permission");
+            // if ($.inArray(permission, checkList) == -1) {
+            //     layer.msg('暂无权限!', {icon: 7, time: 3000});
+            //     return false;
+            // }
+            return true;
+        },
+
         /**检查权限*/
         checkPermission: function (access_token) {
             // Start Wang 2021/12/13 19:42 权限列表，如果能从缓存中加载到数据，则获取缓存中的数据

@@ -10,6 +10,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
     var layer = layui.layer;
     var xmSelect = layui.xmSelect;
     var shell = layui.shell;
+    var admin = layui.admin;
     //对外暴露的接口
     exports('dirctiveAdd', function (data) {
         var updateDesc = '';
@@ -242,7 +243,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
             collDirctive.outputs = getDirctiveOutput();
             delete collDirctive['xxx'];
             var load = layer.load(2);
-            $.ajax({
+            admin.req({
                 type: 'post',
                 data: JSON.stringify(collDirctive),
                 url: domainName + '/api-web/manage/dirctive/saveDirctive?access_token=' + token,
@@ -290,7 +291,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
                         var token = localStorage.getItem("access_token");
                         var collDirctive = {};
                         collDirctive.dirctiveCode = code;
-                        $.ajax({
+                        admin.req({
                             type: 'post',
                             async: false,
                             data: JSON.stringify(collDirctive),
@@ -480,7 +481,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
                     return;
                 }
 
-                $.ajax({
+                admin.req({
                     type: "post",
                     contentType: "application/json;charset=UTF-8",
                     data: JSON.stringify(collDirctive),
@@ -552,8 +553,8 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
         //获取ddic值，组装下拉菜单
         function getDdics(ddicCategory, callback) {
             var token = localStorage.getItem("access_token");
-            $.ajax({
-                type: 'post',
+            admin.req({
+                type: 'get',
                 url: domainName + '/api-web/manage/ddic/findSucDdics/' + ddicCategory + '?access_token=' + token,
                 contentType: "application/json; charset=utf-8",
                 success: callback
@@ -583,7 +584,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
         function getProtocols() {
             var token = localStorage.getItem("access_token");
             //alert(token);
-            $.ajax({
+            admin.req({
                 type: 'get',
                 url: domainName + '/api-web/manage/protocol/findProtocolList?access_token=' + token,
                 contentType: "application/json; charset=utf-8",
@@ -627,7 +628,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
         function getKpis() {
             var loding = layer.load(1);
             var token = localStorage.getItem("access_token");
-            $.ajax({
+            admin.req({
                 type: 'get',
                 url: domainName + '/api-web/manage/kpi/list?access_token=' + token,
                 contentType: "application/json; charset=utf-8",
@@ -656,7 +657,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
 
         function getDirctive(id) {
             var token = localStorage.getItem("access_token");
-            $.ajax({
+            admin.req({
                 type: 'get',
                 url: domainName + '/api-web/manage/dirctive/findCollDirctiveById/' + id + '?access_token=' + token + '&type=' + type,
                 contentType: "application/json; charset=utf-8",

@@ -5,6 +5,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
     var table = layui.table;
     var common = layui.common;
     var view = layui.view;
+    var admin = layui.admin;
     var dataArr = [];
     //对外暴露的接口
     exports('dirctiveCheckTemplateAdd', function (data) {
@@ -13,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
         var sessions = layui.sessions;
         var accessToken = sessions.getToken().access_token;
         form.render();
-        $.ajax({
+        admin.req({
             url: common.domainName + '/api-web/manage/dirctive/findCheckTemplate?access_token=' + accessToken + '&dirctiveId=' + id,
             type: 'get',
             success: function (res) {
@@ -122,7 +123,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
             })
             bean['dirctiveId'] = id;
             bean['arr'] = arr;
-            $.ajax({
+            admin.req({
                 type: 'post',
                 url: common.domainName + '/api-web/manage/dirctive/saveCheckTemplate?access_token=' + accessToken,
                 contentType: "application/json; charset=utf-8",

@@ -58,8 +58,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         }
 
         $("#syncdirctive").unbind().on("click", function () {
-            if ($.inArray('back:dirctive:synchronization', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:dirctive:synchronization')){
                 return;
             }
             var data = table.checkStatus('dirctive_table').data;
@@ -84,8 +83,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         })
 
         $("#adddirctive").unbind().on("click", function () {
-            if ($.inArray('back:dirctive:save', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:dirctive:save')){
                 return;
             }
             openEditHtml(undefined, undefined);
@@ -209,8 +207,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
 
                 //点击协议名称 进行编辑
                 $('[dirctive-data-edit]').on('click', function () {
-                    if ($.inArray('back:dirctive:update', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:dirctive:update')){
                         return;
                     }
                     openEditHtml($(this).attr("dirctive-data-edit"), $(this).data("dirctivecode"), $(this).data("isdefault"));
@@ -233,7 +230,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                         resize: false,
                         scrollbar: true,
                         success: function (layero, index) {
-                            $.ajax({
+                            admin.req({
                                 url: common.domainName + '/api-web/manage/dirctive/findOutputsById?access_token=' + accessToken + '&dirctiveId=' + dirctiveId,
                                 type: 'get',
                                 success: function (res) {
@@ -281,8 +278,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                         }
                     });
                     $(this).parents('tr').eq(0).addClass("tbody-tr-background-color");
-                    if ($.inArray('back:dirctive:restoreVersion', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:dirctive:restoreVersion')){
                         return;
                     }
                     var dirctiveId = $(this).attr("dirctive-id");

@@ -18,7 +18,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
 
         //初始化下拉框数据
         function initSelect() {
-            $.ajax({
+            admin.req({
                 url: common.domainName + '/api-web/manage/kpi/initSelect?access_token=' + accessToken,
                 async: false,
                 type: 'get',
@@ -32,7 +32,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
                     $("#kpiAddForm").find("select[name='kpiUnit']").append(unitStr);
                     form.render();
                     if (kpiId) {
-                        $.ajax({
+                        admin.req({
                             url: common.domainName + '/api-web/manage/kpi/findById?access_token=' + accessToken,
                             data: {"kpiId": kpiId},
                             success: function (res) {
@@ -91,7 +91,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
             //获取采集类型字典
             admin.req({
                 url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER'
-                , method: 'POST'
+                , method: 'get'
                 , async: false
                 , success: function (res) {
                     var ddicPower = [];

@@ -50,7 +50,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 }
             });
 
-            $.ajax({
+            admin.req({
                 url: domainName + '/api-web/manage/kpi/initSelect?access_token=' + accessToken,
                 type: 'get',
                 sync: false,
@@ -81,9 +81,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     searchEvent();
                 }
             });
-            $.ajax({
+            admin.req({
                 url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER?access_token=' + accessToken,
-                method: 'POST',
+                method: 'get',
                 sync: false,
                 success: function (res) {
                     var ddicPower = [];
@@ -214,8 +214,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 done: function (res, curr, count) {
                     //点击协议名称 进行编辑
                     $('[kpi-data-edit]').on('click', function () {
-                        if ($.inArray('back:kpi:update', checkList) == -1) {
-                            layer.msg('暂无权限!', {icon: 7, time: 3000});
+                        if(!common.hasPermission('back:kpi:update')){
                             return;
                         }
                         openEditHtml($(this).attr("kpi-data-edit"));
@@ -345,7 +344,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             }
             var loading = layer.load(2);
             var param = kpiName + kpiUnit;
-            $.ajax({
+            admin.req({
                 url: domainName + '/api-web/manage/kpi/checkKpiName?access_token=' + accessToken + '&kpiName=' + param,
                 success: function (res) {
                     var bean = res.object;
@@ -409,7 +408,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     }
                 }
 
-                $.ajax({
+                admin.req({
                     url: common.domainName + '/api-web/manage/kpi/save?access_token=' + accessToken,
                     type: 'post',
                     data: JSON.stringify(submitData),
@@ -428,7 +427,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 })
             } else {  //新增
                 if (kpiName && kpiUnit) {
-                    $.ajax({
+                    admin.req({
                         url: domainName + '/api-web/manage/kpi/checkKpiName?access_token=' + accessToken + '&kpiName=' + param,
                         success: function (res) {
                             var bean = res.object;
@@ -471,7 +470,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                     }
 
 
-                                    $.ajax({
+                                    admin.req({
                                         url: common.domainName + '/api-web/manage/kpi/save?access_token=' + accessToken,
                                         type: 'post',
                                         data: JSON.stringify(submitData),
@@ -519,16 +518,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         })
         //新增
         $("#addkpi").on("click", function () {
-            if ($.inArray('back:kpi:save', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if(!common.hasPermission('back:kpi:save')){
                 return;
             }
             openEditHtml();
         })
 
         function deleteByIds(ids) {
-            if ($.inArray('back:kpi:delete', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:kpi:delete')){
                 return;
             }
             //确认提示框

@@ -146,8 +146,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
             done: function (res) {
                 // 点击编辑事件
                 $('.table-btn-task-edit').click(function () {
-                    if ($.inArray('back:task:update', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:task:update')){
                         return;
                     }
                     var task = JSON.parse(JSON.stringify(res.data[$(this).data('index')]));
@@ -290,8 +289,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
 
         // 添加事件
         $('#btn-task-add').unbind('click').click(function () {
-            if ($.inArray('back:task:save', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:task:save')){
                 return;
             }
             saveTask('insert', '新增');
@@ -351,8 +349,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
 
         // 删除事件
         $('#btn-task-delete').unbind('click').click(function () {
-            if ($.inArray('back:task:delete', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (common.hasPermission('back:task:delete')){
                 return;
             }
             var checks = getTaskChecks();

@@ -21,8 +21,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             var data = [];
             admin.req({
                 url: domainName + '/api-web/manage/ddic/findSucDdics/provider',
-                method: 'POST',
-                // async: false,
+                method: 'get',
+                async: false,
                 success: function (res) {
                     data = res.data;
                     providerData = res.data;

@@ -19,6 +19,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common'
         , device = layui.device()
         , common = layui.common
         , sessions = layui.sessions
+        , admin = layui.admin
         , accessToken = sessions.getToken()['access_token']
 
         //外部接口
@@ -262,7 +263,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common'
     //默认配置
     Class.prototype.config = (function () {
         var remoteConfig = {};
-        $.ajax({
+        admin.req({
             url: common.domainName + '/api-web/home/getConfig',
             async: false,
             data: {
@@ -748,7 +749,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common'
 
             that.loading();
 
-            $.ajax({
+            admin.req({
                 type: options.method || 'get'
                 , url: options.url
                 , contentType: options.contentType

@@ -605,7 +605,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
             var options = "<option value=''>=请选择=</option>";
             $.ajax({
                 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}`
-                , method: 'POST'
+                , method: 'get'
                 , success: function (res) {
                     if (res && res.data) {
                         var ddiclist = res.data;
@@ -1786,6 +1786,15 @@ layui.define(['xmSelect', 'md5'], function (exports) {
             });
             return value;
         },
+        hasPermission: function (permission) {
+            //TODO 后期调整获取checkList方法，目前未获取到，临时屏蔽
+            // var checkList = localStorage.getItem("permission");
+            // if ($.inArray(permission, checkList) == -1) {
+            //     layer.msg('暂无权限!', {icon: 7, time: 3000});
+            //     return false;
+            // }
+            return true;
+        }
 
     };