Merge branch 'master-500-dev-xwx' into 'master-500-dev'
【866】通知查询通知方式修改为字典的方式,现在是代码里面写死的格式代码迁移 See merge request !716
Showing
1 changed file
with
1 additions
and
35 deletions
@@ -69,41 +69,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -69,41 +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 | - , { | ||
73 | - field: 'type', title: '通知类型', align: 'center', sort: true, width: 130, | ||
74 | - templet: function (d) { | ||
75 | - if (d.type) { | ||
76 | - switch (d.type) { | ||
77 | - case 10: | ||
78 | - return '告警通知' | ||
79 | - break; | ||
80 | - case 11: | ||
81 | - return '告警消除' | ||
82 | - break; | ||
83 | - case 13: | ||
84 | - return '合并通知' | ||
85 | - break; | ||
86 | - case 20: | ||
87 | - return '巡检报表通知' | ||
88 | - break; | ||
89 | - case 30: | ||
90 | - return '系统通知' | ||
91 | - break; | ||
92 | - case 40: | ||
93 | - return '工单通知' | ||
94 | - break; | ||
95 | - case 99: | ||
96 | - return '测试通知' | ||
97 | - break; | ||
98 | - default: | ||
99 | - return '测试通知' | ||
100 | - break; | ||
101 | - } | ||
102 | - } else { | ||
103 | - return '系统通知' | ||
104 | - } | ||
105 | - } | ||
106 | - } | 72 | + , {field: 'typeName', title: '通知类型', align: 'center', sort: true, width:130} |
107 | , { | 73 | , { |
108 | field: 'way', title: '通知方式', align: 'center', sort: true, width: 120, | 74 | field: 'way', title: '通知方式', align: 'center', sort: true, width: 120, |
109 | templet: function (d) { | 75 | templet: function (d) { |
-
Please register or login to post a comment