monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ffbf99e6dc015d3a3c2758f49a90b9eeba95ee71 2 parents c81d29b6 588c760a

Merge branch 'master-mj-yjpnew' into 'master-mj' 

fix:工作日志样式优化调整3



See merge request !1197
Inline Side-by-side
Showing 3 changed files with 18 additions and 17 deletions
@@ -63,7 +63,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -63,7 +63,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
63 $dom.removeClass("active") 63 $dom.removeClass("active")
64 } 64 }
65 }) 65 })
66 - //reloadAllChange() 66 + reloadAllChange()
67 } 67 }
68 } 68 }
69 }); 69 });
@@ -125,21 +125,21 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -125,21 +125,21 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
125 $("#btns-workreport-time button").removeClass("active"); 125 $("#btns-workreport-time button").removeClass("active");
126 $(this).addClass("active"); 126 $(this).addClass("active");
127 createTime = ($(this).data("period")) 127 createTime = ($(this).data("period"))
128 - //reloadAllChange(); 128 + reloadAllChange();
129 }); 129 });
130 130
131 // 回车搜索 131 // 回车搜索
132 - /* $('[lay-filter="form-workreport-condition"] input').keydown(function (e) { 132 + $('[lay-filter="form-workreport-condition"] input').keydown(function (e) {
133 if (e.keyCode === 13) { 133 if (e.keyCode === 13) {
134 reloadAllChange(); 134 reloadAllChange();
135 } 135 }
136 - });*/ 136 + });
137 // 单选框改变搜索 137 // 单选框改变搜索
138 - //form.on('radio(workReport-currIsRead)', reloadAllChange);  
139 - //form.on('radio(workReport-repType)', reloadAllChange); 138 + form.on('radio(workReport-currIsRead)', reloadAllChange);
  139 + form.on('radio(workReport-repType)', reloadAllChange);
140 // 下拉框改变搜索 140 // 下拉框改变搜索
141 - //form.on('select(slt-workreport-group)', reloadAllChange);  
142 - //form.on('select(slt-workreport-user)', reloadAllChange); 141 + form.on('select(slt-workreport-group)', reloadAllChange);
  142 + form.on('select(slt-workreport-user)', reloadAllChange);
143 143
144 // 勾选标记为已读事件 144 // 勾选标记为已读事件
145 $('#btn-workreport-set-read').click(function () { 145 $('#btn-workreport-set-read').click(function () {
@@ -162,9 +162,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -162,9 +162,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
162 } 162 }
163 }); 163 });
164 }); 164 });
165 - $("#orgSearchBtn").on("click",function () {  
166 - reloadAllChange();  
167 - }); 165 +
168 // 加载工作汇报表格 166 // 加载工作汇报表格
169 function loadWorkReportTable() { 167 function loadWorkReportTable() {
170 var conditions = form.val('form-workreport-condition'); 168 var conditions = form.val('form-workreport-condition');
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <div class="layui-status search_panel"> 19 <div class="layui-status search_panel">
20 <form class="layui-form layui-card-header layuiadmin-card-header-auto" 20 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
21 lay-filter="workReport-form" onsubmit="return false;"> 21 lay-filter="workReport-form" onsubmit="return false;">
22 - <div class="layui-form-item"> 22 + <div class="layui-form-item" style="width: 100%">
23 <div class="layui-inline"> 23 <div class="layui-inline">
24 <div class="layui-input-inline"> 24 <div class="layui-input-inline">
25 <input autocomplete="off" class="layui-input" id="workReport_title" 25 <input autocomplete="off" class="layui-input" id="workReport_title"
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 </div> 27 </div>
28 </div> 28 </div>
29 <div class="layui-inline"> 29 <div class="layui-inline">
30 - <div class="layui-input-inline auto-width"> 30 + <div class="layui-input-inline auto-width" style="border-style: none!important;">
31 <input checked lay-filter="workReport_isRead" name="isRead" title="全部" type="radio" 31 <input checked lay-filter="workReport_isRead" name="isRead" title="全部" type="radio"
32 value=""> 32 value="">
33 <input lay-filter="workReport_isRead" name="isRead" title="无人阅读" type="radio" 33 <input lay-filter="workReport_isRead" name="isRead" title="无人阅读" type="radio"
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </div> 37 </div>
38 </div> 38 </div>
39 <div class="layui-inline"> 39 <div class="layui-inline">
40 - <div class="layui-input-inline auto-width"> 40 + <div class="layui-input-inline auto-width" style="border-style: none!important;">
41 <input checked lay-filter="workReport_type" name="repType" title="全部" type="radio" 41 <input checked lay-filter="workReport_type" name="repType" title="全部" type="radio"
42 value=""> 42 value="">
43 <input lay-filter="workReport_type" name="repType" title="日报" type="radio" 43 <input lay-filter="workReport_type" name="repType" title="日报" type="radio"
@@ -71,9 +71,11 @@ @@ -71,9 +71,11 @@
71 type="button">全部 71 type="button">全部
72 </button> 72 </button>
73 </div> 73 </div>
  74 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  75 + id="orgSearchBtn" >搜索
  76 + </button>
74 </div> 77 </div>
75 </form> 78 </form>
76 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
77 </div> 79 </div>
78 </div> 80 </div>
79 <div class="layui-card-body"> 81 <div class="layui-card-body">
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 </div> 43 </div>
44 </div> 44 </div>
45 <div class="layui-inline"> 45 <div class="layui-inline">
46 - <div class="layui-input-inline auto-width" > 46 + <div class="layui-input-inline auto-width" style="border-style: none!important;" >
47 <input checked="checked" lay-filter="workReport-repType" name="repType" title="日报" type="radio" 47 <input checked="checked" lay-filter="workReport-repType" name="repType" title="日报" type="radio"
48 value="day"> 48 value="day">
49 <input lay-filter="workReport-repType" name="repType" title="周报" type="radio" 49 <input lay-filter="workReport-repType" name="repType" title="周报" type="radio"
@@ -81,9 +81,10 @@ @@ -81,9 +81,10 @@
81 type="button">全部 81 type="button">全部
82 </button> 82 </button>
83 </div> 83 </div>
  84 +
84 </div> 85 </div>
  86 +
85 </form> 87 </form>
86 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
87 88
88 </div> 89 </div>
89 </div> 90 </div>