Skip to content

高东东-金蝶建发 / jf-yzj-resume

Go to a project
Commit 73bca1d7 by zhongqm
Options

update：迁移新模块-干部考核模块

parent 42b28f9a
Expand all
Inline Side-by-side
Showing with 186 additions and 42 deletions
src/assets/css/style.css
...@@ -222,6 +222,14 @@ span { ...@@ -222,6 +222,14 @@ span {
background: url('../images/base.svg') no-repeat; background: url('../images/base.svg') no-repeat;
} }
.item_header-img-cadre {
background: url('../images/cadre.svg') no-repeat;
}
.item_header-img-assess_new {
background: url('../images/assess_new.svg') no-repeat;
}
.item_header-img-assess { .item_header-img-assess {
background: url('../images/assess.svg') no-repeat; background: url('../images/assess.svg') no-repeat;
} }
...@@ -242,8 +250,8 @@ span { ...@@ -242,8 +250,8 @@ span {
background: url('../images/reward.svg') no-repeat; background: url('../images/reward.svg') no-repeat;
} }
.item__wrap+.item__header, .item__wrap + .item__header,
.item__content+.item__header { .item__content + .item__header {
margin-top: 10px; margin-top: 10px;
} }
...@@ -348,12 +356,30 @@ span { ...@@ -348,12 +356,30 @@ span {
padding-top: 2px; padding-top: 2px;
} }
.child_row_title_dot {
margin-right: 5px;
padding-left: 15px;
}
.item__content-note { .item__content-note {
right: 16px; right: 16px;
font-size: 14px; font-size: 14px;
color: #9B9B9B; color: #9B9B9B;
margin: 3px 0; margin: 3px 0;
line-height: 16px line-height: 16px;
display: flex;
}
.item__content-note.t-black {
color: #000000;
}
.text-left .item__content-note {
min-width: 44px;
text-align: left;
display: flex;
justify-content: flex-start;
} }
.wrap_content { .wrap_content {
...@@ -402,6 +428,18 @@ span { ...@@ -402,6 +428,18 @@ span {
-webkit-transform: translate3d(0, 0, 0) !important; -webkit-transform: translate3d(0, 0, 0) !important;
} }
.expand.fold_icon {
-webkit-transform: rotate(180deg);
transform: rotate(180deg);
}
.children_box.expand {
opacity: 1;
height: auto;
transform: translate3d(0, 0, 0) !important;
-webkit-transform: translate3d(0, 0, 0) !important;
}
.toast { .toast {
display: block; display: block;
position: fixed; position: fixed;
...@@ -607,18 +645,19 @@ span { ...@@ -607,18 +645,19 @@ span {
/* word-break: break-all;/* /* word-break: break-all;/*
word-wrap: break-word; */ word-wrap: break-word; */
} }
.ygjx_table tr td a { .ygjx_table tr td a {
text-decoration: none; text-decoration: none;
display: inline-block; display: inline-block;
width: 100%; width: 100%;
} }
.ygjx_table tr td a:link,
.ygjx_table tr td a:hover, .ygjx_table tr td a:link,
.ygjx_table tr td a:active, .ygjx_table tr td a:hover,
.ygjx_table tr td a:visited{ .ygjx_table tr td a:active,
color: inherit; .ygjx_table tr td a:visited {
color: inherit;
} }
.ygjx_table { .ygjx_table {
...@@ -649,7 +688,7 @@ span { ...@@ -649,7 +688,7 @@ span {
/* text-align: center; */ /* text-align: center; */
} }
.ygjx_table tr td:first-child>div { .ygjx_table tr td:first-child > div {
margin-left: 5px; margin-left: 5px;
} }
...@@ -784,7 +823,7 @@ span { ...@@ -784,7 +823,7 @@ span {
color: #333333; color: #333333;
} }
.modal__tab__view>ul li:last-child { .modal__tab__view > ul li:last-child {
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
} }
...@@ -870,7 +909,7 @@ span { ...@@ -870,7 +909,7 @@ span {
.modal__jl__view ul li ul li :first-child { .modal__jl__view ul li ul li :first-child {
font-weight: 500; font-weight: 500;
color: #000000; color: #000000;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
} }
...@@ -883,10 +922,10 @@ span { ...@@ -883,10 +922,10 @@ span {
display: none; display: none;
} }
.modal__cf__view>ul>li:first-child { .modal__cf__view > ul > li:first-child {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #000000; color: #000000;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
} }
...@@ -901,7 +940,7 @@ span { ...@@ -901,7 +940,7 @@ span {
.modal__cf__view ul li ul li :first-child { .modal__cf__view ul li ul li :first-child {
font-weight: 500; font-weight: 500;
color: #000000; color: #000000;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
} }
...@@ -918,7 +957,7 @@ span { ...@@ -918,7 +957,7 @@ span {
color: #FFFFFF; color: #FFFFFF;
font-size: 15px; font-size: 15px;
margin: 0 auto; margin: 0 auto;
margin-top: 10px; margin-top: 10px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
} }
...@@ -1014,7 +1053,7 @@ span { ...@@ -1014,7 +1053,7 @@ span {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
text-align: center; text-align: center;
font-weight: 500; font-weight: 500;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
} }
...@@ -1036,7 +1075,7 @@ span { ...@@ -1036,7 +1075,7 @@ span {
.tips__title { .tips__title {
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
} }
...@@ -1102,16 +1141,16 @@ span { ...@@ -1102,16 +1141,16 @@ span {
margin: 10px 0 6px 0; margin: 10px 0 6px 0;
} }
.rewardpunish__tiem>div:last-child { .rewardpunish__tiem > div:last-child {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #595757; color: #595757;
} }
.rewardpunish__tiem>div:first-child { .rewardpunish__tiem > div:first-child {
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
flex-grow: 1; flex-grow: 1;
margin-right: 10px; margin-right: 10px;
} }
...@@ -1162,4 +1201,72 @@ span { ...@@ -1162,4 +1201,72 @@ span {
background: url('../images/icon_liststyle.png') no-repeat center; background: url('../images/icon_liststyle.png') no-repeat center;
background-size: 10px; background-size: 10px;
margin-right: 6px; margin-right: 6px;
} }
.fold_icon {
width: 18px;
height: 16px;
background: url('../images/resume_more_2.png') no-repeat center;
background-size: 16px;
margin-left: 5px;
transition: transform .2s;
-webkit-transition: -webkit-transform .2s;
}
.children_box {
overflow: hidden;
transition: height 1s;
-webkit-transition: height 1s;
}
.drop {
font-weight: 900;
margin: 0 5px 0 10px;
}
.file_link, .ass_file_link,.a_link {
display: flex;
align-items: center;
color: #0101BF;
}
.file-icon {
width: 16px;
height: 16px;
margin-right: 2px;
}
.has-children{
position: relative;
overflow: hidden;
}
/*角标样式*/
.has-children:not(.no-show)::after{
content: '';
position: absolute;
right: -12px;
bottom: -12px;
width: 0;
height: 0;
border: 12px solid transparent;
border-bottom: 12px solid rgba(155,155,155,0.5);
transform: rotate(135deg);
}
/*箭头样式*/
/*.has-children:not(.no-show)::after{*/
/* content: '';*/
/* position: absolute;*/
/* right: 2px;*/
/* bottom: 2px;*/
/* width: 16px;*/
/* height: 16px;*/
/* background: url('../images/arrow-down.png') no-repeat center;*/
/* background-size: 16px;*/
/*}*/
/*.expand.has-children:not(.no-show)::after {*/
/* -webkit-transform: rotate(180deg);*/
/* transform: rotate(180deg);*/
/*}*/
src/assets/images/assess_new.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="20" viewBox="0 0 20 20"><defs><clipPath id="master_svg0_22_2104"><rect x="0" y="0" width="20" height="20" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_22_2104)"><g><g><path d="M10.46857,18.9909L1.947021,18.9909C1.423996,18.9909,1,18.5669,1,18.0439L1,1.947021C0.999999849082,1.423996,1.423996,1,1.947021,1.000000075459L16.149,1.000000075459C16.6721,1.000000150918,17.0961,1.423996,17.0961,1.947022L17.0961,7.38683C15.0416,5.64484,11.9735,5.85612,10.17722,7.86328C8.380939999999999,9.87044,8.51014,12.9431,10.46857,14.7924L10.46857,18.9909ZM2.89569,3.84106L2.89569,5.25871L15.2045,5.25871L15.2045,3.84106L2.89569,3.84106ZM2.89569,7.63245L2.89569,9.05009L8.577,9.05009L8.577,7.62997L2.89569,7.63245ZM2.89569,11.4238L2.89569,12.8439L6.68707,12.8439L6.68707,11.4156L2.89569,11.4238ZM12.3354,14.6786C10.31167,13.487,9.84701,10.76097,11.3617,8.96623C12.8764,7.17149,15.6418,7.17149,17.1565,8.96623C18.6712,10.76097,18.2066,13.487,16.1828,14.6786L17.0985,19L15.6628,19L14.255,17.5502L12.7994,19L11.4807,19L12.3338,14.6803L12.3354,14.6786ZM14.2583,13.3995C15.3053,13.3995,16.154,12.5507,16.154,11.5038C16.154,10.45682,15.3053,9.60809,14.2583,9.60809C13.2113,9.60809,12.3626,10.45682,12.3626,11.5038C12.3671,12.5466,13.213,13.3899,14.2558,13.3912L14.2583,13.3995Z" fill="#9B9B9B" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
src/assets/images/cadre.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="20" viewBox="0 0 20 20"><defs><clipPath id="master_svg0_22_0128"><rect x="0" y="0" width="20" height="20" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_22_0128)"><g><path d="M7.71335,6.33901C7.68653,7.89498,8.49022,9.347529999999999,9.82273,10.15138C11.1217,10.92738,12.7419,10.92738,14.0409,10.15138C15.3553,9.35918,16.156399999999998,7.93434,16.1503,6.39971C16.2158,4.0083400000000005,14.3096,2.0269562,11.9175,2C9.56102,2.0379286,7.67921,3.98041,7.71335,6.33901L7.71335,6.33901ZM7.59252,10.80916L7.59252,7.7532C7.56071,7.41305,7.26114,7.1618,6.92064,7.18969L1.6718769999999998,7.18969C1.311078,7.21338,1.0236906,7.50077,1,7.86157L1,18.0015L3.99636,18.0015C3.20582,14.6578,5.0421,12.4038,7.59307,10.80916L7.59252,10.80916ZM3.02649,8.95066L5.72266,8.95066C5.93482,8.95066,6.10682,9.12266,6.10682,9.33483C6.10682,9.546990000000001,5.93482,9.71899,5.72266,9.71899L3.02645,9.71899C2.80885,9.727070000000001,2.62804,9.55285,2.62804,9.3351C2.62804,9.11735,2.80885,8.94313,3.02645,8.95121L3.02649,8.95066ZM2.64229,10.64229C2.64229,10.53934,2.68238,10.44289,2.755,10.37082C2.8267100000000003,10.29868,2.92422,10.25812,3.02592,10.25812L5.72261,10.25812C5.93478,10.25812,6.10678,10.43011,6.10678,10.64228C6.10678,10.85445,5.93478,11.02645,5.72261,11.02645L3.02649,11.02645C2.8145800000000003,11.02584,2.6429400000000003,10.8542,2.64229,10.64229L2.64229,10.64229ZM14.5919,11.49298L13.0217,14.8605L12.4582,13.3986C12.5082,13.113,12.6232,12.8427,12.7941,12.6086C13.0217,12.0456,13.1301,11.81861,12.5671,11.48267C12.3155,11.34336,12.0181,11.31208,11.743,11.39598C11.4677,11.48016,11.2379,11.67152,11.1053,11.92697C10.87821,12.4905,11.4412,12.717,11.4412,13.0529C11.3605,13.6576,11.2483,14.2577,11.1052,14.8507C10.96272,15.444,11.1052,15.295,10.54227,14.1789C10.11618,13.2584,9.74421,12.3138,9.42825,11.34992C6.39616,12.3935,4.82594,14.4059,4.82594,17.3437C4.82594,18.4697,18.6455,19.0332,18.9814,16.671799999999998C19.3152,14.3094,15.0482,10.37895,14.5925,11.50489L14.5925,11.49298L14.5919,11.49298Z" fill="#9B9B9B" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
src/assets/images/pdf.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1702607158702" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4275" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M234.666667 469.333333h85.333333a85.333333 85.333333 0 0 1 85.333333 85.333334v21.333333a85.333333 85.333333 0 0 1-85.333333 85.333333h-42.666667v85.333334h-42.666666V469.333333z m448 170.666667v106.666667h-42.666667V469.333333h149.333333v42.666667h-106.666666v85.333333h85.333333v42.666667h-85.333333zM618.666667 85.333333l277.333333 277.333334v490.645333A85.205333 85.205333 0 0 1 810.88 938.666667H213.12A85.333333 85.333333 0 0 1 128 853.333333V170.666667c0-47.125333 38.165333-85.333333 85.12-85.333334H618.666667z m-0.448 277.504h217.493333L618.666667 145.664l-0.448 217.173333zM853.333333 853.333333V405.333333H618.496c-23.466667 0-42.496-19.072-42.496-42.496V128H213.12C189.738667 128 170.666667 147.093333 170.666667 170.666667v682.666666c0 23.530667 19.093333 42.666667 42.453333 42.666667h597.76c23.424 0 42.453333-19.093333 42.453333-42.688zM426.666667 469.333333h64a106.666667 106.666667 0 0 1 106.666666 106.666667v64a106.666667 106.666667 0 0 1-106.666666 106.666667h-64V469.333333z m42.666666 234.666667h21.333334a64 64 0 0 0 64-64v-64a64 64 0 0 0-64-64h-21.333334v192z m-192-192v106.666667h42.666667a42.666667 42.666667 0 0 0 42.666667-42.666667v-21.333333a42.666667 42.666667 0 0 0-42.666667-42.666667h-42.666667z" fill="#3D3D3D" p-id="4276"></path></svg>
\ No newline at end of file
src/config/common.js
...@@ -28,7 +28,7 @@ let config = { ...@@ -28,7 +28,7 @@ let config = {
wyResume: '/hrInterface/resumeBaseV.do', wyResume: '/hrInterface/resumeBaseV.do',
hcResume: '/hrInterface/resumeBaseV.do',//合诚 hcResume: '/hrInterface/resumeBaseV.do',//合诚
photo: 'imm-api/api/emp/getExtInfo', photo: 'imm-api/api/emp/getExtInfo',
file: 'hr.resume.attachmentInfoV',
}, },
renderType: RENDER_TYPE, renderType: RENDER_TYPE,
renderItem: { renderItem: {
...@@ -71,19 +71,32 @@ let config = { ...@@ -71,19 +71,32 @@ let config = {
note: ['jobstarttime', 'jobendtime'], note: ['jobstarttime', 'jobendtime'],
}, },
}, },
cadreEvaluationVoList: {
name: '干部考核',
type: RENDER_TYPE.G,
img: 'cadre',
list: {
title: 'year',
note: 'result',
chilkey: ['attachmentName', 'attachmentFile'],
children: 'attachmentArray',
},
},
//旧版 //旧版
assessVoList: { assessVoList: {
name: '绩效考核', name: '员工考核',
type: RENDER_TYPE.D, type: RENDER_TYPE.D,
img: 'assess', img: 'assess_new',
list: { list: {
title: 'assyear', title: 'assyear',
note: 'assgrade', note: 'assgrade',
chilkey: ['month', 'assgrade'],//根据原始数据自定义字段
children: 'months',//
}, },
}, },
// 新版 // 新版
// assessVoList: { // assessVoList: {
// name: '员工绩效', // name: '员工考核',
// type: RENDER_TYPE.D, // type: RENDER_TYPE.D,
// img: 'reward', // img: 'reward',
// list: { // list: {
......
src/config/prod.js
import common from './common'; import common from './common';
const isProduct = process.env.PACK_ENV === 'prod'
const config = { const config = {
product: true, product: true,
ssoToken: 'token', ssoToken: 'token',
baseUrl: 'https://jffcvp.cndrealty.com:4433/', //区分测试环境和正式环境
appkey: '781d2ec4' // 正式 baseUrl: isProduct ? 'https://jffcvp.cndrealty.com:4433/' : 'https://mxytest.cndrealty.com:4433/',
}; appkey: isProduct ? '781d2ec4' : 'd504275e', // 正式
// baseUrl: 'https://mxytest.cndrealty.com:4433/', //测试
// appkey: 'd504275e', // 测试
}
;
export default Object.assign(config, common); export default Object.assign(config, common);
src/config/test.js
...@@ -45,14 +45,25 @@ import common from './common'; ...@@ -45,14 +45,25 @@ import common from './common';
// appkey: 'd504275e', // appkey: 'd504275e',
// baseUrl: 'https://mxytest.cndrealty.com:4433/', // baseUrl: 'https://mxytest.cndrealty.com:4433/',
// }; // };
// const config = {
// product: false,
// ssoToken: 'token',
// userid: '46000011',
// appKey: 'd504275e',
// uid: 'zcm',
// token: 'T5579119180350464',
// baseUrl: 'https://mxytest.cndrealty.com:4433/',
// };
const config = { const config = {
product: false, product: false,
ssoToken: 'token', ssoToken: 'token',
userid: '46000011', userid: '46000011',
appKey: 'd504275e', // loginuserid: '10000360',
uid: 'zcm', loginuserid: '46000011',
token: 'T5579119180350464', appKey: 'd504275e',
baseUrl: 'https://mxytest.cndrealty.com:4433/', uid: 'hqhuang@cndrealty.com',
token,
baseUrl: 'https://mxytest.cndrealty.com:4433/',
}; };
export default Object.assign(config, common); export default Object.assign(config, common);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment