Merge branch 'master-mj-yjpnew' into 'master-mj'
fix:备份统计列展示优化、鼎甲备份导出按钮样式调整 See merge request !1221
Showing
2 changed files
with
2 additions
and
2 deletions
@@ -82,7 +82,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -82,7 +82,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
82 | var data = res.data; | 82 | var data = res.data; |
83 | var htr = "<tr><th style='color: #151b26;font-weight: bold!important;'>序号</th><th style='color: #151b26;font-weight: bold!important;'>系统名称</th><th style='color: #151b26;font-weight: bold!important;'>等保等级</th><th style='color: #151b26;font-weight: bold!important;'>数据库名称</th><th style='color: #151b26;font-weight: bold!important;'>IP地址</th>" | 83 | var htr = "<tr><th style='color: #151b26;font-weight: bold!important;'>序号</th><th style='color: #151b26;font-weight: bold!important;'>系统名称</th><th style='color: #151b26;font-weight: bold!important;'>等保等级</th><th style='color: #151b26;font-weight: bold!important;'>数据库名称</th><th style='color: #151b26;font-weight: bold!important;'>IP地址</th>" |
84 | $.each(res.object, function (j, f) { | 84 | $.each(res.object, function (j, f) { |
85 | - htr += "<th style='color: #151b26;font-weight: bold!important;'>" + f + "</th>" | 85 | + htr += "<th style='color: #151b26;font-weight: bold!important;'>" + f.substring(5,f.length) + "</th>" |
86 | }); | 86 | }); |
87 | htr += "</tr>"; | 87 | htr += "</tr>"; |
88 | $("#status_table").find("thead").append(htr); | 88 | $("#status_table").find("thead").append(htr); |
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | <div style="display: block;height: 35px"> | 8 | <div style="display: block;height: 35px"> |
9 | <button class="layui-btn layui-btn-sm layui-btn-normal active" | 9 | <button class="layui-btn layui-btn-sm layui-btn-normal active" |
10 | id="dingjia-detail-export-excel" style="float: right"> | 10 | id="dingjia-detail-export-excel" style="float: right"> |
11 | - <i class="layui-icon"></i>导出到Excel | 11 | + <i class="layui-icon"></i>导出 |
12 | </button> | 12 | </button> |
13 | </div> | 13 | </div> |
14 | <table id="backDingjiaListTable" class="layui-table" lay-filter="backDingjiaListTable"> | 14 | <table id="backDingjiaListTable" class="layui-table" lay-filter="backDingjiaListTable"> |
-
Please register or login to post a comment