Showing
4 changed files
with
33 additions
and
22 deletions
@@ -141,9 +141,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -141,9 +141,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
141 | if (userName.length === 0) { | 141 | if (userName.length === 0) { |
142 | userName = ['无'] | 142 | userName = ['无'] |
143 | } | 143 | } |
144 | - str = userName.toString() | ||
145 | - if (str.length == 0) str = '无' | ||
146 | - return `<div><span>${str}</span></div>` | 144 | + return userName.toString(); |
147 | } | 145 | } |
148 | }, | 146 | }, |
149 | { | 147 | { |
@@ -28,12 +28,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -28,12 +28,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
28 | $dom.removeClass("active") | 28 | $dom.removeClass("active") |
29 | } | 29 | } |
30 | })*/ | 30 | })*/ |
31 | - $.each($("button.isRead"), function (i, e) { | ||
32 | - var $dom = $(e); | ||
33 | - if ($dom.data("type") == '0') { | ||
34 | - $dom.addClass("active") | ||
35 | - } | ||
36 | - }) | 31 | + // $.each($("button.isRead"), function (i, e) { |
32 | + // var $dom = $(e); | ||
33 | + // if ($dom.data("type") == '0') { | ||
34 | + // $dom.addClass("active") | ||
35 | + // } | ||
36 | + // }) | ||
37 | $.each($('input[name="repType"]'), function (i, e) { | 37 | $.each($('input[name="repType"]'), function (i, e) { |
38 | var $dom = $(e); | 38 | var $dom = $(e); |
39 | if ($dom.val() == urlRepType) { | 39 | if ($dom.val() == urlRepType) { |
@@ -8668,3 +8668,22 @@ form.layui-card-header.layuiadmin-card-header-auto { | @@ -8668,3 +8668,22 @@ form.layui-card-header.layuiadmin-card-header-auto { | ||
8668 | #base-info-tips>.info-table>li span:nth-child(2n){ | 8668 | #base-info-tips>.info-table>li span:nth-child(2n){ |
8669 | flex:2; | 8669 | flex:2; |
8670 | } | 8670 | } |
8671 | + | ||
8672 | +/*工作日志查看 已读,未读按钮样式*/ | ||
8673 | +.layui-btn-group.read-group .layui-btn { | ||
8674 | + width: 60px; | ||
8675 | + height: 35px; | ||
8676 | + line-height: 35px; | ||
8677 | +} | ||
8678 | + | ||
8679 | +.layui-btn-group.read-group .layui-btn:hover { | ||
8680 | + border: 1px solid #3B91FF; | ||
8681 | + background: #3B91FF; | ||
8682 | + color: #ffffff; | ||
8683 | +} | ||
8684 | + | ||
8685 | +.layui-btn-group.read-group .layui-btn.active { | ||
8686 | + border: 1px solid #3B91FF; | ||
8687 | + background: #3B91FF; | ||
8688 | + color: #ffffff; | ||
8689 | +} |
@@ -138,22 +138,16 @@ | @@ -138,22 +138,16 @@ | ||
138 | <!-- <div class="pie-chart" id="chart-noRead-report"></div>--> | 138 | <!-- <div class="pie-chart" id="chart-noRead-report"></div>--> |
139 | </div> | 139 | </div> |
140 | </div> | 140 | </div> |
141 | - <div class="layui-card-body" style="margin-top: 30px;"> | ||
142 | - <div class="warn-btns"> | ||
143 | - <!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-workreport-set-read"> | ||
144 | - <i class="layui-icon"></i>勾选标记为已读 | ||
145 | - </button> | ||
146 | - <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-workreport-set-all-read"> | ||
147 | - <i class="layui-icon"></i>全部标记为已读 | ||
148 | - </button>--> | ||
149 | - <button class="layui-btn layui-btn-sm layui-btn-normal isRead active" data-type=""> | ||
150 | - 全部 | 141 | + <div class="layui-card-body " style="margin-top: 30px;"> |
142 | + <div class="warn-btns layui-btn-group read-group"> | ||
143 | + <button class="layui-btn layui-btn-sm layui-btn-primary isRead active" data-type="0"> | ||
144 | + 未读 | ||
151 | </button> | 145 | </button> |
152 | - <button class="layui-btn layui-btn-sm layui-btn-normal isRead" data-type="1"> | 146 | + <button class="layui-btn layui-btn-sm layui-btn-primary isRead" data-type="1"> |
153 | 已读 | 147 | 已读 |
154 | </button> | 148 | </button> |
155 | - <button class="layui-btn layui-btn-sm layui-btn-normal isRead" data-type="0"> | ||
156 | - 未读 | 149 | + <button class="layui-btn layui-btn-sm layui-btn-primary isRead" data-type=""> |
150 | + 全部 | ||
157 | </button> | 151 | </button> |
158 | </div> | 152 | </div> |
159 | <table id="table-workreport-view" lay-filter="table-workreport-view"></table> | 153 | <table id="table-workreport-view" lay-filter="table-workreport-view"></table> |
-
Please register or login to post a comment