整体报告完善(部分）

src/views/career/bigdataSelectCourse/report.vue

@@ -1,15 +1,31 @@
 <template>
-  <div>
+  <div class="report">
     <p>{{nickName}}同学：</p>
     <p>您好!</p>
-    <div class="mb10">您所在的学校开设了
+    <div>您所在的学校开设了
       <span v-for="item in stepOne">，{{`${item.groupName}(${item.classCount}个班级)(${item.count})`}}</span>，
       <span>共计{{stepOne.length}}个组合。</span>
     </div>
-    <div>
-
+    <div v-for="(result,index) in allResult">
+      <template v-if="index <= allResult.findIndex(item => item.isEnroll)">
+        <!-- 已录取 -->
+        <div v-if="result.isEnroll">
+          您在{{ result.name }}时报选了<span class="f-primary">{{result.groupList.map(item=> item.groupName).toString(',')}}</span>组合
+          您在{{result.name}}阶段被 <span class="f-primary">{{result.groupList.filter(item => item.approved).map(item=> item.groupName).toString(',')}}</span>组合录取
+        </div>
+        <!--    未录取   -->
+        <div v-else>
+          <div>
+            您在{{ result.name }}时报选了<span class="f-red">{{result.groupList.map(item=> item.groupName).toString(',')}}</span> 组合
+            ，您在{{ result.name }}未被 <span class="f-red">{{result.groupList.map(item=> item.groupName).toString(',')}}</span> 组合录取
+          </div>
+          <div>
+            您在{{result.name}}未被录取,系统推荐您选报 <span class="f-primary">{{result.model.find(item => item.nextRecommend) ?  result.model.find(item => item.nextRecommend).groupName : ''}}</span> 组合
+          </div>
+        </div>
+      </template>
     </div>
-    <div class="mb10">
+    <div>
       选科完成后您将从原{{dispatchInfo.originalClassName}}班，重新分班至{{dispatchInfo.className}}班。
     </div>
   </div>
@@ -43,15 +59,43 @@ export default {
         }
       })
     },
-    // 初录
-
-    // 补录
+    allResult() {
+      let options = [
+        {
+          key:'primaryDM',
+          value:'初录报名'
+      },
+        { key:'backTrackingDM',
+          value:'补录报名'
+        },
+        { key:'finalAdjustDM',
+          value:'二次补录报名'
+        },
+        { key:'forceAdjust',
+          value:'调剂'
+        },]
+      return options.map(item => {
+        console.log(item)
+        let result = this.generation.models.find(i => i.generation ==  this.generation.options[item.key].value)
+        let name =  item.value
+        return {
+          groupList: result.selectedList,
+          isEnroll: result.selectedList.findIndex(i => i.approved) != -1,
+          name: name,
+          model:result.models
+        }
+      })
+    },
   },
   methods: {
 
   }
 }
 </script>
-<style>
-
+<style lang="scss" scoped>
+.report{
+  div{
+    margin-bottom: 10px;
+  }
+}
 </style>