diff --git a/.vscode/launch.json b/.vscode/launch.json index 21effbe..f77a251 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -17,11 +17,12 @@ "-f http://localhost:4700", // 研发 "-g postgres://postgres:123@10.8.30.166:5432/hr-dev", - "--redisHost 10.8.30.112", + "--redisHost localhost", "--redisPort 6379", - // "--apiEmisUrl http://10.8.30.112:14000", + "--apiEmisUrl http://localhost:14000", // 测试 - "--apiEmisUrl http://10.8.30.161:1111", + // "--apiEmisUrl http://10.8.30.161:1111", + // "--redisHost 10.8.30.112", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa", "--qnbkt dev-hr", diff --git a/api/app/lib/models/training_information_level.js b/api/app/lib/models/training_information_level.js new file mode 100644 index 0000000..ff753c2 --- /dev/null +++ b/api/app/lib/models/training_information_level.js @@ -0,0 +1,61 @@ +/* eslint-disable*/ + +'use strict'; + +module.exports = dc => { + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const TrainingInformationLevel = sequelize.define("trainingInformationLevel", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true + }, + type: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "type", + autoIncrement: false + }, + departmentname: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "departmentname", + autoIncrement: false + }, + traindate: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "traindate", + autoIncrement: false + }, + origin: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "origin", + autoIncrement: false + } + }, { + tableName: "training_information_level", + comment: "", + indexes: [] + }); + dc.models.TrainingInformationLevel = TrainingInformationLevel; + return TrainingInformationLevel; +}; \ No newline at end of file diff --git a/api/app/lib/models/training_information_record.js b/api/app/lib/models/training_information_record.js new file mode 100644 index 0000000..d73a102 --- /dev/null +++ b/api/app/lib/models/training_information_record.js @@ -0,0 +1,115 @@ +/* eslint-disable*/ + +'use strict'; + +module.exports = dc => { + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const TrainingInformationRecord = sequelize.define("trainingInformationRecord", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true + }, + type: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "type", + autoIncrement: false + }, + departmentname: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "departmentname", + autoIncrement: false + }, + traindate: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "traindate", + autoIncrement: false + }, + filetype: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "filetype", + autoIncrement: false + }, + filename: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "filename", + autoIncrement: false + }, + filesize: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "filesize", + autoIncrement: false + }, + updatedate: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "updatedate", + autoIncrement: false + }, + attachpath: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "attachpath", + autoIncrement: false + }, + origin: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "origin", + autoIncrement: false + }, + traininginformationlevelid: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "traininginformationlevelid", + autoIncrement: false + } + }, { + tableName: "training_information_record", + comment: "", + indexes: [] + }); + dc.models.TrainingInformationRecord = TrainingInformationRecord; + return TrainingInformationRecord; +}; \ No newline at end of file diff --git a/api/package.json b/api/package.json index cffb191..7081076 100644 --- a/api/package.json +++ b/api/package.json @@ -38,6 +38,7 @@ "uuid": "^3.3.2" }, "devDependencies": { + "freesun-sequelize-automate": "^1.0.5", "mocha": "^6.0.2" } } diff --git a/web/client/src/sections/humanAffairs/containers/resourceRepository.jsx b/web/client/src/sections/humanAffairs/containers/resourceRepository.jsx index 2a1f58a..725ee85 100644 --- a/web/client/src/sections/humanAffairs/containers/resourceRepository.jsx +++ b/web/client/src/sections/humanAffairs/containers/resourceRepository.jsx @@ -1,14 +1,21 @@ import React, { useEffect, useState } from 'react'; import { connect } from 'react-redux'; import { Button, Col, Row, Input, Tree, Table, Space } from '@douyinfe/semi-ui'; -import { IconSearch } from '@douyinfe/semi-icons'; +import { IconSearch, IconEditStroked, IconMinusCircleStroked, IconPlusCircleStroked } from '@douyinfe/semi-icons'; import '../style.less' const ResourceRepository = (props) => { const { dispatch, actions, clientHeight } = props; const treeData = [ { - label: '亚洲', + label: (