u: 新增考核结果卡片

src/config/common.js

@@ -71,16 +71,26 @@ let config = {
         note: ['jobstarttime', 'jobendtime'],
         note: ['jobstarttime', 'jobendtime'],
       },
       },
     },
     },
-    mVoList: {
-      name: '干部考核',
-      type: RENDER_TYPE.G,
-      img: 'cadre',
-      list: {
+
+    mergeCheckResult:{
+      name: '考核结果',
+      type: RENDER_TYPE.H,
+      img: 'assess_new',//标题图标
+      list:{
+        cadreEvaluationVoListConfig:{
           title: 'year',
           title: 'year',
           note: 'result',
           note: 'result',
           chilkey: ['attachmentName', 'attachmentFile'],
           chilkey: ['attachmentName', 'attachmentFile'],
           children: 'attachmentArray',
           children: 'attachmentArray',
         },
         },
+        assessVoListConfig:{
+          title: 'assyear',
+          note: 'assgrade',
+          chilkey: ['month', 'assgrade'],//根据原始数据自定义字段
+          children: 'months',//
+        }
+      }
+
     },
     },
     cadreEvaluationVoList: {
     cadreEvaluationVoList: {
       name: '干部考核',
       name: '干部考核',

src/config/prod.js

@@ -8,9 +8,6 @@ const config = {
     //区分测试环境和正式环境
     //区分测试环境和正式环境
     baseUrl: isProduct ? 'https://portal.cndrealty.com/' : 'https://staging.jffctest.com/',
     baseUrl: isProduct ? 'https://portal.cndrealty.com/' : 'https://staging.jffctest.com/',
     appkey: isProduct ? '781d2ec4' : 'd504275e', // 正式
     appkey: isProduct ? '781d2ec4' : 'd504275e', // 正式
-
-    // baseUrl: 'https://mxytest.cndrealty.com:4433/', //测试
-    // appkey: 'd504275e', // 测试
   }
   }
 ;
 ;
 
 

src/config/test.js

@@ -62,7 +62,7 @@ const config = {
   loginuserid: '46000011',
   loginuserid: '46000011',
   appkey: 'd504275e',
   appkey: 'd504275e',
   uid: 'hqhuang@cndrealty.com',
   uid: 'hqhuang@cndrealty.com',
-  token:'yzj_199aa82fe0a735a740f446f4d1929e03',
+  token:'yzj_01d213c5453c8b0605811adebdf57836',
   baseUrl: 'https://staging.jffctest.com/',
   baseUrl: 'https://staging.jffctest.com/',
 };
 };