项目管理

src/App.vue

@@ -575,7 +575,26 @@
     justify-content: center;
   }
 
-  .pageSubmitData{     //页面提交数据，数据框样式
+
+    .pTit{        //项目详情类大标题
+      color: #3994ff;
+      font-weight: 550;
+      font-size: 18px;
+      margin: 15px 0;
+    }
+    .pTit2{    //项目详情类小标题
+      margin-top: 15px;
+      color: #3994ff;
+      font-weight: 550;
+      font-size: 16px;
+    }
+    .editor{    //显示栏
+      width: 100%;
+      box-sizing: border-box;
+      padding: 15px 0px 10px 0px;
+    }
+
+    .pageSubmitData{     //页面提交数据,删除成员，对话框样式
         .el-dialog__header{
             display: flex;
             justify-content: center;
@@ -650,23 +669,6 @@
         //   width: 200px;
         // }
       }
-  }
-
-  .pTit{        //项目详情大标题
-      color: #3994ff;
-      font-weight: 550;
-      font-size: 18px;
-      margin: 15px 0;
-    }
-    .pTit2{    //项目详情小标题
-      margin-top: 15px;
-      color: #3994ff;
-      font-weight: 550;
-      font-size: 16px;
-    }
-    .editor{    //显示栏
-      width: 100%;
-      box-sizing: border-box;
-      padding: 15px 0px 10px 0px;
     }
+
 </style>

src/router/index.js

@@ -151,6 +151,8 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
+
+
             { //项目管理
                 name: 'ProjectManagement',
                 path: '/ProjectManagement',
@@ -158,6 +160,12 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
+            {   //项目管理父组件
+                name: 'ProjectManagementMain',
+                path: '/ProjectManagementMain',
+                component: () =>import ('@/views/projectManage/ProjectManagementMain.vue'),
+                meta: { isAuth: true }
+            },
             { //项目管理
                 name: 'ProjectManagement2',
                 path: '/ProjectManagement2',
@@ -191,13 +199,7 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
-            { //项目管理
-                name: 'ProjectManagement1',
-                path: '/ProjectManagement1',
-                component: () =>import ('@/views/projectManage/ProjectManagement1.vue'),
-                meta: { isAuth: true }
-
-            },
+            
             { //项目资金管理
                 name: 'ProjectManagementFund1',
                 path: '/ProjectManagementFund1',

src/views/projectApply/projectApplication2.vue

@@ -2,10 +2,6 @@
   <!-- 项目立项申请查看详细项目详细 -->
     <div class="projectApplication2">
 
-      <!-- <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目创新点</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][0]"></vue-editor>
-      </div> -->
       <div id="w">
               <p class="pTit">研发内容</p>
               <div>

src/views/projectManage/ProjectManagement.vue

@@ -118,7 +118,7 @@
         </div>
 
             <div class="classBlockBtn">
-              <span @click="scheduleDetail(item.courseId)">进度详细</span>
+              <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
               <span @click="fundStatus(item.courseId)">资金情况</span>
               <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span>
               <span v-show="item.isupload==1 && (item.endFile==null)"  @click="finish(item.courseId,item.title)">结项</span>
@@ -337,9 +337,9 @@ import { getNowDate } from '@/components/tool/Date';
           })
           this.endDialog=false;
         },
