Q-ABAB 1 year ago
parent
commit
f15d36dcf4

+ 6 - 4
src/views/projectManage/ProjectManagementMain.vue

@@ -15,13 +15,13 @@
             </div>
         </div>
         <!-- 创客项目 -->
-        <studentProjectWordShow v-if="show==0 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <studentProjectWordShow v-if="show==0 && $route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- 特色创客空间建设 -->
-        <MakerSpaceWordShow v-if="show==0 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <MakerSpaceWordShow v-if="show==0 && $route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"/>
         <!-- 活动开展 -->
         <ProjectManagementActivity :changeShow="goto" v-if="show==1"/>
         <!-- 活动开展详细 -->
-        <ProjectManagementActivityDetail v-if="show==5"/>
+        <ProjectManagementActivityDetail :AidShow="AidShow" v-if="show==5 && $route.query['aid']"/>
         <!-- 项目结题文件 -->
         <ProjectManagementEndProjectFile v-if="show==2"/>
     </div>
@@ -48,6 +48,7 @@
         data() {
             return {
                 show:0,
+                AidShow:"",
                 items:[
                     {tit:'项目详细',cl:'pr1TitBass'},
                     {tit:'活动开展',cl:'pr1TitBass'},
@@ -56,8 +57,9 @@
             }
         },
         methods:{
-            goto(val){
+            goto(val,aid=''){
                 this.show=val
+                this.AidShow = aid;
             },
         },
         mounted(){

+ 2 - 2
src/views/projectManage/components/ProjectManagementActivity.vue

@@ -165,8 +165,8 @@
           this.getData()
         },
           detail(Id){
-            this.$router.push(`/ProjectManagementMain?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}&aid=${Id}`);
-            this.changeShow(5)
+            // this.$router.push(`/ProjectManagementMain?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}&aid=${Id}`);
+            this.changeShow(5,Id)
           },    
         },
         mounted(){

+ 2 - 1
src/views/projectManage/components/ProjectManagementActivityDetail.vue

@@ -9,6 +9,7 @@
   // import { uuid } from 'vue-uuid';
   import markeractivityWordShow from './markeractivityWordShow.vue'
       export default {
+        props:['AidShow'],
         components:{markeractivityWordShow},
         data() {
           return {
@@ -57,7 +58,7 @@
                 this.loading = true;
                 let pram = {
                     uid:this.$store.state.userInfo.userid,
-                    acid:this.$route.query['aid']
+                    acid:this.AidShow,
                 }
                 this.ajax.get(this.$store.state.api+"/getActivityWordData",pram).then(result=>{
                     let data = result['data'][0][0]