From 3c470b15b952b86c1e38cb9634190a12ccf3d38d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:32:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html | 156 ++++------------------------------------------------
1 files changed, 12 insertions(+), 144 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
index b8ca7d6..9b279da 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
@@ -8,67 +8,15 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar">
- <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="请输入标题" /> 
- <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
- class="layui-input search-input" id="test2">  
- <select id="role_clients" placeholder="选择一个应用" lay-filter="role_clients">
- <option value="">-请选择-</option>
- </select>
+ <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按内容模糊查找..." /> 
+ <input type="text" class="layui-input search-input" id="test1" placeholder="开始时间"> 至 <input type="text"
+ class="layui-input search-input" id="test2" placeholder="结束时间">  
<button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
</div>
-
<!-- 数据表格 -->
<table class="layui-table" id="app-table" lay-filter="app-table"></table>
</div>
</div>
-
-<!-- 表格操作列 -->
-<script type="text/html" id="businessRecords-table-bar">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
-</script>
-
-<!-- 表单弹窗 -->
-<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
- <input name="id" type="hidden"/>
- <div class="layui-form-item">
- <label class="layui-form-label">记录标题</label>
- <div class="layui-input-block">
- <input name="recordTitle" disabled="true" type="text" class="layui-input" maxlength="20"
- lay-verify="required" required/>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">操作人姓名</label>
- <div class="layui-input-block">
- <input name="userName" disabled="true" placeholder="请输入应用名称" type="text" class="layui-input" maxlength="20"/>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">应用名称</label>
- <div class="layui-input-block">
- <input name="appName" disabled="true" type="text" class="layui-input" maxlength="20"
- lay-verify="required" required />
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">ip</label>
- <div class="layui-input-block">
- <input name="recordIp" disabled="true" type="text" class="layui-input" maxlength="20"/>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">业务操作记录</label>
- <div class="layui-input-block">
- <input name="recordDetail" disabled="true" type="text" class="layui-input" maxlength="20"/>
- </div>
- </div>
- <div class="layui-form-item model-form-footer">
- <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">确定</button>
- </div>
- </form>
-</script>
-
<script>
layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin'], function () {
@@ -79,27 +27,6 @@
var util = layui.util;
var admin = layui.admin;
- // 获取应用列表
- // layer.load(2);
- admin.req('api-user/users/findAll', {}, function (data) {
- layer.closeAll('loading');
- if (0 === data.code) {
- let selected = false;
- clientsAll = data.data;
- $.each(data.data, function (index, item) {
- if (config.clientId === item.clientId) {
- selected = true;
- } else {
- selected = false;
- }
- //往下拉菜单里添加元素
- $('#role_clients').append(new Option(item.username, item.id, false, selected));
- })
- form.render();
- } else {
- layer.msg(data.msg, { icon: 2, time: 500 });
- }
- }, 'Post');
//时间格式
var laydate = layui.laydate;
@@ -119,28 +46,18 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { type: 'numbers' },
- { field: 'userName', width: 180, sort: true, title: '用户' },
- { field: 'appName', width: 200, sort: true, title: '应用名' },
- { field: 'recordIp', width: 180, sort: true, title: 'IP' },
- { field: 'recordTitle', width: 300, sort: true, title: '标题' },
- { field: 'id', width: 250, align: 'center', toolbar: '#businessRecords-table-bar', sort: true, title: '查看详情' },// 0就诊数据 1筛查
- { field: 'createTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" }
- ]]
- });
-
- // 工具条点击事件
- table.on('tool(app-table)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'detail') { // 查看详情
- showEditModel(data);
+ { field: 'userName', width: 180, title: '用户' },
+ { field: 'appName', width: 200, title: '应用名' },
+ { field: 'recordIp', width: 180,title: 'IP' },
+ { field: 'recordTitle', width: 300,title: '日志内容' },
+ { field: 'createTime', width: 250, sort: true, title: '日志时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" }
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
}
});
-
// 搜索按钮点击事件
$('#app-btn-search').click(function () {
- var userId = $('#role_clients').val();
var key = $('#app-edit-search').val();
var startTime = $('#test1').val();
var endTime = $('#test2').val();
@@ -152,7 +69,7 @@
}
}
- table.reload('app-table', { where: { recordTitle: key, startTime: startTime, endTime: endTime, userId: userId } });
+ table.reload('app-table', { where: { recordTitle: key, startTime: startTime, endTime: endTime} });
});
//比较日期大小
function compareDate(logintime, logouttime) {
@@ -170,54 +87,5 @@
}
}
}
- // 导出
- $('#app-btn-export').click(function () {
- var url = config.base_server + 'api-opration/dataneed/export';
- var xhr = new XMLHttpRequest();
- xhr.open('POST', url, true);
- xhr.responseType = "blob";
- xhr.setRequestHeader("client_type", "DESKTOP_WEB");
- xhr.setRequestHeader("Authorization", "Bearer " + config.getToken().access_token);
- xhr.onload = function () {
- if (this.status == 200) {
- var fileName = "user.xlsx";
- var blob = this.response;
- var a = document.createElement('a');
- a.innerHTML = fileName;
- // 指定生成的文件名
- a.download = fileName;
- a.href = URL.createObjectURL(blob);
- document.body.appendChild(a);
- var evt = document.createEvent("MouseEvents");
- evt.initEvent("click", false, false);
- a.dispatchEvent(evt);
- document.body.removeChild(a);
- }
- }
- xhr.send();
- });
-
- // // 显示编辑弹窗
- var showEditModel = function (data) {
- layer.open({
- type: 1,
- title: '查看详情',
- area: '450px',
- offset: '120px',
- content: $('#app-model').html(),
- success: function () {
- $('#app-form')[0].reset();
- $('#app-form').attr('method', 'POST');
- if (data) {
- $("input[name='clientId']").attr('disabled', true);
- $("input[name='clientId']").attr('class', "layui-input layui-disabled");
- $("input[name='webServerRedirectUri']").attr('disabled', true);
- $("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
- form.val('app-form', data);
- // $('#app-form').attr('method', 'POST');
- }
- }
- });
- };
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0