monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit df0cbf7402f748eb3bd97b4a8cdc9e955a056f65 1 parent 973a34c9

feat:页面集成优化

Inline Side-by-side
Showing 12 changed files with 62 additions and 50 deletions
@@ -187,7 +187,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -187,7 +187,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
187 var ddicNames = []; 187 var ddicNames = [];
188 admin.req({ 188 admin.req({
189 url: common.domainName + '/api-web/manage/ddic/findSucDdics/coll_frequency' 189 url: common.domainName + '/api-web/manage/ddic/findSucDdics/coll_frequency'
190 - , method: 'POST' 190 + , method: 'get'
191 , async: false 191 , async: false
192 , success: function (res) { 192 , success: function (res) {
193 res.data.sort(compare); 193 res.data.sort(compare);
@@ -20,7 +20,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', @@ -20,7 +20,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
20 var data = []; 20 var data = [];
21 admin.req({ 21 admin.req({
22 url: `${domainName}/api-web/manage/ddic/findSucDdics/collType?access_token=${accessToken}`, 22 url: `${domainName}/api-web/manage/ddic/findSucDdics/collType?access_token=${accessToken}`,
23 - method: 'POST', 23 + method: 'get',
24 async: false, 24 async: false,
25 success: function (res) { 25 success: function (res) {
26 data = res.data; 26 data = res.data;
@@ -600,9 +600,9 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -600,9 +600,9 @@ layui.define(['xmSelect', 'md5'], function (exports) {
600 accessToken = sessions.getToken()['access_token']; 600 accessToken = sessions.getToken()['access_token'];
601 }); 601 });
602 var options = "<option value=''>=请选择=</option>"; 602 var options = "<option value=''>=请选择=</option>";
603 - $.ajax({ 603 + admin.req({
604 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}` 604 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}`
605 - , method: 'POST' 605 + , method: 'get'
606 , success: function (res) { 606 , success: function (res) {
607 if (res && res.data) { 607 if (res && res.data) {
608 var ddiclist = res.data; 608 var ddiclist = res.data;
@@ -1239,6 +1239,16 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1239,6 +1239,16 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1239 document.body.removeChild(alink); 1239 document.body.removeChild(alink);
1240 }, 1240 },
1241 1241
  1242 + hasPermission: function (permission) {
  1243 + //TODO 后期调整获取checkList方法，目前未获取到，临时屏蔽
  1244 + // var checkList = localStorage.getItem("permission");
  1245 + // if ($.inArray(permission, checkList) == -1) {
  1246 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  1247 + // return false;
  1248 + // }
  1249 + return true;
  1250 + },
  1251 +
1242 /**检查权限*/ 1252 /**检查权限*/
1243 checkPermission: function (access_token) { 1253 checkPermission: function (access_token) {
1244 // Start Wang 2021/12/13 19:42 权限列表，如果能从缓存中加载到数据，则获取缓存中的数据 1254 // Start Wang 2021/12/13 19:42 权限列表，如果能从缓存中加载到数据，则获取缓存中的数据
@@ -10,6 +10,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -10,6 +10,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
10 var layer = layui.layer; 10 var layer = layui.layer;
11 var xmSelect = layui.xmSelect; 11 var xmSelect = layui.xmSelect;
12 var shell = layui.shell; 12 var shell = layui.shell;
  13 + var admin = layui.admin;
13 //对外暴露的接口 14 //对外暴露的接口
14 exports('dirctiveAdd', function (data) { 15 exports('dirctiveAdd', function (data) {
15 var updateDesc = ''; 16 var updateDesc = '';
@@ -242,7 +243,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -242,7 +243,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
242 collDirctive.outputs = getDirctiveOutput(); 243 collDirctive.outputs = getDirctiveOutput();
243 delete collDirctive['xxx']; 244 delete collDirctive['xxx'];
244 var load = layer.load(2); 245 var load = layer.load(2);
245 - $.ajax({ 246 + admin.req({
246 type: 'post', 247 type: 'post',
247 data: JSON.stringify(collDirctive), 248 data: JSON.stringify(collDirctive),
248 url: domainName + '/api-web/manage/dirctive/saveDirctive?access_token=' + token, 249 url: domainName + '/api-web/manage/dirctive/saveDirctive?access_token=' + token,
@@ -290,7 +291,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -290,7 +291,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
290 var token = localStorage.getItem("access_token"); 291 var token = localStorage.getItem("access_token");
291 var collDirctive = {}; 292 var collDirctive = {};
292 collDirctive.dirctiveCode = code; 293 collDirctive.dirctiveCode = code;
293 - $.ajax({ 294 + admin.req({
294 type: 'post', 295 type: 'post',
295 async: false, 296 async: false,
296 data: JSON.stringify(collDirctive), 297 data: JSON.stringify(collDirctive),
@@ -480,7 +481,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -480,7 +481,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
480 return; 481 return;
481 } 482 }
482 483
483 - $.ajax({ 484 + admin.req({
484 type: "post", 485 type: "post",
485 contentType: "application/json;charset=UTF-8", 486 contentType: "application/json;charset=UTF-8",
486 data: JSON.stringify(collDirctive), 487 data: JSON.stringify(collDirctive),
@@ -552,8 +553,8 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -552,8 +553,8 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
552 //获取ddic值，组装下拉菜单 553 //获取ddic值，组装下拉菜单
553 function getDdics(ddicCategory, callback) { 554 function getDdics(ddicCategory, callback) {
554 var token = localStorage.getItem("access_token"); 555 var token = localStorage.getItem("access_token");
555 - $.ajax({  
556 - type: 'post', 556 + admin.req({
  557 + type: 'get',
557 url: domainName + '/api-web/manage/ddic/findSucDdics/' + ddicCategory + '?access_token=' + token, 558 url: domainName + '/api-web/manage/ddic/findSucDdics/' + ddicCategory + '?access_token=' + token,
558 contentType: "application/json; charset=utf-8", 559 contentType: "application/json; charset=utf-8",
559 success: callback 560 success: callback
@@ -583,7 +584,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -583,7 +584,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
583 function getProtocols() { 584 function getProtocols() {
584 var token = localStorage.getItem("access_token"); 585 var token = localStorage.getItem("access_token");
585 //alert(token); 586 //alert(token);
586 - $.ajax({ 587 + admin.req({
587 type: 'get', 588 type: 'get',
588 url: domainName + '/api-web/manage/protocol/findProtocolList?access_token=' + token, 589 url: domainName + '/api-web/manage/protocol/findProtocolList?access_token=' + token,
589 contentType: "application/json; charset=utf-8", 590 contentType: "application/json; charset=utf-8",
@@ -627,7 +628,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -627,7 +628,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
627 function getKpis() { 628 function getKpis() {
628 var loding = layer.load(1); 629 var loding = layer.load(1);
629 var token = localStorage.getItem("access_token"); 630 var token = localStorage.getItem("access_token");
630 - $.ajax({ 631 + admin.req({
631 type: 'get', 632 type: 'get',
632 url: domainName + '/api-web/manage/kpi/list?access_token=' + token, 633 url: domainName + '/api-web/manage/kpi/list?access_token=' + token,
633 contentType: "application/json; charset=utf-8", 634 contentType: "application/json; charset=utf-8",
@@ -656,7 +657,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec @@ -656,7 +657,7 @@ layui.define(['table', 'form', 'laydate', 'view', 'common', 'sessions', 'xmSelec
656 657
657 function getDirctive(id) { 658 function getDirctive(id) {
658 var token = localStorage.getItem("access_token"); 659 var token = localStorage.getItem("access_token");
659 - $.ajax({ 660 + admin.req({
660 type: 'get', 661 type: 'get',
661 url: domainName + '/api-web/manage/dirctive/findCollDirctiveById/' + id + '?access_token=' + token + '&type=' + type, 662 url: domainName + '/api-web/manage/dirctive/findCollDirctiveById/' + id + '?access_token=' + token + '&type=' + type,
662 contentType: "application/json; charset=utf-8", 663 contentType: "application/json; charset=utf-8",
@@ -5,6 +5,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -5,6 +5,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
5 var table = layui.table; 5 var table = layui.table;
6 var common = layui.common; 6 var common = layui.common;
7 var view = layui.view; 7 var view = layui.view;
  8 + var admin = layui.admin;
8 var dataArr = []; 9 var dataArr = [];
9 //对外暴露的接口 10 //对外暴露的接口
10 exports('dirctiveCheckTemplateAdd', function (data) { 11 exports('dirctiveCheckTemplateAdd', function (data) {
@@ -13,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -13,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
13 var sessions = layui.sessions; 14 var sessions = layui.sessions;
14 var accessToken = sessions.getToken().access_token; 15 var accessToken = sessions.getToken().access_token;
15 form.render(); 16 form.render();
16 - $.ajax({ 17 + admin.req({
17 url: common.domainName + '/api-web/manage/dirctive/findCheckTemplate?access_token=' + accessToken + '&dirctiveId=' + id, 18 url: common.domainName + '/api-web/manage/dirctive/findCheckTemplate?access_token=' + accessToken + '&dirctiveId=' + id,
18 type: 'get', 19 type: 'get',
19 success: function (res) { 20 success: function (res) {
@@ -122,7 +123,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -122,7 +123,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
122 }) 123 })
123 bean['dirctiveId'] = id; 124 bean['dirctiveId'] = id;
124 bean['arr'] = arr; 125 bean['arr'] = arr;
125 - $.ajax({ 126 + admin.req({
126 type: 'post', 127 type: 'post',
127 url: common.domainName + '/api-web/manage/dirctive/saveCheckTemplate?access_token=' + accessToken, 128 url: common.domainName + '/api-web/manage/dirctive/saveCheckTemplate?access_token=' + accessToken,
128 contentType: "application/json; charset=utf-8", 129 contentType: "application/json; charset=utf-8",
@@ -58,8 +58,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -58,8 +58,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
58 } 58 }
59 59
60 $("#syncdirctive").unbind().on("click", function () { 60 $("#syncdirctive").unbind().on("click", function () {
61 - if ($.inArray('back:dirctive:synchronization', checkList) == -1) {  
62 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 61 + if (!common.hasPermission('back:dirctive:synchronization')){
63 return; 62 return;
64 } 63 }
65 var data = table.checkStatus('dirctive_table').data; 64 var data = table.checkStatus('dirctive_table').data;
@@ -84,8 +83,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -84,8 +83,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
84 }) 83 })
85 84
86 $("#adddirctive").unbind().on("click", function () { 85 $("#adddirctive").unbind().on("click", function () {
87 - if ($.inArray('back:dirctive:save', checkList) == -1) {  
88 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 86 + if (!common.hasPermission('back:dirctive:save')){
89 return; 87 return;
90 } 88 }
91 openEditHtml(undefined, undefined); 89 openEditHtml(undefined, undefined);
@@ -209,8 +207,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -209,8 +207,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
209 207
210 //点击协议名称 进行编辑 208 //点击协议名称 进行编辑
211 $('[dirctive-data-edit]').on('click', function () { 209 $('[dirctive-data-edit]').on('click', function () {
212 - if ($.inArray('back:dirctive:update', checkList) == -1) {  
213 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 210 + if (!common.hasPermission('back:dirctive:update')){
214 return; 211 return;
215 } 212 }
216 openEditHtml($(this).attr("dirctive-data-edit"), $(this).data("dirctivecode"), $(this).data("isdefault")); 213 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', @@ -233,7 +230,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
233 resize: false, 230 resize: false,
234 scrollbar: true, 231 scrollbar: true,
235 success: function (layero, index) { 232 success: function (layero, index) {
236 - $.ajax({ 233 + admin.req({
237 url: common.domainName + '/api-web/manage/dirctive/findOutputsById?access_token=' + accessToken + '&dirctiveId=' + dirctiveId, 234 url: common.domainName + '/api-web/manage/dirctive/findOutputsById?access_token=' + accessToken + '&dirctiveId=' + dirctiveId,
238 type: 'get', 235 type: 'get',
239 success: function (res) { 236 success: function (res) {
@@ -281,8 +278,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -281,8 +278,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
281 } 278 }
282 }); 279 });
283 $(this).parents('tr').eq(0).addClass("tbody-tr-background-color"); 280 $(this).parents('tr').eq(0).addClass("tbody-tr-background-color");
284 - if ($.inArray('back:dirctive:restoreVersion', checkList) == -1) {  
285 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 281 + if (!common.hasPermission('back:dirctive:restoreVersion')){
286 return; 282 return;
287 } 283 }
288 var dirctiveId = $(this).attr("dirctive-id"); 284 var dirctiveId = $(this).attr("dirctive-id");
@@ -18,7 +18,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele @@ -18,7 +18,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
18 18
19 //初始化下拉框数据 19 //初始化下拉框数据
20 function initSelect() { 20 function initSelect() {
21 - $.ajax({ 21 + admin.req({
22 url: common.domainName + '/api-web/manage/kpi/initSelect?access_token=' + accessToken, 22 url: common.domainName + '/api-web/manage/kpi/initSelect?access_token=' + accessToken,
23 async: false, 23 async: false,
24 type: 'get', 24 type: 'get',
@@ -32,7 +32,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele @@ -32,7 +32,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
32 $("#kpiAddForm").find("select[name='kpiUnit']").append(unitStr); 32 $("#kpiAddForm").find("select[name='kpiUnit']").append(unitStr);
33 form.render(); 33 form.render();
34 if (kpiId) { 34 if (kpiId) {
35 - $.ajax({ 35 + admin.req({
36 url: common.domainName + '/api-web/manage/kpi/findById?access_token=' + accessToken, 36 url: common.domainName + '/api-web/manage/kpi/findById?access_token=' + accessToken,
37 data: {"kpiId": kpiId}, 37 data: {"kpiId": kpiId},
38 success: function (res) { 38 success: function (res) {
@@ -91,7 +91,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele @@ -91,7 +91,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'xmSele
91 //获取采集类型字典 91 //获取采集类型字典
92 admin.req({ 92 admin.req({
93 url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER' 93 url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER'
94 - , method: 'POST' 94 + , method: 'get'
95 , async: false 95 , async: false
96 , success: function (res) { 96 , success: function (res) {
97 var ddicPower = []; 97 var ddicPower = [];
@@ -50,7 +50,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -50,7 +50,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
50 } 50 }
51 }); 51 });
52 52
53 - $.ajax({ 53 + admin.req({
54 url: domainName + '/api-web/manage/kpi/initSelect?access_token=' + accessToken, 54 url: domainName + '/api-web/manage/kpi/initSelect?access_token=' + accessToken,
55 type: 'get', 55 type: 'get',
56 sync: false, 56 sync: false,
@@ -81,9 +81,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -81,9 +81,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
81 searchEvent(); 81 searchEvent();
82 } 82 }
83 }); 83 });
84 - $.ajax({ 84 + admin.req({
85 url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER?access_token=' + accessToken, 85 url: domainName + '/api-web/manage/ddic/findSucDdics/KPI_POEWER?access_token=' + accessToken,
86 - method: 'POST', 86 + method: 'get',
87 sync: false, 87 sync: false,
88 success: function (res) { 88 success: function (res) {
89 var ddicPower = []; 89 var ddicPower = [];
@@ -214,8 +214,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -214,8 +214,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
214 done: function (res, curr, count) { 214 done: function (res, curr, count) {
215 //点击协议名称 进行编辑 215 //点击协议名称 进行编辑
216 $('[kpi-data-edit]').on('click', function () { 216 $('[kpi-data-edit]').on('click', function () {
217 - if ($.inArray('back:kpi:update', checkList) == -1) {  
218 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 217 + if(!common.hasPermission('back:kpi:update')){
219 return; 218 return;
220 } 219 }
221 openEditHtml($(this).attr("kpi-data-edit")); 220 openEditHtml($(this).attr("kpi-data-edit"));
@@ -345,7 +344,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -345,7 +344,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
345 } 344 }
346 var loading = layer.load(2); 345 var loading = layer.load(2);
347 var param = kpiName + kpiUnit; 346 var param = kpiName + kpiUnit;
348 - $.ajax({ 347 + admin.req({
349 url: domainName + '/api-web/manage/kpi/checkKpiName?access_token=' + accessToken + '&kpiName=' + param, 348 url: domainName + '/api-web/manage/kpi/checkKpiName?access_token=' + accessToken + '&kpiName=' + param,
350 success: function (res) { 349 success: function (res) {
351 var bean = res.object; 350 var bean = res.object;
@@ -409,7 +408,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -409,7 +408,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
409 } 408 }
410 } 409 }
411 410
412 - $.ajax({ 411 + admin.req({
413 url: common.domainName + '/api-web/manage/kpi/save?access_token=' + accessToken, 412 url: common.domainName + '/api-web/manage/kpi/save?access_token=' + accessToken,
414 type: 'post', 413 type: 'post',
415 data: JSON.stringify(submitData), 414 data: JSON.stringify(submitData),
@@ -428,7 +427,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -428,7 +427,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
428 }) 427 })
429 } else { //新增 428 } else { //新增
430 if (kpiName && kpiUnit) { 429 if (kpiName && kpiUnit) {
431 - $.ajax({ 430 + admin.req({
432 url: domainName + '/api-web/manage/kpi/checkKpiName?access_token=' + accessToken + '&kpiName=' + param, 431 url: domainName + '/api-web/manage/kpi/checkKpiName?access_token=' + accessToken + '&kpiName=' + param,
433 success: function (res) { 432 success: function (res) {
434 var bean = res.object; 433 var bean = res.object;
@@ -471,7 +470,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -471,7 +470,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
471 } 470 }
472 471
473 472
474 - $.ajax({ 473 + admin.req({
475 url: common.domainName + '/api-web/manage/kpi/save?access_token=' + accessToken, 474 url: common.domainName + '/api-web/manage/kpi/save?access_token=' + accessToken,
476 type: 'post', 475 type: 'post',
477 data: JSON.stringify(submitData), 476 data: JSON.stringify(submitData),
@@ -519,16 +518,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -519,16 +518,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
519 }) 518 })
520 //新增 519 //新增
521 $("#addkpi").on("click", function () { 520 $("#addkpi").on("click", function () {
522 - if ($.inArray('back:kpi:save', checkList) == -1) {  
523 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 521 + if(!common.hasPermission('back:kpi:save')){
524 return; 522 return;
525 } 523 }
526 openEditHtml(); 524 openEditHtml();
527 }) 525 })
528 526
529 function deleteByIds(ids) { 527 function deleteByIds(ids) {
530 - if ($.inArray('back:kpi:delete', checkList) == -1) {  
531 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 528 + if (!common.hasPermission('back:kpi:delete')){
532 return; 529 return;
533 } 530 }
534 //确认提示框 531 //确认提示框
@@ -146,8 +146,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd'] @@ -146,8 +146,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
146 done: function (res) { 146 done: function (res) {
147 // 点击编辑事件 147 // 点击编辑事件
148 $('.table-btn-task-edit').click(function () { 148 $('.table-btn-task-edit').click(function () {
149 - if ($.inArray('back:task:update', checkList) == -1) {  
150 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 149 + if (!common.hasPermission('back:task:update')){
151 return; 150 return;
152 } 151 }
153 var task = JSON.parse(JSON.stringify(res.data[$(this).data('index')])); 152 var task = JSON.parse(JSON.stringify(res.data[$(this).data('index')]));
@@ -290,8 +289,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd'] @@ -290,8 +289,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
290 289
291 // 添加事件 290 // 添加事件
292 $('#btn-task-add').unbind('click').click(function () { 291 $('#btn-task-add').unbind('click').click(function () {
293 - if ($.inArray('back:task:save', checkList) == -1) {  
294 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 292 + if (!common.hasPermission('back:task:save')){
295 return; 293 return;
296 } 294 }
297 saveTask('insert', '新增'); 295 saveTask('insert', '新增');
@@ -351,8 +349,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd'] @@ -351,8 +349,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
351 349
352 // 删除事件 350 // 删除事件
353 $('#btn-task-delete').unbind('click').click(function () { 351 $('#btn-task-delete').unbind('click').click(function () {
354 - if ($.inArray('back:task:delete', checkList) == -1) {  
355 - layer.msg('暂无权限!', {icon: 7, time: 3000}); 352 + if (common.hasPermission('back:task:delete')){
356 return; 353 return;
357 } 354 }
358 var checks = getTaskChecks(); 355 var checks = getTaskChecks();
@@ -21,8 +21,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -21,8 +21,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
21 var data = []; 21 var data = [];
22 admin.req({ 22 admin.req({
23 url: domainName + '/api-web/manage/ddic/findSucDdics/provider', 23 url: domainName + '/api-web/manage/ddic/findSucDdics/provider',
24 - method: 'POST',  
25 - // async: false, 24 + method: 'get',
  25 + async: false,
26 success: function (res) { 26 success: function (res) {
27 data = res.data; 27 data = res.data;
28 providerData = res.data; 28 providerData = res.data;
@@ -19,6 +19,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common' @@ -19,6 +19,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common'
19 , device = layui.device() 19 , device = layui.device()
20 , common = layui.common 20 , common = layui.common
21 , sessions = layui.sessions 21 , sessions = layui.sessions
  22 + , admin = layui.admin
22 , accessToken = sessions.getToken()['access_token'] 23 , accessToken = sessions.getToken()['access_token']
23 24
24 //外部接口 25 //外部接口
@@ -262,7 +263,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common' @@ -262,7 +263,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common'
262 //默认配置 263 //默认配置
263 Class.prototype.config = (function () { 264 Class.prototype.config = (function () {
264 var remoteConfig = {}; 265 var remoteConfig = {};
265 - $.ajax({ 266 + admin.req({
266 url: common.domainName + '/api-web/home/getConfig', 267 url: common.domainName + '/api-web/home/getConfig',
267 async: false, 268 async: false,
268 data: { 269 data: {
@@ -748,7 +749,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common' @@ -748,7 +749,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util', 'sessions', 'common'
748 749
749 that.loading(); 750 that.loading();
750 751
751 - $.ajax({ 752 + admin.req({
752 type: options.method || 'get' 753 type: options.method || 'get'
753 , url: options.url 754 , url: options.url
754 , contentType: options.contentType 755 , contentType: options.contentType
@@ -605,7 +605,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -605,7 +605,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
605 var options = "<option value=''>=请选择=</option>"; 605 var options = "<option value=''>=请选择=</option>";
606 $.ajax({ 606 $.ajax({
607 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}` 607 url: `${this.domainName}/api-web/manage/ddic/findSucDdics/${ddicCategory}?access_token=${accessToken}`
608 - , method: 'POST' 608 + , method: 'get'
609 , success: function (res) { 609 , success: function (res) {
610 if (res && res.data) { 610 if (res && res.data) {
611 var ddiclist = res.data; 611 var ddiclist = res.data;
@@ -1786,6 +1786,15 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1786,6 +1786,15 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1786 }); 1786 });
1787 return value; 1787 return value;
1788 }, 1788 },
  1789 + hasPermission: function (permission) {
  1790 + //TODO 后期调整获取checkList方法，目前未获取到，临时屏蔽
  1791 + // var checkList = localStorage.getItem("permission");
  1792 + // if ($.inArray(permission, checkList) == -1) {
  1793 + // layer.msg('暂无权限!', {icon: 7, time: 3000});
  1794 + // return false;
  1795 + // }
  1796 + return true;
  1797 + }
1789 1798
1790 }; 1799 };
1791 1800