monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit dd4f21c1ac8351635778d8857453d910943b8959 1 parent e4bdf911

登录日志功能迁移

Inline Side-by-side
Showing 4 changed files with 120 additions and 42 deletions
  1 +layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], function (exports) {
  2 + var $ = layui.$;
  3 + var view = layui.view;
  4 + var table = layui.table;
  5 + var common = layui.common;
  6 + var laydate = layui.laydate;
  7 + var admin = layui.admin;
  8 +
  9 + //对外暴露的接口
  10 + exports('onlineUser', function () {
  11 + var sessions = layui.sessions;
  12 + var accessToken = sessions.getToken().access_token;
  13 + var loginLog = "";
  14 + var cols = [{field: 'loginTime', title: '登录时间', align: 'center'}
  15 + , {field: 'loginIp', title: 'IP地址', align: 'center'}
  16 + , {field: 'nickname', title: '登录用户', align: 'center'}
  17 + , {field: 'orgName', title: '所属部门', align: 'center'}];
  18 +
  19 + loginLogTable();
  20 +
  21 + function loginLogTable() {
  22 + loginLog = table.render({
  23 + elem: '#onlineUserTable'
  24 + , height: 'full-auto'
  25 + , cellMinWidth: 0
  26 + , page: 1
  27 + , limit: 10
  28 + , url: common.domainName + '/api-log/sysLogin/findLogUser?access_token=' + accessToken
  29 + , cols: [cols]
  30 + , done: function (res, curr, count) {
  31 + }
  32 + });
  33 + }
  34 +
  35 + //刷新表格
  36 + function reloadTable() {
  37 + loginLog.reload({
  38 + page: {
  39 + curr: 1
  40 + }
  41 + , where: {
  42 + access_token: accessToken,
  43 + username: $("#loginAccount").val(),
  44 + startTime: $("#loginLogStartdate").val(),
  45 + endTime: $("#loginLogEnddate").val(),
  46 + mark: $("#loginLonMark").val(),
  47 + orgIds: settingOrgSelect.getValue("valueStr")
  48 + }
  49 + });
  50 + }
  51 + });
  52 +});
@@ -38,18 +38,21 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi @@ -38,18 +38,21 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
38 , {field: 'loginIp', title: 'IP地址', align: 'center'} 38 , {field: 'loginIp', title: 'IP地址', align: 'center'}
39 , {field: 'nickname', title: '登录用户', align: 'center'} 39 , {field: 'nickname', title: '登录用户', align: 'center'}
40 , {field: 'orgName', title: '所属部门', align: 'center'}] 40 , {field: 'orgName', title: '所属部门', align: 'center'}]
41 - url = common.domainName +'/api-log/sysLogin/findLogPage?access_token='+accessToken 41 + url = common.domainName + '/api-log/sysLogin/findLogPage?access_token=' + accessToken
42 loginLogTable() 42 loginLogTable()
43 $("#loginUserNum").unbind("click").on('click', function () { 43 $("#loginUserNum").unbind("click").on('click', function () {
44 - $("#loginLonMark").val("mark")  
45 - $("#loginAccount").val(""),  
46 - $("#loginLogStartdate").val(""),  
47 - $("#loginLogEnddate").val(""),  
48 - reloadTable(); 44 + // $("#loginLonMark").val("mark")
  45 + // $("#loginAccount").val(""),
  46 + // $("#loginLogStartdate").val(""),
  47 + // $("#loginLogEnddate").val(""),
  48 + // reloadTable();
  49 + common.openWin('setting/onlineUser', '在线用户', {}, [], function f() {
  50 +
  51 + }, null, ['60%', '45%']);
49 }) 52 })
50 } else { 53 } else {
51 $("#generalUserHeader").show(); 54 $("#generalUserHeader").show();
52 - url = common.domainName +'/api-log/sysLogin/findList?access_token='+accessToken 55 + url = common.domainName + '/api-log/sysLogin/findList?access_token=' + accessToken
53 paga = false; 56 paga = false;
54 cols = [{field: 'loginTime', title: '登录时间', align: 'center'} 57 cols = [{field: 'loginTime', title: '登录时间', align: 'center'}
55 , {field: 'loginIp', title: 'IP地址', align: 'center'} 58 , {field: 'loginIp', title: 'IP地址', align: 'center'}
@@ -121,11 +124,15 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi @@ -121,11 +124,15 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
121 } 124 }
122 } 125 }
123 }, 126 },
124 - on: function(data){ 127 + on: function (data) {
125 setTimeout(reloadTable, 0) 128 setTimeout(reloadTable, 0)
126 }, 129 },
127 data: res.data 130 data: res.data
128 }) 131 })
  132 + if (settingOrgSelect) {
  133 + //追加样式
  134 + $('#settingOrgId').find('.xm-body').eq(0).css("width", "230px");
  135 + }
