修改导航

src/App.vue

@@ -18,7 +18,7 @@ export default {
     },
     methods: {
         SubmitLogin() {
-            const username = '99689820198805';
+            const username = '376050cy_xiyanzuo_6';
             const password = '123456';
             // const type = '1';
             const schoolType = sessionStorage.getItem('schoolType');

src/views/analysisReport/studentPage/downloadPdf/studentReport.vue

@@ -60,9 +60,12 @@
                                                     * 3-得分显示对错，小题分显示分数,4-得分显示对错，小题分显示对错
                                                     * 5-得分显示等级，小题分显示分数,6-得分显示等级，小题分显示对错 -->
                                                     <template v-if="multiSubjectData.studentOpenness == 3 || multiSubjectData.studentOpenness == 4">
-                                                    <img class="right_or_wrong_icon" v-if="scope.row.fullScore == scope.row?.[header.prop]" src="@/assets/report/score_yes_icon.webp" />
-                                                    <img class="right_or_wrong_icon" v-else-if="scope.row?.[header.prop] == 0" src="@/assets/report/score_no_icon.webp" />
-                                                    <img class="right_or_wrong_icon" v-else src="@/assets/report/score_dimidiate_icon.webp" />
+                                                        <template v-if="!isNaN(scope.row?.[header.prop])">
+                                                            <img class="right_or_wrong_icon" v-if="scope.row.fullScore == scope.row?.[header.prop]" src="@/assets/report/score_yes_icon.webp" />
+                                                            <img class="right_or_wrong_icon" v-else-if="scope.row?.[header.prop] == 0" src="@/assets/report/score_no_icon.webp" />
+                                                            <img class="right_or_wrong_icon" v-else src="@/assets/report/score_dimidiate_icon.webp" />
+                                                        </template>
+                                                        <template v-else>{{ scope.row?.[header.prop] ?? '-' }}</template>
                                                     </template>
                                                     <template v-else>{{ scope.row?.[header.prop] || '-' }}</template>
                                                 </template>

src/views/analysisReport/studentPage/scrolReport/transcript_total.vue

@@ -34,9 +34,12 @@
                 * 3-得分显示对错，小题分显示分数,4-得分显示对错，小题分显示对错
                 * 5-得分显示等级，小题分显示分数,6-得分显示等级，小题分显示对错 -->
                 <template v-if="subjectData.studentOpenness == 3 || subjectData.studentOpenness == 4">
-                  <img v-if="scope.row.fullScore == scope.row?.[title.prop]" src="@/assets/stuIcon/icon_right.png" />
-                  <img v-else-if="scope.row?.[title.prop] == 0" src="@/assets/stuIcon/icon_error.png" />
-                  <img v-else src="@/assets/stuIcon/icon_half_right.png" />
+                  <template v-if="!isNaN(scope.row?.[title.prop])">
+                    <img v-if="scope.row.fullScore == scope.row?.[title.prop]" src="@/assets/stuIcon/icon_right.png" />
+                    <img v-else-if="scope.row?.[title.prop] == 0" src="@/assets/stuIcon/icon_error.png" />
+                    <img v-else src="@/assets/stuIcon/icon_half_right.png" />
+                  </template>
+                  <template v-else>{{ scope.row?.[title.prop] ?? '-' }}</template>
                 </template>
                 <template v-else>{{ scope.row?.[title.prop] || '-' }}</template>
               </template>

src/views/layout/components/Header.vue

@@ -112,7 +112,7 @@
               :index="item.externalLink"
               v-for="(item, index) in menuList"
               :key="index"
-              >{{ item.menuName }}</el-menu-item
+              ><span class="menuName">{{ item.menuName }}</span><div class="versions" v-if="item.versions"><span>V</span><span>{{ item.versions }}</span></div></el-menu-item
             >
           </el-menu>
         </div>
@@ -200,18 +200,20 @@ export default {
 
     //学生端默认 个人中心 和分析报告两个菜单
     this.menuList = [
-     
       {
         menuName: "分析报告",
-        externalLink: "/jointStudentAnalysisReport/list",
+        externalLink: "/studentAnalysisReport/list",
+        versions:'8.0'
       },
       {
-        menuName: "校考分析报告",
-        externalLink: "/studentAnalysisReport/list",
+        menuName: "分析报告",
+        externalLink: "/jointStudentAnalysisReport/list",
+        versions:'8.1'
       },
       {
         menuName: "个人中心",
         externalLink: "/userInfo",
+        versions:''
       },
     ];
     
@@ -374,7 +376,7 @@ export default {
 <style lang="scss" scoped>
 .header {
   width: 100%;
-  height: 60px;
+  height: 64px;
   font-size: 22px;
   color: #fff;
   box-sizing: border-box;
@@ -388,7 +390,7 @@ export default {
 .headerBox {
   // margin: 0 auto;
   box-sizing: border-box;
-  height: 60px;
+  height: 64px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -434,14 +436,46 @@ export default {
     display: flex;
   }
   .el-menu-wrap {
-    height: 60px;
+    height: 64px;
     li {
       font-size: 18px;
       border-bottom: 0;
+      padding: 0 60px 0 20px;
+      line-height: 64px;
+      height: 60px;
+      position: relative;
       &.is-active {
         font-weight: bold;
         background-color: rgba(0, 0, 0, 0.2) !important;
       }
+      .versions{
+        position: absolute;
+        right: 24px;
+        top:8px;
+        width: 34px;
+        height: 18px;
+        border-radius: 25px;
+        border: 1px solid #FFFFFF;
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+        span{
+          display: inline-flex;
+          justify-content: center;
+          align-items: center;
+          box-sizing: border-box;
+          line-height: normal;
+          transform: scale(0.9);
+          &:first-child{
+            font-size: 12px;
+            margin-right: 2px;
+            line-height: 12px;
+          }
+          &:nth-child(2){
+            font-size: 12px;
+          }
+        }
+      }
     }
   }
   .userName {