-        scheduleDetail(val){      //进度详情
+        scheduleDetail(val,tid){      //进度详情
           localStorage.setItem('pid',JSON.stringify(val))
-          this.$router.push(`/ProjectManagement1`)
+          this.$router.push(`/ProjectManagementMain?Id=${tid}`)
         },
         fundStatus(Id){     //资金情况
           localStorage.setItem('pid',JSON.stringify(Id))

src/views/projectManage/ProjectManagement2.vue

@@ -1,52 +1,92 @@
 <template>
   <!-- 项目管理 项目详细 -->
-    <div class="ProjectManagement2" v-loading="loading">
-      <div class="vfpHeader">
-      <!-- 详情页 -->
-        <div class="titleOne">项目管理</div>
-        <div class="smallTitle" style="left: 100px;">项目进展详情</div>
-        <el-button type="primary" @click="back">返回</el-button>
-    </div>
-      <hr>
-
-    <!-- 跳转导航开始 -->
-    <div class="AppBar">
-      <div @click="content">项目基本内容</div>
-      <div @click="remark" class="AppBarActive">项目详情</div>
-      <div @click="remark2">活动开展</div>
-      <div @click="remark4">项目附件</div>
-      <div @click="remark5">项目结题附件</div>
-    </div>
-    <!-- 跳转导航结束 -->
-     
-    <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目创新点</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][0]"></vue-editor>
-      </div>
+    <div class="ProjectManagement2">
+   
+      <div id="w">
+              <p class="pTit">研发内容</p>
+              <div>
+                <p class="pTit2">一、项目研发背景</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">二、项目创新点</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">三、技术研发路线</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">四、项目应用场景</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor>
+                </div>
+              </div>
+              <!-- <div class="editor">
+                <vue-editor  :editorToolbar="customToolbar" v-model="content.contentOne"></vue-editor>
+              </div> -->
+            </div>
+            <div>
+              <p class="pTit">商业模式及社会价值</p>
+              <div>
+                <p class="pTit2">一、项目商业模式/社会价值</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor>
+                </div>
+              </div>
+            </div>
+            <div>
+              <p class="pTit">团队优势</p>
+              <div>
+                <p class="pTit2">一、团队构成及优势</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor>
+                </div>
+              </div>
+            </div>
 
-      <div class="PA2mid">
-        预期取得成果
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">一、项目预期成果、数量及形式</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][1]"></vue-editor>
-        
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">二、创客人才培养预期成果、数量</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][2]"></vue-editor>
-       
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit PA2textAreaTit2">三、项目预期孵化、转化创业项目情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][3]"></vue-editor>
-        
-      </div>
-      <div class="PA2textArea">
-        <div class="PA2textAreaTit">项目实施计划</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data[0][4]"></vue-editor>
-        
-      </div>
+            <div>
+              <p class="pTit">研发成本</p>
+              <div>
+                <p class="pTit2">一、研发成本来源及构成</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor>
+                </div>
+              </div>
+            </div>
+            <div id="e">
+              <p class="pTit">预期成果</p>
+              <div>
+                <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor>
+                </div>
+              </div>
+              <div>
+                <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
+                <div class="editor">
+                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor>
+                </div>
+              </div>
+            </div>
+            <div>
+              <p class="pTit" style="margin-bottom: 0;">实施计划</p>
+              <div class="editor">
+                <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor>
+              </div>
+            </div>
       <div class="baseBtn">
         <div class="blockWidth">
           <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
@@ -60,7 +100,7 @@
           title="提示"
           :visible.sync="submitHint"
           width="600px"
-          class="projectManageAmendSubmit"
+          class="projectApplicationfundAddDialog"
           :before-close="init">
           <div class="addDialogLogo">LOGO</div>
           <div class="deleteContent">确定修改项目基本信息?</div>
@@ -83,7 +123,6 @@ import { VueEditor } from "vue2-editor";
         data() {
           return {
             isUpload:'',
-            loading:false,
             data:[["","","","",""],[]],
             submitHint:false,
             customToolbar: [
@@ -91,27 +130,10 @@ import { VueEditor } from "vue2-editor";
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
               [{header:[false,1,2,3,4]}]
             ],
+            content:'',
           }
         },
         methods:{
-          back(){
-            this.$router.push('/ProjectManagement')
-          },
-        content(){
-            this.$router.push('/ProjectManagement1')
-          },
-          remark(){
-            this.$router.push('/ProjectManagement2')
-          },
-          remark2(){
-            this.$router.push('/ProjectManagement3')
-          },
-          remark4(){
-            this.$router.push('/ProjectManagement4')
-          },
-           remark5(){
-            this.$router.push('/ProjectManagement5')
-          },
           // content(){      //导航栏项目详情跳转
           //   this.$router.push('/projectApplicationDetails')
           // },
@@ -126,10 +148,10 @@ import { VueEditor } from "vue2-editor";
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid')),
-              message:JSON.stringify(this.data)
+              message:JSON.stringify(this.content)
             }
               this.ajax
-                  .post(this.$store.state.api+'/UpdateProjectDetail',param)
+                  .post(this.$store.state.api+'/updateProjectApplication2Student',param)
                   .then(res=>{
                     // console.log(res);
                     this.$message.success('修改成功')
@@ -141,25 +163,37 @@ import { VueEditor } from "vue2-editor";
           init(){
             this.submitHint=false
           },
-          getData(){   //初始化完成获取基本数据进行填充
-            this.loading = true;
-            let param={
-              uid:this.$store.state.userInfo.userid,
-              pid:JSON.parse(localStorage.getItem('pid'))
-            }
-              this.ajax
-                    .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+          // getData(){   //初始化完成获取基本数据进行填充
+          //   let param={
+          //     uid:this.$store.state.userInfo.userid,
+          //     pid:JSON.parse(localStorage.getItem('pid'))
+          //   }
+          //     this.ajax
+          //           .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+          //           .then(res=>{
+          //             this.isUpload=res.data[0][0].isupload;
+          //             let GetData=JSON.parse(res.data[0][0].chapters)
+          //             this.data=GetData;
+          //           },err=>{
+          //             console.log(err);
+          //           })
+          // },
+          getData(){
+                let param={
+                    uid:this.$store.state.userInfo.userid,
+                    pid:JSON.parse(localStorage.getItem('pid'))
+                }
+                this.ajax
+                    .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
                     .then(res=>{
-                      // console.log(res.data[0][0].isupload);
-                      this.isUpload=res.data[0][0].isupload;
-                      let GetData=JSON.parse(res.data[0][0].chapters)
-                      // console.log(GetData);
-                      this.data=GetData;
-                      this.loading = false;
+                        let data=res.data[0][0]
+                        console.log(data.chapters);
+                        this.content=JSON.parse(data.chapters)
+                        console.log(this.content);
                     },err=>{
-                      console.log(err);
+                        console.log(err);
                     })
-          },
+            },
         },
         mounted(){
           this.getData();
@@ -168,8 +202,8 @@ import { VueEditor } from "vue2-editor";
   </script>
   
   <style lang="less">
-
- .projectManageAmendSubmit{    //项目修改对话框开始
+  // .projectApplication2{
+ .projectApplicationfundAddDialog{    //项目修改对话框开始
  
 
  .el-dialog{
@@ -242,7 +276,7 @@ import { VueEditor } from "vue2-editor";
 //  }
 }
 }
-//项目修改对话框结束
+
     .PA2textArea{     //标题栏
         margin: 15px 0;
         .PA2textAreaTit{
@@ -264,12 +298,7 @@ import { VueEditor } from "vue2-editor";
         }
     }
     
-    .PA2mid{    //预期取得成果单独一栏
-        width: 100%;
-        text-align: left;
-        font-size: 18px;
-        font-weight: 550;
-        margin-bottom: 10px;
-        color: #2387ff;
-    }
+
+
+  // }
   </style>

src/views/projectManage/ProjectManagement3.vue

@@ -1,22 +1,22 @@
 <template>
   <!-- 项目管理 活动开展 -->
     <div class="ProjectManagement3" v-loading="loading">
-      <div class="vfpHeader">
+      <!-- <div class="vfpHeader"> -->
       <!-- 详情页 -->
-        <div class="titleOne">项目管理</div>
+        <!-- <div class="titleOne">项目管理</div>
         <div class="smallTitle" style="left: 100px;">项目进展详情</div>
         <el-button type="primary" @click="back">返回</el-button>
     </div>
-      <hr>
+      <hr> -->
 
       <!-- 跳转导航开始 -->
-      <div class="AppBar">
+      <!-- <div class="AppBar">
         <div @click="content">项目基本内容</div>
         <div @click="remark">项目详情</div>
         <div @click="remark2" class="AppBarActive">活动开展</div>
         <div @click="remark4">项目附件</div>
         <div @click="remark5">项目结题附件</div>
-      </div>
+      </div> -->
       <!-- 跳转导航结束 -->
 
       <!-- 表格部分开始 -->

src/views/projectManage/ProjectManagement4.vue

@@ -1,22 +1,7 @@
 <template>
   <!-- 项目管理 项目附件 -->
     <div class="ProjectManagement4" v-loading="loading">
-      <div class="vfpHeader">
-      <!-- 详情页 -->
-        <div class="titleOne">项目管理</div>
-        <div class="smallTitle" style="left: 100px;">项目进展详情</div>
-        <el-button type="primary" @click="back">返回</el-button>
-    </div>
-      <hr>
-       <!-- 跳转导航开始 -->
-       <div class="AppBar">
-        <div @click="content">项目基本内容</div>
-        <div @click="remark">项目详情</div>
-        <div @click="remark2">活动开展</div>
-        <div class="AppBarActive">项目附件</div>
-        <div @click="remark5">项目结题附件</div>
-      </div>
-      <!-- 跳转导航结束 -->
+
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
           <beUpload @getFile="getFile" v-show="state==0" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>

src/views/projectManage/ProjectManagement5.vue

@@ -1,22 +1,7 @@
 <template>
   <!-- 项目管理 项目结题附件 -->
     <div class="ProjectManagement5" v-loading="loading">
-      <div class="vfpHeader">
-      <!-- 详情页 -->
-        <div class="titleOne">项目管理</div>
-        <div class="smallTitle" style="left: 100px;">项目进展详情</div>
-        <el-button type="primary" @click="back">返回</el-button>
-    </div>
-      <hr>
-       <!-- 跳转导航开始 -->
-       <div class="AppBar">
-        <div @click="content">项目基本内容</div>
-        <div @click="remark">项目详情</div>
-        <div @click="remark2">活动开展</div>
-        <div @click="remark4">项目附件</div>
-        <div @click="remark5" class="AppBarActive">项目结题附件</div>
-      </div>
-      <!-- 跳转导航结束 -->
+
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
           <beUpload @getFile="getFile" v-show="state==0" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>

src/views/projectManage/ProjectManagementMain.vue

@@ -0,0 +1,60 @@
+<template>
+    <div>
+        <div class="vfpHeader">
+            <div class="titleOne">项目管理</div>
+            <div class="smallTitle" style="left: 100px;">项目进展详情</div>
+            <el-button type="primary" @click="$router.back()">返回</el-button>
+        </div>
+        <hr>
+
+    <!-- 跳转导航开始 -->
+        <div class="AppBar">
+            <!-- <div v-for="(item,index) in items" :key="index" @click="goto(index)" class="AppBarActive">{{ item.tit }}</div> -->
+            <div v-for="(item,index) in items" :key="index" @click="goto(index)" class="AppBarActive">
+                {{ item.tit }}
+                <div :class="index==show?item.cl:''"></div>
+            </div>
+        </div>
+        <ProjectManagement1 v-if="show==0 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement1>
+        <ProjectManagement2 v-if="show==1 && this.$route.query['Id']=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"></ProjectManagement2>
+        <ProjectManagement3 v-if="show==2"></ProjectManagement3>
+        <ProjectManagement4 v-if="show==3"></ProjectManagement4>
+        <ProjectManagement5 v-if="show==4"></ProjectManagement5>
+    </div>
+</template>
+
+<script>
+    import ProjectManagement1 from './ProjectManagement1.vue'
+    import ProjectManagement2 from './ProjectManagement2.vue'
+    import ProjectManagement3 from './ProjectManagement3.vue'
+    import ProjectManagement4 from './ProjectManagement4.vue'
+    import ProjectManagement5 from './ProjectManagement5.vue'
+
+    export default {
+        components:{ProjectManagement1,ProjectManagement2,ProjectManagement3,ProjectManagement4,ProjectManagement5},
+        data() {
+            return {
+                show:0,
+                items:[
+                    {tit:'项目基本内容',cl:'pr1TitBass'},
+                    {tit:'项目详情',cl:'pr1TitBass'},
+                    {tit:'活动开展',cl:'pr1TitBass'},
+                    {tit:'项目附件',cl:'pr1TitBass'},
+                    {tit:'项目结题附件',cl:'pr1TitBass'},
+                ]
+            }
+        },
+        methods:{
+            goto(val){
+                this.show=val
+            }
+        },
+        mounted(){
+            this.$route.query['Id']
+        }
+    }
+</script>
+
+<style lang="less"> 
+
+</style>