129 } 136 }
130 }) 137 })
131 } 138 }
@@ -137,7 +144,11 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi @@ -137,7 +144,11 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
137 reloadTable(); 144 reloadTable();
138 } 145 }
139 }); 146 });
140 - 147 + //lsq 登录日志页增加搜索按钮 2022-06-30
  148 + $('#settingQueryBtn').unbind('click').on('click', function () {
  149 + $("#loginLonMark").val("")
  150 + reloadTable();
  151 + })
141 $('[data-setting-pwd]').click(function () { 152 $('[data-setting-pwd]').click(function () {
142 view('data-setting-pwd').render('template/user/password').then(function (res) { 153 view('data-setting-pwd').render('template/user/password').then(function (res) {
143 layer.open({ 154 layer.open({
@@ -150,7 +161,7 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi @@ -150,7 +161,7 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
150 }); 161 });
151 162
152 function loginLogTable() { 163 function loginLogTable() {
153 - if (localStorage.getItem("lgn") === 'admin' || localStorage.getItem("lgn") === 'root' ){ 164 + if (localStorage.getItem("lgn") === 'admin' || localStorage.getItem("lgn") === 'root') {
154 loginLog = table.render({ 165 loginLog = table.render({
155 elem: '#settingLoginRecord' 166 elem: '#settingLoginRecord'
156 , height: 'full-170' 167 , height: 'full-170'
@@ -164,12 +175,12 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi @@ -164,12 +175,12 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
164 if (res && res.data && res.data.length > 0) { 175 if (res && res.data && res.data.length > 0) {
165 $('#lastLogin').text(res.data[0].loginTime); 176 $('#lastLogin').text(res.data[0].loginTime);
166 } 177 }
167 - if(res.object){ 178 + if (res.object) {
168 $('#loginUserNum').text(res.object); 179 $('#loginUserNum').text(res.object);
169 } 180 }
170 } 181 }
171 }); 182 });
172 - }else{ 183 + } else {
173 loginLog = table.render({ 184 loginLog = table.render({
174 elem: '#settingLoginRecord' 185 elem: '#settingLoginRecord'
175 , height: 'full-170' 186 , height: 'full-170'
@@ -183,7 +194,7 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi @@ -183,7 +194,7 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
183 if (res && res.data && res.data.length > 0) { 194 if (res && res.data && res.data.length > 0) {
184 $('#lastLogin').text(res.data[0].loginTime); 195 $('#lastLogin').text(res.data[0].loginTime);
185 } 196 }
186 - if(res.object){ 197 + if (res.object) {
187 $('#loginUserNum').text(res.object); 198 $('#loginUserNum').text(res.object);
188 } 199 }
189 } 200 }
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 2
3 <article class="page-container setting"> 3 <article class="page-container setting">
4 <div class="page-panel"> 4 <div class="page-panel">
5 - <div class="main"> 5 + <div class="main commonDiv">
6 <div class="layui-card"> 6 <div class="layui-card">
7 <div class="setting-main" id="generalUserHeader"> 7 <div class="setting-main" id="generalUserHeader">
8 <div class="setting-item"> 8 <div class="setting-item">
9 <h5 class="setting-item-title">登录历史<br><span>以下为您最近10次登录记录，若存在异常情况，请在核实后尽快 <span 9 <h5 class="setting-item-title">登录历史<br><span>以下为您最近10次登录记录，若存在异常情况，请在核实后尽快 <span
10 - data-setting-pwd class="link">修改密码</span></span></h5> 10 + class="link" data-setting-pwd>修改密码</span></span></h5>
11 <!-- <div id="settingLoginRecord"></div>--> 11 <!-- <div id="settingLoginRecord"></div>-->
12 </div> 12 </div>
13 </div> 13 </div>
@@ -18,21 +18,21 @@ @@ -18,21 +18,21 @@
18 <div class="layui-form-item"> 18 <div class="layui-form-item">
19 <div class="layui-inline"> 19 <div class="layui-inline">
20 <div class="layui-input-inline layui-input-inline--long"> 20 <div class="layui-input-inline layui-input-inline--long">
21 - <input type="text" id="loginAccount" name="loginAccount"  
22 - placeholder="登录用户" autocomplete="off" class="layui-input"> 21 + <input autocomplete="off" class="layui-input" id="loginAccount"
  22 + name="loginAccount" placeholder="登录用户" type="text">
23 </div> 23 </div>
24 </div> 24 </div>
25 <div class="layui-inline"> 25 <div class="layui-inline">
26 <div class="layui-input-inline layui-input-inline--long"> 26 <div class="layui-input-inline layui-input-inline--long">
27 - <input type="text" class="layui-input" id="loginLogStartdate"  
28 - placeholder="开始时间"> 27 + <input class="layui-input" id="loginLogStartdate" placeholder="开始时间"
  28 + type="text">
29 </div> 29 </div>
30 </div> 30 </div>
31 <div class="layui-inline layui-inline--sm">-</div> 31 <div class="layui-inline layui-inline--sm">-</div>
32 <div class="layui-inline"> 32 <div class="layui-inline">
33 <div class="layui-input-inline layui-input-inline--long"> 33 <div class="layui-input-inline layui-input-inline--long">
34 - <input type="text" class="layui-input" id="loginLogEnddate"  
35 - placeholder="结束时间"> 34 + <input class="layui-input" id="loginLogEnddate" placeholder="结束时间"
  35 + type="text">
36 </div> 36 </div>
37 </div> 37 </div>
38 <div class="layui-inline"> 38 <div class="layui-inline">
@@ -40,12 +40,16 @@ @@ -40,12 +40,16 @@
40 <div id="settingOrgId"></div> 40 <div id="settingOrgId"></div>
41 </div> 41 </div>
42 </div> 42 </div>
  43 + <button class="layui-btn layui-btn-normal" id="settingQueryBtn" type="button">
  44 + 查询
  45 + </button>
43 </div> 46 </div>
44 </form> 47 </form>
45 - <div class="layui-form-item" style="display: block;"> 48 + <div class="layui-form-item" style="display: block;margin-bottom: 0;">
46 <input id="loginLonMark" type="hidden"> 49 <input id="loginLonMark" type="hidden">
47 <div class="layui-input-inline" style="width: 200px;font-size: 18px"> 50 <div class="layui-input-inline" style="width: 200px;font-size: 18px">
48 - <p class="ordering_header_right">当前在线用户数：<label id="loginUserNum" class="link">0</label> 位</p> 51 + <p class="ordering_header_right">当前在线用户数：<label class="link" id="loginUserNum">0</label>
  52 + 位</p>
49 </div> 53 </div>
50 </div> 54 </div>
51 </div> 55 </div>
@@ -55,25 +59,25 @@ @@ -55,25 +59,25 @@
55 </div> 59 </div>
56 </div> 60 </div>
57 </div> 61 </div>
58 -<!-- <div class="left">-->  
59 -<!-- <div class="layui-card">-->  
60 -<!-- <div class="layui-card-body">-->  
61 -<!-- <div class="user-info">-->  
62 -<!-- <div class="user-head">-->  
63 -<!-- <img src="/src/style/res/header.jpg">-->  
64 -<!-- <span id="nickname">管理员</span>-->  
65 -<!-- </div>-->  
66 -<!-- <p class="user-date">最后一次登录：<label id="lastLogin"></label></p>-->  
67 -<!-- <ul class="user-setting">-->  
68 -<!-- <li>快速通道</li>-->  
69 -<!-- <li data-setting-pwd class="link">修改密码</li>-->  
70 -<!-- <li>手机：<label id="mobile"></label></li>-->  
71 -<!-- &lt;!&ndash;<li>手机: 152****9999<span data-setting-phone class="link">修改</span></li>&ndash;&gt;-->  
72 -<!-- </ul>-->  
73 -<!-- </div>-->  
74 -<!-- </div>-->  
75 -<!-- </div>-->  
76 -<!-- </div>--> 62 + <!-- <div class="left">-->
  63 + <!-- <div class="layui-card">-->
  64 + <!-- <div class="layui-card-body">-->
  65 + <!-- <div class="user-info">-->
  66 + <!-- <div class="user-head">-->
  67 + <!-- <img src="/src/style/res/header.jpg">-->
  68 + <!-- <span id="nickname">管理员</span>-->
  69 + <!-- </div>-->
  70 + <!-- <p class="user-date">最后一次登录：<label id="lastLogin"></label></p>-->
  71 + <!-- <ul class="user-setting">-->
  72 + <!-- <li>快速通道</li>-->
  73 + <!-- <li data-setting-pwd class="link">修改密码</li>-->
  74 + <!-- <li>手机：<label id="mobile"></label></li>-->
  75 + <!-- &lt;!&ndash;<li>手机: 152****9999<span data-setting-phone class="link">修改</span></li>&ndash;&gt;-->
  76 + <!-- </ul>-->
  77 + <!-- </div>-->
  78 + <!-- </div>-->
  79 + <!-- </div>-->
  80 + <!-- </div>-->
77 </div> 81 </div>
78 </article> 82 </article>
79 83
  1 +<div class="layui-card-body">
  2 + <table id="onlineUserTable"></table>
  3 +</div>
  4 +<style>
  5 +
  6 +</style>
  7 +<script>
  8 + layui.use('onlineUser', function (fn) {
  9 + fn({{ d }});
  10 + })
  11 +</script>