Q-ABAB преди 1 година
родител
ревизия
2938689219

+ 6 - 6
src/router/index.js

@@ -185,12 +185,12 @@ const routes = [{
             //     component: () =>import ('@/views/projectManage/ProjectManagement4.vue'),
             //     meta: { isAuth: true }
             // },
-            {
-                name: 'ProjectManagement3_1',
-                path: '/ProjectManagement3_1',
-                component: () =>import ('@/views/projectManage/ProjectManagement3_1.vue'),
-                meta: { isAuth: true }
-            },
+            // {
+            //     name: 'ProjectManagement3_1',
+            //     path: '/ProjectManagement3_1',
+            //     component: () =>import ('@/views/projectManage/ProjectManagement3_1.vue'),
+            //     meta: { isAuth: true }
+            // },
             // { //项目管理
             //     name: 'ProjectManagement5',
             //     path: '/ProjectManagement5',

+ 5 - 2
src/views/projectManage/ProjectManagementMain.vue

@@ -23,7 +23,8 @@
         <ProjectManagement2_MakerSpace v-if="show==1 && this.$route.query['Id']=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2_MakerSpace>
 
 
-        <ProjectManagement3 v-if="show==2"></ProjectManagement3>
+        <ProjectManagement3 :changeShow="goto" v-if="show==2"></ProjectManagement3>
+        <ProjectManagement3_1 v-if="show==5"/>
         <ProjectManagement4 v-if="show==3"></ProjectManagement4>
         <ProjectManagement5 v-if="show==4"></ProjectManagement5>
     </div>
@@ -33,6 +34,7 @@
     import ProjectManagement1 from './components/ProjectManagement1.vue'
     import ProjectManagement2 from './components/ProjectManagement2.vue'
     import ProjectManagement3 from './components/ProjectManagement3.vue'
+    import ProjectManagement3_1 from './components/ProjectManagement3_1.vue'
     import ProjectManagement4 from './components/ProjectManagement4.vue'
     import ProjectManagement5 from './components/ProjectManagement5.vue'
 
@@ -45,6 +47,7 @@
             ProjectManagement1,
             ProjectManagement2,
             ProjectManagement3,
+            ProjectManagement3_1,
             ProjectManagement4,
             ProjectManagement5,
             ProjectManagement1_MakerSpace,
@@ -65,7 +68,7 @@
         methods:{
             goto(val){
                 this.show=val
-            }
+            },
         },
         mounted(){
             this.$route.query['Id']

+ 3 - 1
src/views/projectManage/components/ProjectManagement3.vue

@@ -108,6 +108,7 @@
   <script>
   import downloadFile from '@/components/tool/downloadFile.js'
       export default {
+        props:['changeShow'],
         data() {
           return {
             loading:false,
@@ -168,7 +169,8 @@
           this.getData()
         },
           detail(Id){
-            this.$router.push(`/ProjectManagement3_1?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}&aid=${Id}`)
+            this.$router.push(`/ProjectManagementMain?Id=${this.$route.query['Id']}&pid=${this.$route.query['pid']}&aid=${Id}`);
+            this.changeShow(5)
           },    
         },
         mounted(){

+ 0 - 19
src/views/projectManage/ProjectManagement3_1.vue → src/views/projectManage/components/ProjectManagement3_1.vue

@@ -1,25 +1,6 @@
 <template>
   <!-- 项目管理 活动开展 查看详细-->
     <div class="ProjectManagement3_1" v-loading="loading">
-      <div class="vfpHeader">
-      <!-- 详情页 -->
-          <div class="titleOne">项目管理</div>
-          <span class="smallTitle" style="left: 100px;">项目进展详情</span>
-    </div>
-      <hr>
-         <!-- 跳转导航开始 -->
-         <div class="AppBar" style="position: relative;">
-            <div @click="content">项目基本内容</div>
-            <div @click="remark">项目详情</div>
-            <div @click="remark2" class="AppBarActive">活动开展</div>
-            <div @click="remark4">项目附件</div>
-            <div @click="remark5">项目结题附件</div>
-            <el-button type="primary" style="position: absolute;right: 0;top: -5px; width: 100px;font-size: 16px;" 
-            @click="$router.back()"
-             size="mini">返回</el-button>
-          </div>
-          <!-- 跳转导航结束 -->
-
      <!-- 活动申请填写信息区域开始 -->
       <div class="select">
                 <div class="selectTop">