update：绩效采用旧版

src/js/index.js

@@ -191,11 +191,12 @@ function mount() {
     .then(({
       data
     }) => {
-      console.log(555, data)
+      console.log('restful>>',url, data)
       render(data);
       return data;
     })
     .catch(e => {});
+  // 获取头像
   $mas.getData(configuration.baseUrl + configuration.methods.photo, {
       uid: _uid,
       appKey,
@@ -308,6 +309,7 @@ function render(data) {
         }
       }
       break;
+
     case '3':
       var RENDER_ITEM = {
         // 基础信息
@@ -324,8 +326,11 @@ function render(data) {
         familyVoList: configuration.renderItem.familyVoList,
         // 绩效信息
         assessVoList: configuration.renderItem.assessVoList,
+//奖惩
+        rewardPunishVoList: configuration.renderItem.rewardPunishVoList,
       };
-      // showToast('房开人员');
+      console.log('房开人员',RENDER_ITEM)
+      // // showToast('房开人员');
       for (let r in RENDER_ITEM) {
         if (data[r]) {
           //新版绩效
@@ -348,9 +353,20 @@ function render(data) {
           if (!dataArr) {
             continue;
           }
+
           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;
     default:
       showToast(`#jobGradeType = ${jobGradeType}; 不明人员`);
@@ -362,8 +378,6 @@ function render(data) {
 
 function renderer(renderTemp, data) {
   let type = renderTemp.type;
-  // console.log('type',type)
-  console.log('renderer>>',{renderTemp, data});
   container.appendChild(headerRenderer(renderTemp));
   switch (type) {
     case RENDER_TYPE.A:
@@ -373,18 +387,20 @@ function renderer(renderTemp, data) {
       container.appendChild(listBRenderer(renderTemp.list, data));
       break;
     case RENDER_TYPE.C:
+
       container.appendChild(listCRenderer(renderTemp.list, data));
       break;
     case RENDER_TYPE.D:
-      container.appendChild(listDRenderer(renderTemp.list, data));//旧版绩效
+
+      container.appendChild(listDRenderer(renderTemp.list, data));
       // container.appendChild(listJXRenderer(renderTemp.list, data));//新版绩效
       break;
     case RENDER_TYPE.E:
       container.appendChild(listERenderer(renderTemp.list, data));
       break;
-    // case RENDER_TYPE.F:
-    //     container.appendChild(listFRenderer(renderTemp.list, data));
-    //     break;
+    case RENDER_TYPE.F:
+      container.appendChild(listFRenderer(renderTemp.list, data));
+      break;
 
   }
 
@@ -553,6 +569,7 @@ function listBRenderer(list, data) {
 }
 
 function listCRenderer(list, data) {
+
   let temp = ``;
   if (data && data.length) {
     data.forEach((item, index) => {
@@ -1905,47 +1922,85 @@ function listenerChange(target, clickNode, i) {
 }
 
 function listDRenderer(list, data) {
-  console.log(111, data)
+  console.log('绩效', {list,data})
+//旧版绩效
   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>`
-
+      let sub = '';
+      let note = list.note;
+      // console.log('propertyListDRenderer',list);
+      if (list.subTitle) {
+        list.subTitle.forEach((s, i) => {
+          sub += (i && '|') || '';
+          sub += item[s] || '无';
+        });
+      }
+      if (note instanceof Object && note.length) {
+        let t1 = data[index][list.note[0]];
+        let t2 = data[index][list.note[1]];
+        temp += itemRenderer(
+          `${
+            item[list.title]
+          }<p class="item__content-sub-title">${sub}</p>`,
+          `<span class="item__content-note">${t1}至${nowOrNot(
+            t2
+          )}</span>`
+        );
+      } else {
+        temp += itemRenderer(
+          `${item[list.title]}年`,
+          `<span class="item__content-note">${item[note]}</span>`
+        );
+      }
     });
   } else {
     temp = noDataRenderer();
   }
-  console.log(646)
+
   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);
 }
 
 // 物业
@@ -2067,12 +2122,13 @@ function propertyListCRenderer(list, data) {
 }
 
 function propertyListDRenderer(list, data) {
+  // console.log('奇怪的',data,list)
   let temp = ``;
   if (data && data.length) {
     data.forEach((item, index) => {
       let sub = '';
       let note = list.note;
-      // console.log(list);
+      // console.log('propertyListDRenderer',list);
       if (list.subTitle) {
         list.subTitle.forEach((s, i) => {
           sub += (i && '|') || '';
@@ -2250,7 +2306,26 @@ function getDateFormat(date) {
   //   let month = now.getMonth(); // 得到月份
   //   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) {
   let assessData = data;
   // 处理绩效异常
@@ -2264,8 +2339,51 @@ function filter(item, data) {
           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;
 }
 
@@ -2414,6 +2532,4 @@ function createIScroller() {
   }
 
   // return scroller;
-
-  console.log('xxxxx');
 }