Skip to content

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

Go to a project
Commit 463d1e78 by zhongqm
Options

update：绩效采用旧版

parent b333714c
Inline Side-by-side
Showing with 186 additions and 70 deletions
src/js/index.js
...@@ -191,11 +191,12 @@ function mount() { ...@@ -191,11 +191,12 @@ function mount() {
.then(({ .then(({
data data
}) => { }) => {
console.log(555, data) console.log('restful>>',url, data)
render(data); render(data);
return data; return data;
}) })
.catch(e => {}); .catch(e => {});
// 获取头像
$mas.getData(configuration.baseUrl + configuration.methods.photo, { $mas.getData(configuration.baseUrl + configuration.methods.photo, {
uid: _uid, uid: _uid,
appKey, appKey,
...@@ -308,6 +309,7 @@ function render(data) { ...@@ -308,6 +309,7 @@ function render(data) {
} }
} }
break; break;
case '3': case '3':
var RENDER_ITEM = { var RENDER_ITEM = {
// 基础信息 // 基础信息
...@@ -324,8 +326,11 @@ function render(data) { ...@@ -324,8 +326,11 @@ function render(data) {
familyVoList: configuration.renderItem.familyVoList, familyVoList: configuration.renderItem.familyVoList,
// 绩效信息 // 绩效信息
assessVoList: configuration.renderItem.assessVoList, assessVoList: configuration.renderItem.assessVoList,
//奖惩
rewardPunishVoList: configuration.renderItem.rewardPunishVoList,
}; };
// showToast('房开人员'); console.log('房开人员',RENDER_ITEM)
// // showToast('房开人员');
for (let r in RENDER_ITEM) { for (let r in RENDER_ITEM) {
if (data[r]) { if (data[r]) {
//新版绩效 //新版绩效
...@@ -348,9 +353,20 @@ function render(data) { ...@@ -348,9 +353,20 @@ function render(data) {
if (!dataArr) { if (!dataArr) {
continue; continue;
} }
renderer(RENDER_ITEM[r], dataArr); renderer(RENDER_ITEM[r], dataArr);
} }
} }
// for (let r in RENDER_ITEM) {
// if (data[r]) {
// let dataArr = filter(r, data[r]);
// if (!dataArr) {
// continue;
// }
// // propertyRenderer(RENDER_ITEM[r], dataArr);
// // renderer(RENDER_ITEM[r], dataArr);
// }
// }
break; break;
default: default:
showToast(`#jobGradeType = ${jobGradeType}; 不明人员`); showToast(`#jobGradeType = ${jobGradeType}; 不明人员`);
...@@ -362,8 +378,6 @@ function render(data) { ...@@ -362,8 +378,6 @@ function render(data) {
function renderer(renderTemp, data) { function renderer(renderTemp, data) {
let type = renderTemp.type; let type = renderTemp.type;
// console.log('type',type)
console.log('renderer>>',{renderTemp, data});
container.appendChild(headerRenderer(renderTemp)); container.appendChild(headerRenderer(renderTemp));
switch (type) { switch (type) {
case RENDER_TYPE.A: case RENDER_TYPE.A:
...@@ -373,18 +387,20 @@ function renderer(renderTemp, data) { ...@@ -373,18 +387,20 @@ function renderer(renderTemp, data) {
container.appendChild(listBRenderer(renderTemp.list, data)); container.appendChild(listBRenderer(renderTemp.list, data));
break; break;
case RENDER_TYPE.C: case RENDER_TYPE.C:
container.appendChild(listCRenderer(renderTemp.list, data)); container.appendChild(listCRenderer(renderTemp.list, data));
break; break;
case RENDER_TYPE.D: case RENDER_TYPE.D:
container.appendChild(listDRenderer(renderTemp.list, data));//旧版绩效
container.appendChild(listDRenderer(renderTemp.list, data));
// container.appendChild(listJXRenderer(renderTemp.list, data));//新版绩效 // container.appendChild(listJXRenderer(renderTemp.list, data));//新版绩效
break; break;
case RENDER_TYPE.E: case RENDER_TYPE.E:
container.appendChild(listERenderer(renderTemp.list, data)); container.appendChild(listERenderer(renderTemp.list, data));
break; break;
// case RENDER_TYPE.F: case RENDER_TYPE.F:
// container.appendChild(listFRenderer(renderTemp.list, data)); container.appendChild(listFRenderer(renderTemp.list, data));
// break; break;
} }
...@@ -492,8 +508,8 @@ function listARenderer(list, data, extra = '') { ...@@ -492,8 +508,8 @@ function listARenderer(list, data, extra = '') {
if (name.indexOf('&') !== -1) { if (name.indexOf('&') !== -1) {
let names = name.split('&'); let names = name.split('&');
title = `${data[names[0]] || '未知'}-${ title = `${data[names[0]] || '未知'}-${
data[names[1]] || '未知' data[names[1]] || '未知'
}`; }`;
} else { } else {
title = data[name]; title = data[name];
} }
...@@ -532,15 +548,15 @@ function listBRenderer(list, data) { ...@@ -532,15 +548,15 @@ function listBRenderer(list, data) {
itemRenderer( itemRenderer(
`<p class="item__content-sub-title">${sub}</p>`, `<p class="item__content-sub-title">${sub}</p>`,
`<p class="item__content-note">${t1}至${nowOrNot( `<p class="item__content-note">${t1}至${nowOrNot(
t2 t2
)}</p>` )}</p>`
) + ) +
`</div>`; `</div>`;
} else { } else {
temp += itemRenderer( temp += itemRenderer(
`${ `${
item[list.title] item[list.title]
}<p class="item__content-sub-title">${sub}</p>`, }<p class="item__content-sub-title">${sub}</p>`,
`<p class="item__content-note">${item[note]}</p>` `<p class="item__content-note">${item[note]}</p>`
); );
} }
...@@ -553,6 +569,7 @@ function listBRenderer(list, data) { ...@@ -553,6 +569,7 @@ function listBRenderer(list, data) {
} }
function listCRenderer(list, data) { function listCRenderer(list, data) {
let temp = ``; let temp = ``;
if (data && data.length) { if (data && data.length) {
data.forEach((item, index) => { data.forEach((item, index) => {
...@@ -628,13 +645,13 @@ function listFRenderer(list, data) { ...@@ -628,13 +645,13 @@ function listFRenderer(list, data) {
data.forEach((item, index) => { data.forEach((item, index) => {
temp += itemRenderer( temp += itemRenderer(
`${ `${
item[list.title] item[list.title]
}<span style="float: right;padding-right:16px">${ }<span style="float: right;padding-right:16px">${
item[list.title1] item[list.title1]
}</span> }</span>
<p class="item__content-sub-title">${ <p class="item__content-sub-title">${
item[list.subTitle] item[list.subTitle]
}<span style="float: right;padding-right:12px">${ }<span style="float: right;padding-right:12px">${
item[list.subTitle1] item[list.subTitle1]
}年度</span></p>`, }年度</span></p>`,
'', '',
...@@ -1280,7 +1297,7 @@ function getGradeColor(grade) { ...@@ -1280,7 +1297,7 @@ function getGradeColor(grade) {
grade.indexOf('B') !== -1)) { grade.indexOf('B') !== -1)) {
textColor = 'grade__greed' textColor = 'grade__greed'
} else if (grade && } else if (grade &&
(grade.indexOf('优秀') !== -1 || (grade.indexOf('优秀') !== -1 ||
grade.indexOf('A') !== -1)) { grade.indexOf('A') !== -1)) {
textColor = 'grade__red' textColor = 'grade__red'
} }
...@@ -1905,47 +1922,85 @@ function listenerChange(target, clickNode, i) { ...@@ -1905,47 +1922,85 @@ function listenerChange(target, clickNode, i) {
} }
function listDRenderer(list, data) { function listDRenderer(list, data) {
console.log(111, data) console.log('绩效', {list,data})
//旧版绩效
let temp = ``; let temp = ``;
if (data && data.length) { if (data && data.length) {
data.forEach((item, index) => { data.forEach((item, index) => {
temp += let sub = '';
`<div> let note = list.note;
<div class="frist-row flex-between"> // console.log('propertyListDRenderer',list);
<div class="flex-row"> if (list.subTitle) {
${item.children.length>0? `<div class="icon_img ${index==0?'icon_02_img':'icon_01_img'}"></div>`:''} list.subTitle.forEach((s, i) => {
<div>${item.assyear}</div> sub += (i && '|') || '';
</div> sub += item[s] || '无';
<div>${item.assgrade}</div> });
</div>` }
temp += `<div class="second-box ${index==0?'box-block':'box-none'}">` if (note instanceof Object && note.length) {
item.children && item.children.forEach((item1) => { let t1 = data[index][list.note[0]];
temp += let t2 = data[index][list.note[1]];
`<div class="second-row flex-between"> temp += itemRenderer(
<div class="flex-start"> `${
<div class="title-text">${item1.asstype}</div> item[list.title]
</div> }<p class="item__content-sub-title">${sub}</p>`,
<div>${item1.assgrade}</div> `<span class="item__content-note">${t1}至${nowOrNot(
</div>` t2
// item1.children&&item1.children.forEach((item2)=>{ )}</span>`
// temp += );
// `<div class="third-row flex-between"> } else {
// <div class="flex-start"> temp += itemRenderer(
// <div class="title-text"><span class="dot-icon">·</span>${item2[list.title]}</div> `${item[list.title]}年`,
// </div> `<span class="item__content-note">${item[note]}</span>`
// <div>${item2[list.note]}</div> );
// </div>` }
// })
})
temp += `</div>`
temp += `</div>`
}); });
} else { } else {
temp = noDataRenderer(); temp = noDataRenderer();
} }
console.log(646)
return renderWrap(temp, data.length > 3); return renderWrap(temp, data.length > 3);
// 新版
// let temp = ``;
// if (data && data.length) {
// data.forEach((item, index) => {
// temp +=
// `<div>
// <div class="frist-row flex-between">
// <div class="flex-row">
// ${item.children.length>0? `<div class="icon_img ${index==0?'icon_02_img':'icon_01_img'}"></div>`:''}
// <div>${item.assyear}</div>
// </div>
// <div>${item.assgrade}</div>
// </div>`
// temp += `<div class="second-box ${index==0?'box-block':'box-none'}">`
// item.children && item.children.forEach((item1) => {
// temp +=
// `<div class="second-row flex-between">
// <div class="flex-start">
// <div class="title-text">${item1.asstype}</div>
// </div>
// <div>${item1.assgrade}</div>
// </div>`
// // item1.children&&item1.children.forEach((item2)=>{
// // temp +=
// // `<div class="third-row flex-between">
// // <div class="flex-start">
// // <div class="title-text"><span class="dot-icon">·</span>${item2[list.title]}</div>
// // </div>
// // <div>${item2[list.note]}</div>
// // </div>`
// // })
// })
// temp += `</div>`
// temp += `</div>`
//
// });
// } else {
// temp = noDataRenderer();
// }
//
// return renderWrap(temp, data.length > 3);
} }
// 物业 // 物业
...@@ -1959,8 +2014,8 @@ function propertyListARenderer(list, data, extra = '') { ...@@ -1959,8 +2014,8 @@ function propertyListARenderer(list, data, extra = '') {
if (name.indexOf('&') !== -1) { if (name.indexOf('&') !== -1) {
let names = name.split('&'); let names = name.split('&');
title = `${data[names[0]] || '未知'}-${ title = `${data[names[0]] || '未知'}-${
data[names[1]] || '未知' data[names[1]] || '未知'
}`; }`;
} else { } else {
title = data[name]; title = data[name];
} }
...@@ -2002,15 +2057,15 @@ function propertyListBRenderer(list, data) { ...@@ -2002,15 +2057,15 @@ function propertyListBRenderer(list, data) {
propertyItemRenderer( propertyItemRenderer(
`<p class="item__content-sub-title">${sub}</p>`, `<p class="item__content-sub-title">${sub}</p>`,
`<p class="item__content-note">${t1}至${nowOrNot( `<p class="item__content-note">${t1}至${nowOrNot(
t2 t2
)}</p>` )}</p>`
) + ) +
`</div>`; `</div>`;
} else { } else {
temp += propertyItemRenderer( temp += propertyItemRenderer(
`${ `${
item[list.title] item[list.title]
}<p class="item__content-sub-title">${sub}</p>`, }<p class="item__content-sub-title">${sub}</p>`,
`<p class="item__content-note">${item[note]}</p>` `<p class="item__content-note">${item[note]}</p>`
); );
} }
...@@ -2067,12 +2122,13 @@ function propertyListCRenderer(list, data) { ...@@ -2067,12 +2122,13 @@ function propertyListCRenderer(list, data) {
} }
function propertyListDRenderer(list, data) { function propertyListDRenderer(list, data) {
// console.log('奇怪的',data,list)
let temp = ``; let temp = ``;
if (data && data.length) { if (data && data.length) {
data.forEach((item, index) => { data.forEach((item, index) => {
let sub = ''; let sub = '';
let note = list.note; let note = list.note;
// console.log(list); // console.log('propertyListDRenderer',list);
if (list.subTitle) { if (list.subTitle) {
list.subTitle.forEach((s, i) => { list.subTitle.forEach((s, i) => {
sub += (i && '|') || ''; sub += (i && '|') || '';
...@@ -2084,11 +2140,11 @@ function propertyListDRenderer(list, data) { ...@@ -2084,11 +2140,11 @@ function propertyListDRenderer(list, data) {
let t2 = data[index][list.note[1]]; let t2 = data[index][list.note[1]];
temp += propertyItemRenderer( temp += propertyItemRenderer(
`${ `${
item[list.title] item[list.title]
}<p class="item__content-sub-title">${sub}</p>`, }<p class="item__content-sub-title">${sub}</p>`,
`<span class="item__content-note">${t1}至${nowOrNot( `<span class="item__content-note">${t1}至${nowOrNot(
t2 t2
)}</span>` )}</span>`
); );
} else { } else {
temp += propertyItemRenderer( temp += propertyItemRenderer(
...@@ -2136,13 +2192,13 @@ function propertyListFRenderer(list, data) { ...@@ -2136,13 +2192,13 @@ function propertyListFRenderer(list, data) {
data.forEach((item, index) => { data.forEach((item, index) => {
temp += propertyItemRenderer( temp += propertyItemRenderer(
`${ `${
item[list.title] item[list.title]
}<span style="float: right;padding-right:16px">${ }<span style="float: right;padding-right:16px">${
item[list.title1] item[list.title1]
}</span> }</span>
<p class="item__content-sub-title">${ <p class="item__content-sub-title">${
item[list.subTitle] item[list.subTitle]
}<span style="float: right;padding-right:12px">${ }<span style="float: right;padding-right:12px">${
item[list.subTitle1] item[list.subTitle1]
}年度</span></p>`, }年度</span></p>`,
'', '',
...@@ -2250,7 +2306,26 @@ function getDateFormat(date) { ...@@ -2250,7 +2306,26 @@ function getDateFormat(date) {
// let month = now.getMonth(); // 得到月份 // let month = now.getMonth(); // 得到月份
// let date = now.getDate(); // 得到日期 // let date = now.getDate(); // 得到日期
} }
//新版
// function filter(item, data) {
// let assessData = data;
// // 处理绩效异常
// if (item === 'assessVoList') {
// if (data.length === 0) {
// assessData = '';
// } else {
// for (let i = 0; i < assessData.length; i++) {
// if (!assessData[i].assgrade) {
// assessData = '';
// break;
// }
// }
// }
// }
// return assessData;
// }
//旧版
function filter(item, data) { function filter(item, data) {
let assessData = data; let assessData = data;
// 处理绩效异常 // 处理绩效异常
...@@ -2264,8 +2339,51 @@ function filter(item, data) { ...@@ -2264,8 +2339,51 @@ function filter(item, data) {
break; break;
} }
} }
let templist=[]
let sumList=[]
for (let i = 0; i < data.length; i++) {
const index = templist.indexOf(data[i].assyear)
let _assyear = data[i].asstype
// if(data[i].asstype==="半年度"){
// if(data[i].assendtime.substring(5,10)==="06-30"){
// _assyear='上半年度'
// }
// } else if(data[i].asstype==="月度"){
// if(data[i].assendtime.substring(5,10)==="01-31"){
// _assyear='1月'
// }
// } else if(data[i].asstype==="季度"){
// if(data[i].assendtime.substring(5,10)==="03-31"){
// _assyear='第一季度'
// }
// }
// if (index < 0) { //不存在
// templist.push(data[i].assyear)
// if(data[i].asstype==="年度"){
// sumList.push({ assyear: data[i].assyear,assgrade:data[i].assgrade, children: [] })
// }else {
// sumList.push({ assyear: _assyear,assgrade:data[i].assgrade, children: [{...data[i],asstype: _assyear}] })
//
// }
//
// } else {
// if(data[i].asstype==="年度"){
// sumList[index].assgrade=data[i].assgrade
// sumList[index].assyear=data[i].assyear
// } else {
// sumList[index].children.push({...data[i],asstype: _assyear})
// }
// }
}
// assessData = sumList
} }
assessData= data.filter(i=>i.asstype==='年度')
console.log(3333,assessData)
} }
return assessData; return assessData;
} }
...@@ -2414,6 +2532,4 @@ function createIScroller() { ...@@ -2414,6 +2532,4 @@ function createIScroller() {
} }
// return scroller; // return scroller;
console.log('xxxxx');
} }
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