protocol & middle menus

src/components/BottomP/index.vue

@@ -6,8 +6,10 @@
         <el-row style="margin:20px -10px;text-align:center;">
           <el-col :span="6">
             <img :src="logo_white" style="height: 92px;margin-bottom: 20px; ">
-            <!--<p><a href="###" style="color:#fff">隐私协议</a></p>-->
-            <span v-html="'\u00a0'"></span>
+            <p>
+              <el-link type="text" href="/protocol/mxjb_privacy.html" class="f-fff">隐私协议</el-link>
+              <el-link type="text" href="/protocol/mxjb_user.html" class="ml20 f-fff">用户协议</el-link>
+            </p>
           </el-col>
           <el-col :span="12">
             <p style="border-bottom:1px solid #fff;padding-bottom:15px;">
@@ -24,7 +26,7 @@
                                                                           target="_blank"
                                                                           style="color: #fff!important;">湘ICP备18012964号-2</a>
             </p>
-            <p style="margin-bottom:20px;">Copyright © 2020-2021 mingxuejinbang Inc. All rights reserved. 名学金榜 版权所有</p>
+            <p style="margin-bottom:20px;">Copyright © 2020-2022 mingxuejinbang Inc. All rights reserved. 名学金榜 版权所有</p>
             <!-- <img :src="star4" height="47px" alt=""> -->
           </el-col>
           <el-col :span="6">

src/components/TopNav/index.vue

@@ -41,7 +41,7 @@ export default {
   data() {
     return {
       // 顶部栏初始数
-      visibleNumber: 10
+      visibleNumber: 15
     }
   },
   computed: {
@@ -68,8 +68,9 @@ export default {
     },
     // 根据宽度计算设置显示栏数
     setVisibleNumber() {
-      const width = document.body.getBoundingClientRect().width / 2
-      this.visibleNumber = parseInt(width / 85)
+      // NOTE: 后端不会让这里菜单过多，暂时取消动态设置
+      // const width = document.body.getBoundingClientRect().width / 2
+      // this.visibleNumber = parseInt(width / 85)
     }
   }
 }

src/views/elective/report/components/elective-test-reports.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="fx-column" style="padding: 0 100px">
-    <index-card title="选科测评">
-      <test-result :all-test-results="testResults" :selected-majors="summary.selectedList" readonly></test-result>
-    </index-card>
-    <index-card v-for="test in testResults" :key="test.key" :title="test.title" class="elective-report-card mt20">
+  <div class="fx-column">
+    <index-card v-for="test in testResults" :key="test.key" :title="test.title" class="elective-report-card">
       <test-report :category="test.key" :source="test.result" readonly></test-report>
     </index-card>
+    <index-card title="选科测评专业" class="mt20">
+      <test-result :all-test-results="testResults" :selected-majors="summary.selectedList" readonly></test-result>
+    </index-card>
   </div>
 </template>
 
@@ -25,4 +25,8 @@ export default {
 .elective-report-card > /deep/ .el-card__body {
   padding: 0;
 }
+
+.elective-report-card + .elective-report-card {
+  margin-top: 20px;
+}
 </style>

src/views/elective/report/index.vue

@@ -1,22 +1,36 @@
 <template>
-  <div class="app-container">
-    <el-divider><h1>选科测评报告</h1></el-divider>
-    <elective-test-reports></elective-test-reports>
+  <div class="app-container fx-column fx-sta-cen">
+    <div class="elective-report-container">
+      <el-divider><h1>选科测评报告</h1></el-divider>
+      <elective-test-reports></elective-test-reports>
+      <el-divider><h1>选科大数据分析</h1></el-divider>
+      <group-subject-query></group-subject-query>
+      <el-divider><h1>自选专业</h1></el-divider>
+    </div>
   </div>
 </template>
 
 <script>
 
 import ElectiveTestReports from '@/views/elective/report/components/elective-test-reports'
+import GroupSubjectQuery from '@/views/permission/components/group-subject-query'
 
 export default {
   name: 'report-index',
-  components: { ElectiveTestReports },
+  components: { GroupSubjectQuery, ElectiveTestReports },
   data() {
-    return {}
+    // TODO: 报告应该与学年和轮次相关，先暂时渲染出最近的轮次数据
+    return {
+      year: '',
+      roundId: ''
+    }
   }
 }
 </script>
 
 <style scoped>
+.elective-report-container {
+  max-width: 1350px;
+  width: 80vw;
+}
 </style>