From ba1ab8c1f964b02e97efb7174eb7e6227706ade1 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 23 Jul 2020 17:03:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/bloodpower.sql | 31 +++++++++++++------ .../src/main/webapp/static/js/blood.js | 4 +-- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/doc/bloodpower.sql b/doc/bloodpower.sql index 3fc47d3..f858b8a 100644 --- a/doc/bloodpower.sql +++ b/doc/bloodpower.sql @@ -11,7 +11,7 @@ Target Server Version : 50717 File Encoding : 65001 - Date: 10/07/2020 17:22:26 + Date: 22/07/2020 14:52:43 */ SET NAMES utf8mb4; @@ -81,7 +81,7 @@ CREATE TABLE `power_log` ( `creater` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建人', `remark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`log_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1534 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1548 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of power_log @@ -1475,6 +1475,20 @@ INSERT INTO `power_log` VALUES (1530, '登录', '192.168.1.3', '用户登录成 INSERT INTO `power_log` VALUES (1531, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-10 17:10', 'admin', NULL); INSERT INTO `power_log` VALUES (1532, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-10 17:16', 'qwe', NULL); INSERT INTO `power_log` VALUES (1533, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-10 17:16', 'qwe', NULL); +INSERT INTO `power_log` VALUES (1534, '登录', '192.168.179.1', '用户登录成功', 'power', NULL, '2020-07-10 17:29', 'admin', NULL); +INSERT INTO `power_log` VALUES (1535, '查看', '192.168.179.1', '用户管理页面', 'power', NULL, '2020-07-10 17:29', 'admin', NULL); +INSERT INTO `power_log` VALUES (1536, '查看', '192.168.179.1', '用户管理页面', 'power', NULL, '2020-07-10 17:31', 'admin', NULL); +INSERT INTO `power_log` VALUES (1537, '查看', '192.168.179.1', '用户管理页面', 'power', NULL, '2020-07-10 17:32', 'admin', NULL); +INSERT INTO `power_log` VALUES (1538, '查看', '192.168.179.1', '用户管理页面', 'power', NULL, '2020-07-10 17:32', 'admin', NULL); +INSERT INTO `power_log` VALUES (1539, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-13 09:14', 'admin', NULL); +INSERT INTO `power_log` VALUES (1540, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-13 09:14', 'admin', NULL); +INSERT INTO `power_log` VALUES (1541, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-13 09:33', 'admin', NULL); +INSERT INTO `power_log` VALUES (1542, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-13 09:46', 'admin', NULL); +INSERT INTO `power_log` VALUES (1543, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-13 09:56', 'admin', NULL); +INSERT INTO `power_log` VALUES (1544, '登录', '192.168.179.1', '用户登录成功', 'power', NULL, '2020-07-13 10:31', 'admin', NULL); +INSERT INTO `power_log` VALUES (1545, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-13 10:31', 'admin', NULL); +INSERT INTO `power_log` VALUES (1546, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-17 16:15', 'admin', NULL); +INSERT INTO `power_log` VALUES (1547, '登录', '192.168.1.3', '用户登录成功', 'power', NULL, '2020-07-17 16:24', 'admin', NULL); -- ---------------------------- -- Table structure for power_login_set @@ -1520,7 +1534,7 @@ CREATE TABLE `power_menu` ( `updater` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `remark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`menu_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 479 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 489 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of power_menu @@ -1762,7 +1776,6 @@ INSERT INTO `power_menu` VALUES (403, '查看水印设置', NULL, '/pdfWaterSet/ INSERT INTO `power_menu` VALUES (404, '修改水印设置', NULL, '/pdfWaterSet/update', '功能', 'update', 'update', '基本类', 3, 'emr_record', 402, 2, 1, '2020-03-12', 'admin', '2020-03-12', 'admin', ''); INSERT INTO `power_menu` VALUES (405, '病案打印', NULL, '/commom/printPdf', '功能', 'printPdf', 'printPdf', '业务类', 3, 'emr_record', 216, 18, 1, '2020-05-21', 'admin', '2020-05-21', 'admin', ''); INSERT INTO `power_menu` VALUES (458, '修改病案备注', NULL, '/commom/addRemark', '功能', 'addRemark', 'addRemark', '业务类', 3, 'emr_record', 216, 19, 1, '2020-06-04', 'admin', '2020-06-04', 'admin', ''); -INSERT INTO `power_menu` VALUES (459, '恢复影像图片', NULL, '/commom/recoverPic', '功能', 'recoverPic', 'recoverPic', '业务类', 3, 'emr_record', 216, 20, 1, '2020-06-05', 'admin', '2020-06-05', 'admin', ''); INSERT INTO `power_menu` VALUES (460, '新建档案', NULL, '/commom/addRecord', '功能', 'addRecord', 'addRecord', '业务类', 3, 'emr_record', 216, 21, 1, '2020-06-09', 'admin', '2020-06-09', 'admin', ''); INSERT INTO `power_menu` VALUES (461, '修改档案', NULL, '/commom/updateRecord', '功能', 'updateRecord', 'updateRecord', '基本类', 3, 'emr_record', 216, 22, 1, '2020-06-09', 'admin', '2020-06-09', 'admin', ''); INSERT INTO `power_menu` VALUES (462, '删除档案', NULL, '/commom/deleteRecord', '功能', 'deleteRecord', 'deleteRecord', '基本类', 3, 'emr_record', 216, 23, 1, '2020-06-09', 'admin', '2020-06-09', 'admin', ''); @@ -1777,11 +1790,11 @@ INSERT INTO `power_menu` VALUES (470, '修改协议类型', NULL, '/agree/update INSERT INTO `power_menu` VALUES (471, '新增协议类型', NULL, '/agree/addAgree', '功能', 'addAgree', 'addAgree', '基本类', 3, 'emr_record', 464, 2, 1, '2020-06-09', 'admin', '2020-06-09', 'admin', ''); INSERT INTO `power_menu` VALUES (472, '删除协议类型', NULL, '/agree/deleteAgree', '功能', 'deleteAgree', 'deleteAgree', '基本类', 3, 'emr_record', 464, 4, 1, '2020-06-09', 'admin', '2020-06-09', 'admin', ''); INSERT INTO `power_menu` VALUES (473, '报表管理', 'fa fa-dashboard', '#', '菜单', NULL, NULL, NULL, 3, 'emr_record', 229, 4, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); -INSERT INTO `power_menu` VALUES (474, '资料恢复', 'fa fa-circle-o', '/revert/revertList', '菜单', NULL, NULL, NULL, 3, 'emr_record', 225, 1, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); -INSERT INTO `power_menu` VALUES (475, '查看资料恢复', NULL, '/revert/revertList', '功能', 'revertList', 'revertList', '基本类', 3, 'emr_record', 474, 1, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); -INSERT INTO `power_menu` VALUES (476, '恢复档案', NULL, '/revert/revertRecord', '功能', 'revertRecord', 'revertRecord', '业务类', 3, 'emr_record', 474, 3, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); -INSERT INTO `power_menu` VALUES (477, '查看详情', NULL, '/revert/showDetail', '功能', 'showDetail', 'showDetail', '业务类', 3, 'emr_record', 474, 2, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); -INSERT INTO `power_menu` VALUES (478, '恢复图片', NULL, '/revert/recoverPic', '功能', 'recoverPic', 'recoverPic', '业务类', 3, 'emr_record', 474, 4, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); +INSERT INTO `power_menu` VALUES (484, '资料恢复', 'fa fa-circle-o', '/revert/revertList', '菜单', NULL, NULL, NULL, 3, 'emr_record', 225, 1, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); +INSERT INTO `power_menu` VALUES (485, '查看资料恢复', NULL, '/revert/revertList', '功能', 'revertList', 'revertList', '基本类', 3, 'emr_record', 484, 1, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); +INSERT INTO `power_menu` VALUES (486, '恢复档案', NULL, '/revert/revertRecord', '功能', 'revertRecord', 'revertRecord', '业务类', 3, 'emr_record', 484, 3, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); +INSERT INTO `power_menu` VALUES (487, '查看详情', NULL, '/revert/showDetail', '功能', 'showDetail', 'showDetail', '业务类', 3, 'emr_record', 484, 2, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); +INSERT INTO `power_menu` VALUES (488, '恢复图片', NULL, '/revert/recoverPic', '功能', 'recoverPic', 'recoverPic', '业务类', 3, 'emr_record', 484, 4, 1, '2020-07-10', 'admin', '2020-07-10', 'admin', ''); -- ---------------------------- -- Table structure for power_notice diff --git a/power-admin/src/main/webapp/static/js/blood.js b/power-admin/src/main/webapp/static/js/blood.js index 75f23ad..959e547 100644 --- a/power-admin/src/main/webapp/static/js/blood.js +++ b/power-admin/src/main/webapp/static/js/blood.js @@ -372,9 +372,9 @@ function exportExcel(){ operate: function (reselt) { if (reselt) { if (roleId == 0) { - url = path + "/dept/export?deptName=" + $("#dept_name").val() + "&dictId=" + $("#dict_id").val() + "&effective=" + $("#effective").val() + "&creater=" + $("#creater").val() + "&checks=" + checks; + url = path + "/dept/exportBlood?deptName=" + $("#dept_name").val() + "&dictId=" + $("#dict_id").val() + "&effective=" + $("#effective").val() + "&creater=" + $("#creater").val() + "&checks=" + checks; } else { - url = path + "/dept/export?deptName=" + $("#dept_name").val() + "&effective=" + $("#effective").val() + "&creater=" + $("#creater").val() + "&checks=" + checks; + url = path + "/dept/exportBlood?deptName=" + $("#dept_name").val() + "&effective=" + $("#effective").val() + "&creater=" + $("#creater").val() + "&checks=" + checks; } window.location.href = url; }