yuanyiming 2 éve
szülő
commit
6dc8533631

+ 20 - 17
src/App.vue

@@ -297,24 +297,27 @@
       font-size: 18px;
       margin-right: 30px;
       position: relative;
+      .pr1TitBass{
+          // position: absolute;
+          // width: 100%;
+          // height: 4px;
+          // left: 0;
+          // top: 28px;
+          // border-radius: 2px;
+          // background: #2a7ea9;
+          position: absolute;
+          width: 100%;
+          height: 4px;
+          left: 0;
+          top: 30px;
+          border-radius: 2px;
+          background: #2a7ea9;
+      }
     }
-    .AppBarActive::after{
-      content: "";
-      position: absolute;
-      width: 100%;
-      height: 4px;
-      left: 0;
-      top: 28px;
-      border-radius: 2px;
-      background: #2a7ea9;
-    }
-    // .pr1TitBass{
-    //     margin-top: 2px;
-    //     height: 4px;
-    //     border-radius: 2px;
-    //     width: 100%;
-    //     background: #2a7ea9;
-    //   }
+    // .AppBarActive::after{
+      
+    // }
+    
   }
 
   .addMoneyBtn{     //自定义写的的添加框

+ 4 - 4
src/views/projectApply/projectApplication.vue

@@ -174,7 +174,7 @@
               <div class="operations">
                   <!-- <el-button type="primary" > -->
                     <!-- <el-link class="btt" type="primary" :underline="false"> -->
-                        <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId)">查看详情</el-button>
+                        <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId,scope.row.typeid)">查看详情</el-button>
                         <!-- <el-button type="primary"  size="mini" @click="audit(scope.row)">{{(scope.row.data==1?"审核": scope.row.data==1?"正在审核":"审核")}}</el-button> -->
                         <el-button v-show="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核</el-button>
                         <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==1"  size="mini">审核中</el-button>
@@ -469,10 +469,10 @@ import downloadFile from '@/components/tool/downloadFile.js';
           this.multipleSelection = val;
         },
        
-        lookDetail(val){    //查看详情按钮
-          // console.log(val);
+        lookDetail(val,tid){    //查看详情按钮
+          console.log(tid);
           localStorage.setItem("pid",JSON.stringify(val))
-          this.$router.push('/projectApplicationDetails')
+          this.$router.push(`/projectApplicationDetailMain?Id=${tid}`)
         },
         apply(){     //项目立项申请按钮
           this.$router.push('/projectApplicationApplyMain')

+ 2 - 4
src/views/projectApply/projectApplication2.vue

@@ -2,19 +2,17 @@
   <!-- 项目立项申请查看详细项目详细 -->
     <div class="projectApplication2" v-loading="loading">
 
-        <div class="vfpHeader">
+        <!-- <div class="vfpHeader">
             <div class="titleOne">项目立项申请</div>
             <div class="smallTitle">项目进展详情</div>
             <el-button type="primary" @click="$router.back()">返回</el-button>
         </div>
 
         <hr>
-          <!-- 跳转导航开始 -->
           <div class="AppBar">
               <div @click="content">项目基本内容</div>
               <div class="AppBarActive">项目详情</div>
-          </div>
-          <!-- 跳转导航结束 -->
+          </div> -->
 
       <div class="PA2textArea">
         <div class="PA2textAreaTit">项目创新点</div>

+ 24 - 9
src/views/projectApply/projectApplicationDetailMain.vue

@@ -3,22 +3,23 @@
         <!-- 项目立项申请查看详细项目基本内容 -->
         <!-- <div class="projectApplication1" v-loading="loading"> -->
         <div class="projectApplication1">
-
             <div class="vfpHeader">
                 <div class="titleOne">项目立项申请</div>
                 <span class="smallTitle">项目进展详情</span>
                 <el-button @click="back()" type="primary" size="mini">返回</el-button>
             </div>
             <hr>
-            <!-- 跳转导航开始 -->
             <div class="AppBar">
-                <div class="AppBarActive">项目基本内容</div>
-                <div @click="remark">项目详情</div>
+                <div v-for="(item,index) in bar" :key="index" @click="goto(index)" class="AppBarActive">
+                    {{ item.addresses }}
+                    <div :class="index==status?item.cl:''"></div>
+                </div>
+                
             </div>
-            <!-- 跳转导航结束 -->
         </div>
-        <projectApplicationDetails></projectApplicationDetails>
-        <projectApplication2></projectApplication2>
+
+        <projectApplicationDetails v-show="$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && status==0"></projectApplicationDetails>
+        <projectApplication2 v-show="$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && status==1"></projectApplication2>
   </div>
 </template>
 
@@ -30,12 +31,26 @@ import projectApplication2 from './projectApplication2.vue'
         components:{projectApplicationDetails,projectApplication2},
         data() {
             return {
-                
+                status:0,
+                bar:[
+                    {addresses:'项目基本内容',cl:'pr1TitBass'},
+                    {addresses:'项目详情',cl:'pr1TitBass'},
+                ],
+                content:[],
+                detail:{},
+            }
+        },
+        methods:{
+            goto(val){
+                this.status=val
             }
         },
+        mounted(){
+            console.log(this.$route.query['Id'])
+        }
     }
 </script>
 
-<style>
+<style lang="less">
 
 </style>

+ 5 - 6
src/views/projectApply/projectApplicationDetails.vue

@@ -1,20 +1,19 @@
 <template>
   <!-- 项目立项申请查看详细项目基本内容 -->
   <div class="projectApplication1" v-loading="loading">
-    <div class="vfpHeader">
-      <!-- 详情页 -->
+    <!-- <div class="vfpHeader">
         <div class="titleOne">项目立项申请</div>
         <span class="smallTitle">项目进展详情</span>
         <el-button @click="back()" type="primary" size="mini">返回</el-button>
-    </div>
+    </div> -->
 
 
-    <hr>
+    <!-- <hr> -->
     <!-- 跳转导航开始 -->
-    <div class="AppBar">
+    <!-- <div class="AppBar">
       <div class="AppBarActive">项目基本内容</div>
       <div @click="remark">项目详情</div>
-    </div>
+    </div> -->
     <!-- 跳转导航结束 -->
 
      <!-- 活动申请填写信息区域开始 -->