提交 e0b61b45 编写于 作者: ibizdev's avatar ibizdev

ibizdev提交

上级 f20a8266
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
updatedate: '更新时间', updatedate: '更新时间',
enable: '逻辑有效标志', enable: '逻辑有效标志',
zgxllx: '最高学历学习形式', zgxllx: '最高学历学习形式',
tozjdate: '中建系统工作时间', tozjdate: '建筑系统工作时间',
jxkhcj: '绩效考核成绩(近两年)', jxkhcj: '绩效考核成绩(近两年)',
dyxljssj: '第一学历毕业时间', dyxljssj: '第一学历毕业时间',
yglx: '员工类型', yglx: '员工类型',
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
rank: '职级', rank: '职级',
zcbh: '职称编号', zcbh: '职称编号',
pimmajorsetypename: '所属业务系统', pimmajorsetypename: '所属业务系统',
zjxtgznx: '中建系统工作年限', zjxtgznx: '建筑系统工作年限',
gznx: '工作年限', gznx: '工作年限',
xb: '性别', xb: '性别',
createdate: '建立时间', createdate: '建立时间',
...@@ -154,9 +154,9 @@ export default { ...@@ -154,9 +154,9 @@ export default {
bdwgznx: "本单位工作年限", bdwgznx: "本单位工作年限",
bjgznx: "局工作年限", bjgznx: "局工作年限",
careername: "专业技术资格(职称)", careername: "专业技术资格(职称)",
zjxtgznx: "中建系统工作年限", zjxtgznx: "建筑系统工作年限",
cjgzsj: "参加工作时间", cjgzsj: "参加工作时间",
tozjdate: "中建系统工作时间", tozjdate: "建筑系统工作时间",
dbdwsj: "本单位工作时间", dbdwsj: "本单位工作时间",
rank: "职级", rank: "职级",
rdsj: "入党时间", rdsj: "入党时间",
...@@ -217,8 +217,8 @@ export default { ...@@ -217,8 +217,8 @@ export default {
zgxlsxzy: "最高学历所学专业", zgxlsxzy: "最高学历所学专业",
cjgzsj: "参加工作时间", cjgzsj: "参加工作时间",
gznx: "工作年限", gznx: "工作年限",
tozjdate: "中建系统工作时间", tozjdate: "建筑系统工作时间",
zjxtgznx: "中建系统工作年限", zjxtgznx: "建筑系统工作年限",
dzjbjsj: "局工作时间", dzjbjsj: "局工作时间",
bjgznx: "局工作年限", bjgznx: "局工作年限",
dbdwsj: "本单位工作时间", dbdwsj: "本单位工作时间",
......
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
updatedate: '更新时间', updatedate: '更新时间',
enable: '逻辑有效标志', enable: '逻辑有效标志',
zgxllx: '最高学历学习形式', zgxllx: '最高学历学习形式',
tozjdate: '中建系统工作时间', tozjdate: '建筑系统工作时间',
jxkhcj: '绩效考核成绩(近两年)', jxkhcj: '绩效考核成绩(近两年)',
dyxljssj: '第一学历毕业时间', dyxljssj: '第一学历毕业时间',
yglx: '员工类型', yglx: '员工类型',
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
rank: '职级', rank: '职级',
zcbh: '职称编号', zcbh: '职称编号',
pimmajorsetypename: '所属业务系统', pimmajorsetypename: '所属业务系统',
zjxtgznx: '中建系统工作年限', zjxtgznx: '建筑系统工作年限',
gznx: '工作年限', gznx: '工作年限',
xb: '性别', xb: '性别',
createdate: '建立时间', createdate: '建立时间',
...@@ -153,9 +153,9 @@ export default { ...@@ -153,9 +153,9 @@ export default {
bdwgznx: '本单位工作年限', bdwgznx: '本单位工作年限',
bjgznx: '局工作年限', bjgznx: '局工作年限',
careername: '专业技术资格(职称)', careername: '专业技术资格(职称)',
zjxtgznx: '中建系统工作年限', zjxtgznx: '建筑系统工作年限',
cjgzsj: '参加工作时间', cjgzsj: '参加工作时间',
tozjdate: '中建系统工作时间', tozjdate: '建筑系统工作时间',
dbdwsj: '本单位工作时间', dbdwsj: '本单位工作时间',
rank: '职级', rank: '职级',
rdsj: '入党时间', rdsj: '入党时间',
...@@ -216,8 +216,8 @@ export default { ...@@ -216,8 +216,8 @@ export default {
zgxlsxzy: '最高学历所学专业', zgxlsxzy: '最高学历所学专业',
cjgzsj: '参加工作时间', cjgzsj: '参加工作时间',
gznx: '工作年限', gznx: '工作年限',
tozjdate: '中建系统工作时间', tozjdate: '建筑系统工作时间',
zjxtgznx: '中建系统工作年限', zjxtgznx: '建筑系统工作年限',
dzjbjsj: '局工作时间', dzjbjsj: '局工作时间',
bjgznx: '局工作年限', bjgznx: '局工作年限',
dbdwsj: '本单位工作时间', dbdwsj: '本单位工作时间',
......
...@@ -21,7 +21,7 @@ export default { ...@@ -21,7 +21,7 @@ export default {
xwz: '学位证', xwz: '学位证',
xllx: '学习形式', xllx: '学习形式',
xxxz: '学校性质', xxxz: '学校性质',
tozjdate: '中建系统工作时间', tozjdate: '建筑系统工作时间',
jlglbh: '记录管理编号', jlglbh: '记录管理编号',
jlspzt: '记录审批状态', jlspzt: '记录审批状态',
btz: '毕业证', btz: '毕业证',
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
createdate: '建立时间', createdate: '建立时间',
xl: '学历', xl: '学历',
dbdwsj: '本单位工作时间', dbdwsj: '本单位工作时间',
zjxtgznx: '中建系统工作年限', zjxtgznx: '建筑系统工作年限',
bjgznx: '局工作年限', bjgznx: '局工作年限',
ormorgid: '组织标识', ormorgid: '组织标识',
pimpersonname: '员工名称', pimpersonname: '员工名称',
......
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
xwz: '学位证', xwz: '学位证',
xllx: '学习形式', xllx: '学习形式',
xxxz: '学校性质', xxxz: '学校性质',
tozjdate: '中建系统工作时间', tozjdate: '建筑系统工作时间',
jlglbh: '记录管理编号', jlglbh: '记录管理编号',
jlspzt: '记录审批状态', jlspzt: '记录审批状态',
btz: '毕业证', btz: '毕业证',
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
createdate: '建立时间', createdate: '建立时间',
xl: '学历', xl: '学历',
dbdwsj: '本单位工作时间', dbdwsj: '本单位工作时间',
zjxtgznx: '中建系统工作年限', zjxtgznx: '建筑系统工作年限',
bjgznx: '局工作年限', bjgznx: '局工作年限',
ormorgid: '组织标识', ormorgid: '组织标识',
pimpersonname: '员工名称', pimpersonname: '员工名称',
......
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
cjgzsj: '参加工作时间', cjgzsj: '参加工作时间',
gwksrq: '岗位开始日期', gwksrq: '岗位开始日期',
orgsectorid: '部门ID', orgsectorid: '部门ID',
tozjdate: '到中建系统时间', tozjdate: '到建筑系统时间',
zjhm: '证件号码', zjhm: '证件号码',
pimpersonid: '人员信息标识', pimpersonid: '人员信息标识',
blacklistreasons: '黑名单原因', blacklistreasons: '黑名单原因',
...@@ -450,7 +450,7 @@ export default { ...@@ -450,7 +450,7 @@ export default {
gw: "岗位", gw: "岗位",
zj: "专家类型", zj: "专家类型",
cjgzsj: "参加工作时间", cjgzsj: "参加工作时间",
tozjdate: "到中建系统时间", tozjdate: "到建筑系统时间",
dzjbjsj: "到局时间", dzjbjsj: "到局时间",
dbdwsj: "到本单位时间", dbdwsj: "到本单位时间",
gzzt: "挂职状态", gzzt: "挂职状态",
...@@ -536,7 +536,7 @@ export default { ...@@ -536,7 +536,7 @@ export default {
postaladdress: "通讯地址", postaladdress: "通讯地址",
rdsj1: "入党时间", rdsj1: "入党时间",
rtsj: "入团时间", rtsj: "入团时间",
tozjdate: "到中建系统时间", tozjdate: "到建筑系统时间",
dzjbjsj: "到局时间", dzjbjsj: "到局时间",
rzqd: "入职渠道", rzqd: "入职渠道",
gzzt: "挂职状态", gzzt: "挂职状态",
...@@ -740,7 +740,7 @@ export default { ...@@ -740,7 +740,7 @@ export default {
rank: "职级", rank: "职级",
zj: "专家类型", zj: "专家类型",
cjgzsj: "参加工作时间", cjgzsj: "参加工作时间",
tozjdate: "到中建系统时间", tozjdate: "到建筑系统时间",
dzjbjsj: "到局时间", dzjbjsj: "到局时间",
dbdwsj: "到本单位时间", dbdwsj: "到本单位时间",
pimpersonid: "人员信息标识", pimpersonid: "人员信息标识",
......
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
cjgzsj: '参加工作时间', cjgzsj: '参加工作时间',
gwksrq: '岗位开始日期', gwksrq: '岗位开始日期',
orgsectorid: '部门ID', orgsectorid: '部门ID',
tozjdate: '到中建系统时间', tozjdate: '到建筑系统时间',
zjhm: '证件号码', zjhm: '证件号码',
pimpersonid: '人员信息标识', pimpersonid: '人员信息标识',
blacklistreasons: '黑名单原因', blacklistreasons: '黑名单原因',
...@@ -449,7 +449,7 @@ export default { ...@@ -449,7 +449,7 @@ export default {
gw: '岗位', gw: '岗位',
zj: '专家类型', zj: '专家类型',
cjgzsj: '参加工作时间', cjgzsj: '参加工作时间',
tozjdate: '到中建系统时间', tozjdate: '到建筑系统时间',
dzjbjsj: '到局时间', dzjbjsj: '到局时间',
dbdwsj: '到本单位时间', dbdwsj: '到本单位时间',
gzzt: '挂职状态', gzzt: '挂职状态',
...@@ -535,7 +535,7 @@ export default { ...@@ -535,7 +535,7 @@ export default {
postaladdress: '通讯地址', postaladdress: '通讯地址',
rdsj1: '入党时间', rdsj1: '入党时间',
rtsj: '入团时间', rtsj: '入团时间',
tozjdate: '到中建系统时间', tozjdate: '到建筑系统时间',
dzjbjsj: '到局时间', dzjbjsj: '到局时间',
rzqd: '入职渠道', rzqd: '入职渠道',
gzzt: '挂职状态', gzzt: '挂职状态',
...@@ -739,7 +739,7 @@ export default { ...@@ -739,7 +739,7 @@ export default {
rank: '职级', rank: '职级',
zj: '专家类型', zj: '专家类型',
cjgzsj: '参加工作时间', cjgzsj: '参加工作时间',
tozjdate: '到中建系统时间', tozjdate: '到建筑系统时间',
dzjbjsj: '到局时间', dzjbjsj: '到局时间',
dbdwsj: '到本单位时间', dbdwsj: '到本单位时间',
pimpersonid: '人员信息标识', pimpersonid: '人员信息标识',
......
...@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance(); ...@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
// 模拟数据 // 模拟数据
const mockDatas: Array<any> = [ const mockDatas: Array<any> = [
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 18:55:01","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 18:55:01","createman":"示例操作者","pimpersonname":null} {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-18 19:55:55","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-18 19:55:55","createman":"示例操作者","pimpersonname":null}
]; ];
......
...@@ -1046,10 +1046,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1046,10 +1046,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '专业技术资格(职称) 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '专业技术资格(职称) 值不能为空', trigger: 'blur' },
], ],
zjxtgznx: [ zjxtgznx: [
{ type: 'number', message: '中建系统工作年限 值必须为数值类型', trigger: 'change' }, { type: 'number', message: '建筑系统工作年限 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '中建系统工作年限 值必须为数值类型', trigger: 'blur' }, { type: 'number', message: '建筑系统工作年限 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '中建系统工作年限 值不能为空', trigger: 'change' }, { required: false, type: 'number', message: '建筑系统工作年限 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '中建系统工作年限 值不能为空', trigger: 'blur' }, { required: false, type: 'number', message: '建筑系统工作年限 值不能为空', trigger: 'blur' },
], ],
cjgzsj: [ cjgzsj: [
{ type: 'string', message: '参加工作时间 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '参加工作时间 值必须为字符串类型', trigger: 'change' },
...@@ -1058,10 +1058,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1058,10 +1058,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '参加工作时间 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '参加工作时间 值不能为空', trigger: 'blur' },
], ],
tozjdate: [ tozjdate: [
{ type: 'string', message: '中建系统工作时间 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '建筑系统工作时间 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '中建系统工作时间 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '建筑系统工作时间 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '中建系统工作时间 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '建筑系统工作时间 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '中建系统工作时间 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '建筑系统工作时间 值不能为空', trigger: 'blur' },
], ],
dbdwsj: [ dbdwsj: [
{ type: 'string', message: '本单位工作时间 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '本单位工作时间 值必须为字符串类型', trigger: 'change' },
...@@ -1308,11 +1308,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1308,11 +1308,11 @@ export default class MainBase extends Vue implements ControlInterface {
, ,
careername: new FormItemModel({ caption: '专业技术资格(职称)', detailType: 'FORMITEM', name: 'careername', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) careername: new FormItemModel({ caption: '专业技术资格(职称)', detailType: 'FORMITEM', name: 'careername', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
zjxtgznx: new FormItemModel({ caption: '中建系统工作年限', detailType: 'FORMITEM', name: 'zjxtgznx', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) zjxtgznx: new FormItemModel({ caption: '建筑系统工作年限', detailType: 'FORMITEM', name: 'zjxtgznx', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
cjgzsj: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'cjgzsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) cjgzsj: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'cjgzsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
tozjdate: new FormItemModel({ caption: '中建系统工作时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) tozjdate: new FormItemModel({ caption: '建筑系统工作时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
dbdwsj: new FormItemModel({ caption: '本单位工作时间', detailType: 'FORMITEM', name: 'dbdwsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) dbdwsj: new FormItemModel({ caption: '本单位工作时间', detailType: 'FORMITEM', name: 'dbdwsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
......
...@@ -1303,14 +1303,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1303,14 +1303,14 @@ export default class MainBase extends Vue implements ControlInterface {
}, },
{ {
name: 'tozjdate', name: 'tozjdate',
label: '中建系统工作时间', label: '建筑系统工作时间',
langtag: 'entities.pcmdetail.main_grid.columns.tozjdate', langtag: 'entities.pcmdetail.main_grid.columns.tozjdate',
show: true, show: true,
util: 'PX' util: 'PX'
}, },
{ {
name: 'zjxtgznx', name: 'zjxtgznx',
label: '中建系统工作年限', label: '建筑系统工作年限',
langtag: 'entities.pcmdetail.main_grid.columns.zjxtgznx', langtag: 'entities.pcmdetail.main_grid.columns.zjxtgznx',
show: true, show: true,
util: 'PX' util: 'PX'
......
...@@ -1150,10 +1150,10 @@ export default class ReadRYInfoFormBase extends Vue implements ControlInterface ...@@ -1150,10 +1150,10 @@ export default class ReadRYInfoFormBase extends Vue implements ControlInterface
{ required: false, type: 'string', message: '入团时间 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '入团时间 值不能为空', trigger: 'blur' },
], ],
tozjdate: [ tozjdate: [
{ type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'blur' },
], ],
dzjbjsj: [ dzjbjsj: [
{ type: 'string', message: '到局时间 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '到局时间 值必须为字符串类型', trigger: 'change' },
...@@ -1374,7 +1374,7 @@ export default class ReadRYInfoFormBase extends Vue implements ControlInterface ...@@ -1374,7 +1374,7 @@ export default class ReadRYInfoFormBase extends Vue implements ControlInterface
, ,
rtsj: new FormItemModel({ caption: '入团时间', detailType: 'FORMITEM', name: 'rtsj', visible: false, isShowCaption: true, form: this, disabled: false, enableCond: 0 }) rtsj: new FormItemModel({ caption: '入团时间', detailType: 'FORMITEM', name: 'rtsj', visible: false, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
, ,
tozjdate: new FormItemModel({ caption: '到中建系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 }) tozjdate: new FormItemModel({ caption: '到建筑系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
, ,
dzjbjsj: new FormItemModel({ caption: '到局时间', detailType: 'FORMITEM', name: 'dzjbjsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 }) dzjbjsj: new FormItemModel({ caption: '到局时间', detailType: 'FORMITEM', name: 'dzjbjsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
, ,
......
...@@ -1263,10 +1263,10 @@ export default class RYInfoFormBase extends Vue implements ControlInterface { ...@@ -1263,10 +1263,10 @@ export default class RYInfoFormBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '参加工作时间 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '参加工作时间 值不能为空', trigger: 'blur' },
], ],
tozjdate: [ tozjdate: [
{ type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '到中建系统时间 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '到建筑系统时间 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '到中建系统时间 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '到建筑系统时间 值不能为空', trigger: 'blur' },
], ],
dzjbjsj: [ dzjbjsj: [
{ type: 'string', message: '到局时间 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '到局时间 值必须为字符串类型', trigger: 'change' },
...@@ -1511,7 +1511,7 @@ export default class RYInfoFormBase extends Vue implements ControlInterface { ...@@ -1511,7 +1511,7 @@ export default class RYInfoFormBase extends Vue implements ControlInterface {
, ,
cjgzsj: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'cjgzsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) cjgzsj: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'cjgzsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
tozjdate: new FormItemModel({ caption: '到中建系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) tozjdate: new FormItemModel({ caption: '到建筑系统时间', detailType: 'FORMITEM', name: 'tozjdate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
dzjbjsj: new FormItemModel({ caption: '到局时间', detailType: 'FORMITEM', name: 'dzjbjsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) dzjbjsj: new FormItemModel({ caption: '到局时间', detailType: 'FORMITEM', name: 'dzjbjsj', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
......
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
git clone -b master $para2 ehr/ git clone -b master $para2 ehr/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ehr/ cd ehr/
mvn clean package -Pwebapi mvn clean package -Pehrpim
cd ehr-provider/ehr-provider-webapi cd ehr-app/ehr-app-ehrpim
mvn -Pwebapi docker:build mvn -Pehrpim docker:build
mvn -Pwebapi docker:push mvn -Pehrpim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-provider-webapi.yaml iBizEE --with-registry-auth docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-app-ehrpim.yaml iBizEE --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehr.jar /ehr-app-ehr.jar ADD ehr-app-ehr.jar /ehr-app-ehr.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehr: ehr-app-ehr:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrapp.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrapp.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrapp: ehr-app-ehrapp:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrhelp: ehr-app-ehrhelp:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrmob: ehr-app-ehrmob:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrorm: ehr-app-ehrorm:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrpcm: ehr-app-ehrpcm:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrpcm2: ehr-app-ehrpcm2:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrpim: ehr-app-ehrpim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrweb.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrweb.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-ehrweb: ehr-app-ehrweb:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-web.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-web.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-web.jar /ehr-app-web.jar ADD ehr-app-web.jar /ehr-app-web.jar
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ services:
ehr-app-web: ehr-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=6092
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-parttimeperson.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-parttimeperson.jar
EXPOSE 5080 EXPOSE 8081
ADD ehr-provider-parttimeperson.jar /ehr-provider-parttimeperson.jar ADD ehr-provider-parttimeperson.jar /ehr-provider-parttimeperson.jar
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
ehr-provider-parttimeperson: ehr-provider-parttimeperson:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-parttimeperson:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-parttimeperson:latest
ports: ports:
- "5080:5080" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-saasadmin.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-saasadmin.jar
EXPOSE 5080 EXPOSE 8081
ADD ehr-provider-saasadmin.jar /ehr-provider-saasadmin.jar ADD ehr-provider-saasadmin.jar /ehr-provider-saasadmin.jar
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
ehr-provider-saasadmin: ehr-provider-saasadmin:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-saasadmin:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-saasadmin:latest
ports: ports:
- "5080:5080" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-specialrole.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-specialrole.jar
EXPOSE 5080 EXPOSE 8081
ADD ehr-provider-specialrole.jar /ehr-provider-specialrole.jar ADD ehr-provider-specialrole.jar /ehr-provider-specialrole.jar
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
ehr-provider-specialrole: ehr-provider-specialrole:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-specialrole:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-specialrole:latest
ports: ports:
- "5080:5080" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-webapi.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-webapi.jar
EXPOSE 5080 EXPOSE 8081
ADD ehr-provider-webapi.jar /ehr-provider-webapi.jar ADD ehr-provider-webapi.jar /ehr-provider-webapi.jar
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
ehr-provider-webapi: ehr-provider-webapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-webapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-webapi:latest
ports: ports:
- "5080:5080" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-wfcallback.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-wfcallback.jar
EXPOSE 5080 EXPOSE 8081
ADD ehr-provider-wfcallback.jar /ehr-provider-wfcallback.jar ADD ehr-provider-wfcallback.jar /ehr-provider-wfcallback.jar
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
ehr-provider-wfcallback: ehr-provider-wfcallback:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-wfcallback:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-wfcallback:latest
ports: ports:
- "5080:5080" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=5080
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=BPMEHR
- SPRING_DATASOURCE_PASSWORD=sys
- SPRING_DATASOURCE_URL=jdbc:oracle:thin:@172.16.170.71:1521:localorcl
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=oracle.jdbc.driver.OracleDriver
- SPRING_DATASOURCE_DEFAULTSCHEMA=BPMEHR
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册