Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/App.vue

@@ -242,18 +242,30 @@
     margin-top: 15px;
     margin-bottom: 20px;
     div{
-      width: 110px;
+      // width: 110px;
       cursor: pointer;
       font-weight: 550;
       font-size: 18px;
+      margin-right: 20px;
+      position: relative;
     }
-    .pr1TitBass{
-        margin-top: 2px;
-        height: 4px;
-        border-radius: 2px;
-        width: 100%;
-        background: #2a7ea9;
-      }
+    .AppBarActive::after{
+      content: "";
+      position: absolute;
+      width: 100%;
+      height: 4px;
+      left: 0;
+      top: 25px;
+      border-radius: 2px;
+      background: #2a7ea9;
+    }
+    // .pr1TitBass{
+    //     margin-top: 2px;
+    //     height: 4px;
+    //     border-radius: 2px;
+    //     width: 100%;
+    //     background: #2a7ea9;
+    //   }
   }
 
   .addMoneyBtn{     //自定义写的的添加框

src/views/ProjectManagement1.vue

@@ -12,10 +12,7 @@
 
   <!-- 跳转导航开始 -->
   <div class="AppBar">
-      <div>
-        <div @click="content">项目基本内容</div>
-        <div class="pr1TitBass"></div>
-      </div>
+      <div @click="content" class="AppBarActive">项目基本内容</div>
       <div @click="remark">项目详情</div>
       <div @click="remark2">活动开展</div>
       <div @click="remark4">项目附件</div>

src/views/ProjectManagement2.vue

@@ -13,10 +13,7 @@
     <!-- 跳转导航开始 -->
     <div class="AppBar">
       <div @click="content">项目基本内容</div>
-      <div>
-        <div @click="remark">项目详情</div>
-        <div class="pr1TitBass"></div>
-      </div>
+      <div @click="remark" class="AppBarActive">项目详情</div>
       <div @click="remark2">活动开展</div>
       <div @click="remark4">项目附件</div>
       <div @click="remark5">项目结题附件</div>

src/views/ProjectManagement3.vue

@@ -14,10 +14,7 @@
       <div class="AppBar">
         <div @click="content">项目基本内容</div>
         <div @click="remark">项目详情</div>
-        <div>
-          <div @click="remark2">活动开展</div>
-          <div class="pr1TitBass"></div>
-        </div>
+        <div @click="remark2" class="AppBarActive">活动开展</div>
         <div @click="remark4">项目附件</div>
         <div @click="remark5">项目结题附件</div>
       </div>

src/views/ProjectManagement3_1.vue

@@ -12,10 +12,7 @@
          <div class="AppBar" style="position: relative;">
             <div @click="content">项目基本内容</div>
             <div @click="remark">项目详情</div>
-            <div>
-              <div @click="remark2">活动开展</div>
-              <div class="pr1TitBass"></div>
-            </div>
+            <div @click="remark2" class="AppBarActive">活动开展</div>
             <div @click="remark4">项目附件</div>
             <div @click="remark5">项目结题附件</div>
             <el-button type="primary" style="position: absolute;right: 15%;top: -5px; width: 90px;font-size: 16px;" 

src/views/ProjectManagement4.vue

@@ -14,10 +14,7 @@
         <div @click="content">项目基本内容</div>
         <div @click="remark">项目详情</div>
         <div @click="remark2">活动开展</div>
-        <div>
-          <div>项目附件</div>
-          <div class="pr1TitBass"></div>
-        </div>
+        <div class="AppBarActive">项目附件</div>
         <div @click="remark5">项目结题附件</div>
       </div>
       <!-- 跳转导航结束 -->

src/views/ProjectManagement5.vue

@@ -15,10 +15,7 @@
         <div @click="remark">项目详情</div>
         <div @click="remark2">活动开展</div>
         <div @click="remark4">项目附件</div>
-        <div>
-          <div @click="remark5">项目结题附件</div>
-          <div class="pr1TitBass"></div>
-        </div>
+        <div @click="remark5" class="AppBarActive">项目结题附件</div>
       </div>
       <!-- 跳转导航结束 -->
       <div class="pmInp">

src/views/ProjectManagementFund1.vue

@@ -9,11 +9,8 @@
 
           <!-- 跳转导航开始 -->
           <div class="AppBar">
-              <div class="newWidth">
-                <div @click="content" style="width: 100%;">项目资金使用详情</div>
-                <div class="pr1TitBass"></div>
-              </div>
-              <div @click="remark" class="newWidth">资金申报明细</div>
+              <div @click="content" class="AppBarActive">项目资金使用详情</div>
+              <div @click="remark">资金申报明细</div>
           </div>
 
           <!-- 三个输入框开始 -->

src/views/ProjectManagementFund2.vue

@@ -8,11 +8,8 @@
           <hr>
          <!-- 跳转导航开始 -->
          <div class="AppBar">
-              <div class="newWidth" @click="content">项目资金使用详情</div>
-              <div class="newWidth">
-                <div @click="remark" style="width: 100%;">资金申报明细</div>
-                <div class="pr1TitBass"></div>
-              </div>
+              <div @click="content">项目资金使用详情</div>
+              <div @click="remark" class="AppBarActive">资金申报明细</div>
           </div>
           <!-- 跳转导航结束 -->
               

src/views/projectApplication2.vue

@@ -13,10 +13,7 @@
           <!-- 跳转导航开始 -->
           <div class="AppBar">
               <div @click="content">项目基本内容</div>
-            <div>
-              <div @click="remark">项目详情</div>
-              <div class="pr1TitBass"></div>
-            </div>
+              <div @click="remark" class="AppBarActive">项目详情</div>
           </div>
           <!-- 跳转导航结束 -->
 

src/views/projectApplicationDetails.vue

@@ -13,10 +13,7 @@
     <hr>
     <!-- 跳转导航开始 -->
     <div class="AppBar">
-      <div>
-        <div @click="content">项目基本内容</div>
-        <div class="pr1TitBass"></div>
-      </div>
+      <div @click="content" class="AppBarActive">项目基本内容</div>
       <div @click="remark">项目详情</div>
     </div>
     <!-- 跳转导航结束 -->

src/views/projectSettlement1.vue

@@ -12,10 +12,7 @@
       </div>
       <hr>
       <div class="AppBar">
-          <div>
-            <div @click="content">项目基本内容</div>
-            <div class="pr1TitBass"></div>
-          </div>
+          <div @click="content" class="AppBarActive">项目基本内容</div>
           <div @click="remark">项目详情</div>
           <div @click="remark2">项目附件</div>
           <div @click="remark4">项目结题附件</div>

src/views/projectSettlement2.vue

@@ -14,11 +14,7 @@
           <div @click="remark">项目详情</div>
           <div @click="remark2">项目附件</div>
           <div @click="remark4">项目结题附件</div>
-          <div>
-            <div @click="remark5">结项评语</div>
-            <div class="pr1TitBass"></div>
-          </div>
-
+          <div @click="remark5"  class="AppBarActive">结项评语</div>
       </div>
 
       <!-- 上传文件以及表格开始 -->

src/views/resultShowDetail.vue

@@ -108,7 +108,7 @@
 
                         <div class="leftNavTitle" @click="move(`.BaseTitle[type='2']`)">2、项目安排</div>
                         <div class="leftNavContent" @click="move(`.arrangement_assignment_title[type='2.1']`)"><span>2.1</span> <span>腾讯未来探索课堂</span></div>
-                        <div class="leftNavContent" @click="move(`.arrangement_assignment_title[type='2.2']`)"><span>2.2</span> <span>腾讯未来探索课堂</span></div>
+                        <div class="leftNavContent" @click="move(`.arrangement_assignment_title[type='2.2']`)"><span>2.2</span> <span>"未来教室"再次落地北大</span></div>
 
                         <div class="leftNavTitle" @click="move(`.BaseTitle[type='3']`)">3、项目活动过程</div>
                         <div class="leftNavContent" @click="move(`.brief_title[type='3.1']`)"><span>3.1</span> <span>活动阶段一</span></div>