Showing
1 changed file
with
3 additions
and
44 deletions
@@ -69,39 +69,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' | @@ -69,39 +69,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' | ||
69 | , even: true | 69 | , even: true |
70 | , cols: [[ | 70 | , cols: [[ |
71 | {title: '序号', align: "center", type: 'numbers',width: '3%'} | 71 | {title: '序号', align: "center", type: 'numbers',width: '3%'} |
72 | - , {field: 'type', title: '通知类型', align: 'center', sort: true, width:130, | ||
73 | - templet: function (d){ | ||
74 | - if(d.type) { | ||
75 | - switch (d.type) { | ||
76 | - case 10: | ||
77 | - return '告警通知' | ||
78 | - break; | ||
79 | - case 11: | ||
80 | - return '告警消除' | ||
81 | - break; | ||
82 | - case 13: | ||
83 | - return '合并通知' | ||
84 | - break; | ||
85 | - case 20: | ||
86 | - return '巡检报表通知' | ||
87 | - break; | ||
88 | - case 30: | ||
89 | - return '系统通知' | ||
90 | - break; | ||
91 | - case 40: | ||
92 | - return '工单通知' | ||
93 | - break; | ||
94 | - case 99: | ||
95 | - return '测试通知' | ||
96 | - break; | ||
97 | - default: | ||
98 | - return '测试通知' | ||
99 | - break; | ||
100 | - } | ||
101 | - }else { | ||
102 | - return '系统通知' | ||
103 | - } | ||
104 | - }} | 72 | + , {field: 'typeName', title: '通知类型', align: 'center', sort: true, width:130} |
105 | , {field: 'way', title: '通知方式', align: 'center', sort: true, width:120, | 73 | , {field: 'way', title: '通知方式', align: 'center', sort: true, width:120, |
106 | templet: function (d){ | 74 | templet: function (d){ |
107 | switch (d.way){ | 75 | switch (d.way){ |
@@ -563,16 +531,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' | @@ -563,16 +531,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' | ||
563 | resType: resType, | 531 | resType: resType, |
564 | isSend: $('#notice_search_isSend').val() | 532 | isSend: $('#notice_search_isSend').val() |
565 | }; | 533 | }; |
566 | - var typeName = new Map(); | ||
567 | - typeName.set("10","告警通知"); | ||
568 | - typeName.set("11","告警消除"); | ||
569 | - //2021-10-15 添加合并通知 XuHaoJie | ||
570 | - typeName.set("13","合并通知"); | ||
571 | - typeName.set("20","巡检报表通知"); | ||
572 | - typeName.set("30","系统通知"); | ||
573 | - typeName.set("40","工单通知"); | ||
574 | - typeName.set("99","测试通知"); | ||
575 | - typeName.set("0","测试通知"); | 534 | + |
576 | $.ajax({ | 535 | $.ajax({ |
577 | url: `${common.domainName}/api-web/notice/groupByType`, | 536 | url: `${common.domainName}/api-web/notice/groupByType`, |
578 | method: 'GET', | 537 | method: 'GET', |
@@ -582,7 +541,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' | @@ -582,7 +541,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' | ||
582 | var yData = []; | 541 | var yData = []; |
583 | if (res && res.map) { | 542 | if (res && res.map) { |
584 | $.each(res.map.typeList,function (i,v) { | 543 | $.each(res.map.typeList,function (i,v) { |
585 | - xData.push(typeName.get(v)) | 544 | + xData.push(v) |
586 | }) | 545 | }) |
587 | yData = res.map.countList; | 546 | yData = res.map.countList; |
588 | } | 547 | } |
-
Please register or login to post a comment