1.值班表增加导出

2.修改sql脚本

doc/部署相关/casbin_rule.sql

@@ -0,0 +1,43 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : casbin
+ Source Server Type    : MySQL
+ Source Server Version : 100316
+ Source Host           : 39.98.34.197:3307
+ Source Schema         : casbin_dqm
+
+ Target Server Type    : MySQL
+ Target Server Version : 100316
+ File Encoding         : 65001
+
+ Date: 30/12/2020 11:17:29
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for casbin_rule
+-- ----------------------------
+DROP TABLE IF EXISTS `casbin_rule`;
+CREATE TABLE `casbin_rule`  (
+  `p_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `v0` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `v1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `v2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `v3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `v4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `v5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `id` int NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `IDX_casbin_rule_v5`(`v5`) USING BTREE,
+  INDEX `IDX_casbin_rule_p_type`(`p_type`) USING BTREE,
+  INDEX `IDX_casbin_rule_v0`(`v0`) USING BTREE,
+  INDEX `IDX_casbin_rule_v1`(`v1`) USING BTREE,
+  INDEX `IDX_casbin_rule_v2`(`v2`) USING BTREE,
+  INDEX `IDX_casbin_rule_v3`(`v3`) USING BTREE,
+  INDEX `IDX_casbin_rule_v4`(`v4`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 45345 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

doc/部署相关/l_lims.sql

@@ -11,60 +11,12 @@
  Target Server Version : 80016
  File Encoding         : 65001
 
- Date: 29/12/2020 17:53:35
+ Date: 29/12/2020 18:07:18
 */
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
--- ----------------------------
--- Table structure for bank_sampletype
--- ----------------------------
-DROP TABLE IF EXISTS `bank_sampletype`;
-CREATE TABLE `bank_sampletype`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `AccCode` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '账户编码',
-  `MainId` int(11) NULL DEFAULT NULL COMMENT '模板ID',
-  `MainName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模板Name',
-  `Code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编码 账户内不可重复（用户录入）',
-  `Name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称 账户内不可重复（用户录入）',
-  `DefaultCapacity` float NULL DEFAULT NULL COMMENT '默认容量',
-  `Unit` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位',
-  `ValidityHours` int(11) NULL DEFAULT NULL COMMENT '有效期 单位 小时',
-  `WaningHours` int(11) NULL DEFAULT NULL COMMENT '提前预警 单位 小时  备用',
-  `SubpackageNum` int(11) NULL DEFAULT NULL COMMENT '分装份数',
-  `SubpackageCapacity` float NULL DEFAULT NULL COMMENT '分装容量',
-  `SortCode` int(11) NULL DEFAULT NULL COMMENT '序号                  ----备用',
-  `Photo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '样本图片',
-  `PhotoType` int(11) NULL DEFAULT NULL COMMENT '样本图片',
-  `SeriesNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '序列号             ---备用',
-  `StypeItemIds` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '样本扩展字段IDs',
-  `CreateOn` datetime(0) NOT NULL,
-  `CreateUserId` int(11) NULL DEFAULT NULL,
-  `CreateBy` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `ModifiedOn` datetime(0) NULL DEFAULT NULL,
-  `ModifiedUserId` int(11) NULL DEFAULT NULL,
-  `FatherSample` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父级样本',
-  `ModifiedBy` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `Remark` tinytext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '备注',
-  `IsExpiresAlarm` int(11) NULL DEFAULT NULL COMMENT '0：报警；1不报警',
-  `Type` int(11) NULL DEFAULT 0 COMMENT '样本类型分类：0 供体材料；1 细胞；',
-  `CellTypeId` int(11) NULL DEFAULT NULL COMMENT '细胞类型Id（供体组织或者样本细胞经过操作产生的下一代细胞的类型）',
-  `CellType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '细胞类型（供体组织或者样本细胞经过操作产生的下一代细胞的类型）',
-  `Del_state` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否删除 1删除 0 未删除',
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '样本类型' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of bank_sampletype
--- ----------------------------
-INSERT INTO `bank_sampletype` VALUES (1, '', 0, NULL, 'TP', '胎盘', 20, 'cm', -100, 0, 1, 0, 0, '/static/img/sampletypeimg/plasma.png', 0, '', '', '2020-07-11 09:09:10', 1, '系统管理员', '2020-07-11 09:09:10', 1, NULL, '系统管理员', '无', 0, 0, 6, '细胞', NULL);
-INSERT INTO `bank_sampletype` VALUES (2, '', 0, NULL, 'YC', '牙齿', 20, 'cm', -100, 0, 1, 0, 0, '/static/img/sampletypeimg/yaopian.png', 0, '', '', '2020-07-11 09:09:10', 1, '系统管理员', '2020-12-18 13:31:10', 1, '', 'Dashoo', '无', 0, 0, 6, '细胞', NULL);
-INSERT INTO `bank_sampletype` VALUES (3, '', 0, NULL, 'ZF', '脂肪', 20, 'cm', -100, 0, 1, 0, 0, '/static/img/sampletypeimg/huangse.png', 0, '', '', '2020-07-11 09:09:10', 1, '系统管理员', '2020-12-18 13:31:20', 1, '', 'Dashoo', '无', 0, 0, 6, '细胞', NULL);
-INSERT INTO `bank_sampletype` VALUES (4, '', 0, NULL, 'PB', '外周血', 20, 'cm', -100, 0, 1, 0, 0, '/static/img/sampletypeimg/hongxibao.png', 0, '', '', '2020-07-11 09:09:10', 1, '系统管理员', '2020-12-18 13:31:28', 1, '', 'Dashoo', '无', 0, 0, 6, '细胞', NULL);
-INSERT INTO `bank_sampletype` VALUES (5, '', 0, NULL, 'QD', '脐带', 20, 'cm', -100, 0, 1, 0, 0, '/static/img/sampletypeimg/plasma.png', 0, '', '', '2020-07-11 09:09:10', 1, '系统管理员', '2020-07-11 09:09:10', 1, NULL, '系统管理员', '无', 0, 0, 6, '细胞', NULL);
-INSERT INTO `bank_sampletype` VALUES (6, '', 0, '', 'XB', '细胞', 20, 'mL', -100, 0, 1, 0, 0, '/static/img/sampletypeimg/RNA.png', 0, '', '', '2020-08-21 14:52:03', 1, '系统管理员', '2020-08-21 14:53:20', 1, '', '系统管理员', '无', 0, 0, 6, '细胞', NULL);
-
 -- ----------------------------
 -- Table structure for base_itemdetails
 -- ----------------------------
@@ -864,6 +816,7 @@ INSERT INTO `base_operationlog` VALUES (31776, '', 1, 'InstrumenMaintainLog', '
 INSERT INTO `base_operationlog` VALUES (31777, '', 1, 'InstrumenMaintainLog', '设备管理', '138', '{\"Id\":138,\"InstrumenId\":252,\"InstrumenName\":\"电视\",\"InstrumenCode\":\"HX-YV-01\",\"OperaRemark\":\"123\",\"OperaTpye\":\"设备报废\",\"TypeCode\":2,\"OperaUser\":\"wang \",\"OperaOn\":\"2020-12-29T17:35:56+08:00\",\"CreateOn\":\"2020-12-29T17:36:06+08:00\",\"CreateUserId\":0,\"CreateBy\":\"\",\"ModifiedOn\":\"2020-12-29T17:36:06+08:00\",\"ModifiedUserId\":0,\"ModifiedBy\":\"\"}', '2020-12-29 17:50:22', '', '', '质量管理-HX-YV-01', '');
 INSERT INTO `base_operationlog` VALUES (31778, '', 1, 'InstrumenMaintainLog', '设备管理', '137', '{\"Id\":137,\"InstrumenId\":252,\"InstrumenName\":\"电视\",\"InstrumenCode\":\"HX-YV-01\",\"OperaRemark\":\"123\",\"OperaTpye\":\"设备报废\",\"TypeCode\":2,\"OperaUser\":\"王天\",\"OperaOn\":\"2020-12-29T17:13:20+08:00\",\"CreateOn\":\"2020-12-29T17:15:20+08:00\",\"CreateUserId\":0,\"CreateBy\":\"\",\"ModifiedOn\":\"2020-12-29T17:22:12+08:00\",\"ModifiedUserId\":0,\"ModifiedBy\":\"\"}', '2020-12-29 17:50:31', '', '', '质量管理-HX-YV-01', '');
 INSERT INTO `base_operationlog` VALUES (31779, '', 1, 'InstrumenMaintainLog', '设备管理', '136', '{\"Id\":136,\"InstrumenId\":252,\"InstrumenName\":\"电视\",\"InstrumenCode\":\"HX-YV-01\",\"OperaRemark\":\"2344\",\"OperaTpye\":\"设备维修\",\"TypeCode\":2,\"OperaUser\":\"张伟\",\"OperaOn\":\"2020-12-29T10:33:37+08:00\",\"CreateOn\":\"2020-12-29T10:33:49+08:00\",\"CreateUserId\":0,\"CreateBy\":\"\",\"ModifiedOn\":\"2020-12-29T17:22:02+08:00\",\"ModifiedUserId\":0,\"ModifiedBy\":\"\"}', '2020-12-29 17:50:37', '', '', '质量管理-HX-YV-01', '');
+INSERT INTO `base_operationlog` VALUES (31780, '', 1, 'InstrumenMaintainLog', '设备管理', '138', '{\"Id\":138,\"InstrumenId\":252,\"InstrumenName\":\"电视\",\"InstrumenCode\":\"HX-YV-01\",\"OperaRemark\":\"报废申请\",\"OperaTpye\":\"设备报废\",\"TypeCode\":2,\"OperaUser\":\"wang \",\"OperaOn\":\"2020-12-29T17:35:56+08:00\",\"CreateOn\":\"2020-12-29T17:36:06+08:00\",\"CreateUserId\":0,\"CreateBy\":\"\",\"ModifiedOn\":\"2020-12-29T17:50:22+08:00\",\"ModifiedUserId\":0,\"ModifiedBy\":\"\"}', '2020-12-29 17:59:58', '', '', '质量管理-HX-YV-01', '');
 
 -- ----------------------------
 -- Table structure for base_organize
@@ -1194,14 +1147,14 @@ DROP TABLE IF EXISTS `class`;
 CREATE TABLE `class`  (
   `Id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `Year` int(11) NULL DEFAULT NULL COMMENT '年级',
-  `Name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '班级名称',
-  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `Name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '班级名称',
+  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `CreatedTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `UpdatedTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `IsDel` int(11) NOT NULL COMMENT '删除标志',
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '班级表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '班级表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of class
@@ -1218,16 +1171,16 @@ CREATE TABLE `course`  (
   `Year` int(11) NULL DEFAULT NULL COMMENT '学年',
   `Term` int(11) NULL DEFAULT NULL COMMENT '学期',
   `ClassId` int(11) NULL DEFAULT NULL COMMENT '班级ID',
-  `CourseWeek` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '教学周',
-  `Title` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '标题',
-  `Status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态',
-  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CourseWeek` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '教学周',
+  `Title` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
+  `Status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
+  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `CreatedTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `UpdatedTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `IsDel` int(11) NOT NULL COMMENT '删除标志',
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '课程表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '课程表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of course
@@ -1245,23 +1198,23 @@ CREATE TABLE `course_detail`  (
   `CourseId` int(11) NULL DEFAULT NULL COMMENT '课程表ID',
   `Year` int(11) NULL DEFAULT NULL COMMENT '学年',
   `Term` int(11) NULL DEFAULT NULL COMMENT '学期',
-  `CourseName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '课程名',
+  `CourseName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '课程名',
   `Teacher` int(11) NULL DEFAULT NULL COMMENT '授课老师',
   `Local` int(11) NULL DEFAULT NULL COMMENT '实验地点',
   `Class` int(11) NULL DEFAULT NULL COMMENT '授课班级',
   `Mark` decimal(32, 8) NULL DEFAULT NULL COMMENT '学分',
   `Num` int(11) NULL DEFAULT NULL COMMENT '人数',
-  `WeekTitle` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '教学周',
+  `WeekTitle` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '教学周',
   `DayOfWeek` int(11) NULL DEFAULT NULL COMMENT '周次 1-7',
-  `Time` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '节次',
+  `Time` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节次',
   `Status` int(11) NULL DEFAULT NULL COMMENT '状态 发布状态',
-  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `CreatedTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `UpdatedTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `IsDel` int(11) NOT NULL COMMENT '删除标志',
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '课程明细表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '课程明细表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of course_detail
@@ -1290,15 +1243,15 @@ CREATE TABLE `duty`  (
   `Id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `Year` int(11) NOT NULL COMMENT '学年',
   `Term` int(11) NOT NULL COMMENT '学期',
-  `Title` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '标题',
+  `Title` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题',
   `Status` int(11) NOT NULL COMMENT '状态',
-  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `CreatedTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `UpdatedTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `IsDel` int(11) NOT NULL COMMENT '删除标志',
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 325 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '值班表 ' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 325 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '值班表 ' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of duty
@@ -1315,10 +1268,10 @@ DROP TABLE IF EXISTS `duty_detail`;
 CREATE TABLE `duty_detail`  (
   `Id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `DutyId` int(11) NOT NULL COMMENT '值班ID',
-  `Local` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '地点',
+  `Local` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地点',
   `Time` int(11) NULL DEFAULT NULL COMMENT '时间段',
-  `Status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_ci NULL DEFAULT NULL COMMENT '状态',
-  `People` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '值班人员',
+  `Status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
+  `People` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '值班人员',
   `Monday` int(11) NULL DEFAULT NULL COMMENT '周一',
   `Tuesday` int(11) NULL DEFAULT NULL COMMENT '周二',
   `Wednesday` int(11) NULL DEFAULT NULL COMMENT '周三',
@@ -1326,13 +1279,13 @@ CREATE TABLE `duty_detail`  (
   `Friday` int(11) NULL DEFAULT NULL COMMENT '周五',
   `Saturday` int(11) NULL DEFAULT NULL COMMENT '周六',
   `Sunday` int(11) NULL DEFAULT NULL COMMENT '周天',
-  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `CreatedTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `UpdatedTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `IsDel` int(11) NOT NULL COMMENT '删除标志',
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 179 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '值班详情表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 179 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '值班详情表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of duty_detail
@@ -1398,17 +1351,17 @@ INSERT INTO `duty_detail` VALUES (182, 325, '2', 4, '', '', 178, 0, 168, 0, 0, 0
 DROP TABLE IF EXISTS `information`;
 CREATE TABLE `information`  (
   `Id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Title` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '标题',
-  `Content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '内容',
+  `Title` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
+  `Content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容',
   `Flag` int(11) NULL DEFAULT NULL COMMENT '类别',
   `Status` int(11) NULL DEFAULT NULL COMMENT '状态',
-  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CreatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `CreatedTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UpdatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
   `UpdatedTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `IsDel` int(11) NOT NULL COMMENT '删除标志',
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 56 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '信息表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 56 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '信息表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of information
@@ -1423,20 +1376,20 @@ INSERT INTO `information` VALUES (55, '321', '321321321', NULL, 1, NULL, '2020-1
 DROP TABLE IF EXISTS `instr_room`;
 CREATE TABLE `instr_room`  (
   `Id` int(11) NOT NULL AUTO_INCREMENT COMMENT '房间id',
-  `RoomNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '房间号',
-  `RoomName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '房间名称',
-  `RoomType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '房间类型',
-  `RoomDescribe` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '房间描述',
-  `PositionInformation` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '位置信息',
+  `RoomNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房间号',
+  `RoomName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房间名称',
+  `RoomType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房间类型',
+  `RoomDescribe` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房间描述',
+  `PositionInformation` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '位置信息',
   `CreateOn` datetime(0) NULL DEFAULT NULL,
   `CreateUserId` int(11) NULL DEFAULT NULL,
-  `CreateBy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `CreateBy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `ModifiedOn` datetime(0) NULL DEFAULT NULL,
   `ModifiedUserId` int(11) NULL DEFAULT NULL,
-  `ModifiedBy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `ModifiedBy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `building` int(11) NULL DEFAULT NULL COMMENT '建筑信息',
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 371 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 371 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of instr_room
@@ -1474,7 +1427,7 @@ CREATE TABLE `instrumenmaintainlog`  (
 INSERT INTO `instrumenmaintainlog` VALUES (135, 252, '电视', 'HX-YV-01', '设备确认', '设备确认', '张天', '2020-12-29 10:29:59', 0, '', '2020-12-29 10:30:11', 1, 0, '', '2020-12-29 17:47:21');
 INSERT INTO `instrumenmaintainlog` VALUES (136, 252, '电视', 'HX-YV-01', '维修中', '设备维修', '张伟', '2020-12-29 10:33:37', 0, '', '2020-12-29 10:33:49', 2, 0, '', '2020-12-29 17:50:37');
 INSERT INTO `instrumenmaintainlog` VALUES (137, 252, '电视', 'HX-YV-01', '报废', '设备报废', '王天', '2020-12-29 17:13:20', 0, '', '2020-12-29 17:15:20', 2, 0, '', '2020-12-29 17:50:31');
-INSERT INTO `instrumenmaintainlog` VALUES (138, 252, '电视', 'HX-YV-01', '报废申请', '设备报废', 'wang ', '2020-12-29 17:35:56', 0, '', '2020-12-29 17:36:06', 2, 0, '', '2020-12-29 17:50:22');
+INSERT INTO `instrumenmaintainlog` VALUES (138, 252, '电视', 'HX-YV-01', '报废申请', '设备报废', '王伟', '2020-12-29 17:35:56', 0, '', '2020-12-29 17:36:06', 2, 0, '', '2020-12-29 17:59:58');
 INSERT INTO `instrumenmaintainlog` VALUES (142, 252, '电视', 'HX-YV-01', '确认设备', '设备确认', '王伟', '2020-12-29 17:46:27', 0, '', '2020-12-29 17:46:39', 1, 0, '', '2020-12-29 17:47:01');
 
 -- ----------------------------

frontend_web/package.json

@@ -24,7 +24,7 @@
     "dateformat": "^3.0.3",
     "dayjs": "^1.8.12",
     "element-ui": "^2.10.1",
-    "file-saver": "^2.0.2",
+    "file-saver": "^2.0.5",
     "flex.css": "^1.1.7",
     "fuse.js": "^3.4.4",
     "hotkeys-js": "^3.6.2",
@@ -49,7 +49,7 @@
     "vuedraggable": "^2.23.0",
     "vuex": "^3.0.1",
     "wangeditor": "^3.1.1",
-    "xlsx": "^0.15.1"
+    "xlsx": "^0.15.6"
   },
   "devDependencies": {
     "@kazupon/vue-i18n-loader": "^0.3.0",

frontend_web/src/views/duty/detail/index.vue

@@ -79,6 +79,9 @@
                        upstream
                        @click="back()">返回</el-button>
           </el-col>
+          <el-col :span="2">
+            <button @click="exportExcel()">导出</button>
+          </el-col>
         </el-row>
       </el-form>
     </template>
@@ -91,7 +94,8 @@
               @cell-click="cellclick"
               @header-click="headclick"
               :cell-class-name="cellBg"
-              :key="refresh">
+              :key="refresh"
+              id="out-table">
       <el-table-column fit
                        prop="Local"
                        min-width="160px"
@@ -169,6 +173,8 @@ import { mapState, mapActions } from 'vuex'
 import DutyApi from '@/api/duty'
 import itemDetailApi from '@/api/sysadmin/itemdetail'
 import PersonnelApi from '@/api/personnel'
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
 const columnNum = 9
 // 固定列数
 const fixRowHeadNum = 2
@@ -230,6 +236,17 @@ export default {
     this.getDetailData()
   },
   methods: {
+    // 导出excel
+    exportExcel () {
+      /* out-table关联导出的dom节点  */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#out-table'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), '值日表.xlsx')
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
     // 初始化单选框
     selectCheckBox () {
       let selectLocal = new Map()