monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhangtianqi
Commit 26b43be82716d2ce04f9ffeffc10316ffd2bc540 2 parents adf41ab1 a2d41e0c

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
@@ -132,15 +132,15 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd @@ -132,15 +132,15 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
132 $.each(e.backlist[j], function (h, n) { 132 $.each(e.backlist[j], function (h, n) {
133 if (h != "resId") { 133 if (h != "resId") {
134 if (/失败/.test(n)) { 134 if (/失败/.test(n)) {
135 - tr += '<td style="text-align: center"><i class="layui-icon layui-icon-close" style="font-size: 20px!important; color: #ff252c!important;"></i></td>' 135 + tr += '<td style="text-align: center"><i class="layui-icon layui-icon-close" style="font-size: 20px!important; color: #ff252c!important; font-family: layui-icon !important;"></i></td>'
136 } else if (/成功/.test(n)) { 136 } else if (/成功/.test(n)) {
137 - tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-ok" style="font-size: 20px!important; color: #1dff1c!important;"></i></p><p style="margin-top: 8px;text-align: center">主楼+综改</p></td>' 137 + tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-ok" style="font-size: 20px!important; color: #1dff1c!important; font-family: layui-icon !important;"></i></p><p style="margin-top: 8px;text-align: center">主楼+综改</p></td>'
138 } else if (/备份中/.test(n)) { 138 } else if (/备份中/.test(n)) {
139 tr += '<td style="text-align: center"><span style="color:#ffe40e!important;">' + n + '</span></td>' 139 tr += '<td style="text-align: center"><span style="color:#ffe40e!important;">' + n + '</span></td>'
140 } else if (/未备份/.test(n)) { 140 } else if (/未备份/.test(n)) {
141 tr += '<td style="text-align: center"><span style="color:magenta!important;">' + n + '</span></td>' 141 tr += '<td style="text-align: center"><span style="color:magenta!important;">' + n + '</span></td>'
142 } else if (/历史存放/.test(n)) { 142 } else if (/历史存放/.test(n)) {
143 - tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-log" style="font-size: 20px!important; color: #1e9fff!important;"></i></p><p style="margin-top: 8px;text-align: center">综改</p></td>' 143 + tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-log" style="font-size: 20px!important; color: #1e9fff!important; font-family: layui-icon !important;"></i></p><p style="margin-top: 8px;text-align: center">综改</p></td>'
144 } else if (/全备/.test(n)) { 144 } else if (/全备/.test(n)) {
145 tr += '<td style="text-align: center"><span style="color:#1DFF1C!important;">' + n + '</span></td>' 145 tr += '<td style="text-align: center"><span style="color:#1DFF1C!important;">' + n + '</span></td>'
146 } else if (/已失效/.test(n)){ 146 } else if (/已失效/.test(n)){
@@ -72,9 +72,9 @@ layui.define(['table', 'form','laytpl', 'sessions', 'admin', 'common', 'echarts' @@ -72,9 +72,9 @@ layui.define(['table', 'form','laytpl', 'sessions', 'admin', 'common', 'echarts'
72 72
73 function renderIsDiscovery(isRecovery) { 73 function renderIsDiscovery(isRecovery) {
74 if(isRecovery=="1"){ 74 if(isRecovery=="1"){
75 - return '<i class="layui-icon layui-icon-ok" style="font-size: 20px!important; color: #1dff1c!important;"></i>'; 75 + return '<i class="layui-icon layui-icon-ok" style="font-size: 20px!important; color: #1dff1c!important; font-family: layui-icon !important;"></i>';
76 }else { 76 }else {
77 - return '<i class="layui-icon layui-icon-close" style="font-size: 20px!important; color: #ff252c!important;"></i>'; 77 + return '<i class="layui-icon layui-icon-close" style="font-size: 20px!important; color: #ff252c!important; font-family: layui-icon !important;"></i>';
78 } 78 }
79 } 79 }
80 $("#orgSearchBtn").on("click",function () { 80 $("#orgSearchBtn").on("click",function () {