yuanyiming пре 2 година
родитељ
комит
0e3ed72f24

+ 2 - 2
src/App.vue

@@ -372,7 +372,7 @@
           color: #fff;
           position: relative;
           top: -5px;
-          font-size: 18px;
+          font-size: 22px;
         }
         .littleBlock{   //添加对话框 label和input框
             display: flex;
@@ -489,7 +489,7 @@
         }
       }
     
-      .inputNumber{
+      .inputNumber{       //输入框只能数字
         /* 普通IE浏览器 样式清除 */
         input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
         -webkit-appearance: none !important;

+ 16 - 2
src/views/projectApply/projectApplication.vue

@@ -245,6 +245,7 @@
           :before-close="init">
         
           <div class="diaTit">
+              <div class="addDialogLogo">LOGO</div>
               <div class="spans">项目名称</div>
               <div class="spanCon">:{{ auditDialog.projectName }}</div>
               <div class="spans" style="margin-left: 30px;">项目负责人</div>
@@ -538,11 +539,14 @@
     left: 20px; top: 15px; 
   }
   .el-dialog__header{
-  background: #32455b;
+      background: #32455b;
+     
   }
   .el-dialog__title{
     color:#fff;
     font-size: 22px;
+    display: flex;
+    justify-content: center;
   }
   .addDialogMid{
     box-sizing: border-box;
@@ -605,9 +609,19 @@
           color: #fff;
           position: relative;
           top: -5px;
+          display: flex;
+          justify-content: center;
           font-size: 18px;
         }
-
+        .addDialogLogo{
+          width: 60px;
+          height: 30px;
+          line-height: 30px;
+          background: #f2f2f2;
+          position: absolute;
+          left: 20px; top: 15px; 
+          text-align:center;
+        }
         .diaTit{     //项目名称、负责人
             width: 100%;
             display: flex;

+ 67 - 13
src/views/projectApply/projectApplicationApply.vue

@@ -92,15 +92,38 @@
               <!-- 活动申请填写信息区域结束 -->
 
           <!-- 项目封面上传开始 -->
-          <div style="position: relative;height: 150px;">
+          <div style="height: 260px;">
               <div id="two" class="tabTit">
                 <div><p>封面上传</p></div>
                 <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传封面</el-button> -->
               </div>
               <hr>
-              <BeUpload @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+              <!-- <BeUpload @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload> -->
 
+              <!-- <el-upload
+                action="#"
+                list-type="picture-card"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove">
+                <i class="el-icon-plus"></i>
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible">
+                <img width="100%" :src="data.dialogImageUrl" alt="">
+              </el-dialog> -->
+              <div style="margin-bottom: 10px;">项目封面</div>
               <el-upload
+                class="avatar-uploader"
+                action="#"
+                disabled
+                style="position: relative;"
+                :show-file-list="false"
+                >
+                <img v-if="data.dialogImageUrl" :src="data.dialogImageUrl" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <BeUpload style="position: absolute;width: 301px;height: 180px; opacity: 0;z-index: 333;left: 0;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+              </el-upload>
+
+              <!-- <el-upload
                 class="upload-demo"
                 action="#"
                 :on-preview="handlePreview"
@@ -109,8 +132,7 @@
                 :multiple="false"
                 style="width: 40%;margin-top: -25px;"
                 list-type="picture">
-                <!-- <el-button size="small" style="position: absolute;top: -8px;right: 0;width: 100px;box-sizing: border-box;padding: 9px 0;font-size: 16px;background-color: #0e72e6;border-radius:5px" type="primary">上传封面</el-button> -->
-              </el-upload>
+              </el-upload> -->
             </div>
 
           <!-- 项目封面上传开始结束 -->
@@ -298,8 +320,10 @@
       },
       data() {
         return {
+          // dialogImageUrl: '',
           accept:"*",
           // fileList: [],
+          dialogVisible: false,
           addMemberDialog:false,
           amendMemberDialog:false,
           delMember:false,
@@ -309,12 +333,12 @@
       
       methods:{
         getFile(val) {       //上传封面
-            // console.log( val);
-            let data=[{
-              name:val.fileName,
-              url:val.url
-            }]
-            this.data.fileList=data
+            console.log(val);
+            // let data=[{
+            //   name:val.fileName,
+            //   url:val.url
+            // }]
+            this.data.dialogImageUrl=val.url
             // console.log(this.data.fileList);
         },
         // submitUpload() {
@@ -323,8 +347,9 @@
         handleRemove(file, fileList) {
           console.log(file, fileList);
         },
-        handlePreview(file) {
-          console.log(file);
+        handlePictureCardPreview(file) {
+            this.dialogImageUrl = file.url;
+            this.dialogVisible = true;
         },
         getText(value) {     //电话验证
           // console.log(value);
@@ -360,7 +385,11 @@
         },
         addMember(){   //添加项目成员
           this.addMemberDialog=true
-          this.data.Member={}   //点开立即清除上次数据
+          for(let i in this.data.Member){
+            if(i=='score')this.data.Member[i] = "0"
+            else this.data.Member[i] = "";
+          }
+          // this.data.Member={}   //点开立即清除上次数据
         },
         amendDialogData(val){   //修改项目成员信息对话框显示
           this.data.amendMemberDialog=true
@@ -422,6 +451,31 @@
 
 <style lang="less">
 
+
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    z-index: -10;
+    // position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 300px;
+    // height: 50%;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 300px;
+    height:180px !important;
+    display: block;
+  }
 .projectApplicationApply{
     margin-top: 30px;
     width: 100%;

+ 19 - 14
src/views/projectApply/projectApplicationApplyMain.vue

@@ -60,6 +60,7 @@
             submitHint:false,   //提交按钮
             projectApplicationApply1:{   //立项基础信息页面
               amendMemberDialog:false,  //修改人员对话框显示判断
+                dialogImageUrl:"",  //封面
                 telVerify:'',
                 telVerify2:'',  //添加修改成员电话判断
                 select:{    //基本信息数据框
@@ -92,7 +93,7 @@
                 tableData:[ //成员列表
                   
                 ], 
-                fileList:[]   //封面
+                // fileList:[]   //封面
             },
             projectApplicationApply2:{  //项目内容页面
                   contentOne:'',
@@ -158,13 +159,17 @@
                 this.status--;
             },
             addPerson(){  //立项基础信息页面添加人员
-              let a=this.projectApplicationApply1
-              a.tableData.push(a.Member);
-              // a.addMemberDialog=false;
-              a.Member.id=uuid.v1()
+              this.projectApplicationApply1.Member.id=uuid.v1()
+              let newData = {};
+              for(let j in this.projectApplicationApply1.Member)newData[j] = this.projectApplicationApply1.Member[j];
+              this.projectApplicationApply1.tableData.push(newData);
               this.$message.success('添加成功')
-              console.log(a.Member);
-              a.Member={}
+              for(let i in this.projectApplicationApply1.Member){
+                if(i=='score')this.projectApplicationApply1.Member[i] = "0"
+                else this.projectApplicationApply1.Member[i] = "";
+              }
+              console.log(this.projectApplicationApply1.tableData)
+              // a.Member={}
             },
 
             amend(val){      //立项基础信息页面修改人员信息
@@ -263,12 +268,12 @@
               if(a.select.tel=='') return this.$message.error('请输入联系电话')
               if(!a.telVerify) return this.$message.error('请输入正确联系电话格式')
               if(a.select.sort=='') return this.$message.error('请选择分类')
-              if(a.textarea=='') return this.$message.error('请输入项目简介')
-              if(b.contentOne=='') return this.$message.error('请输入项目创新点')
-              if(b.contentTwo=='') return this.$message.error('请输入预期取得成果')
-              if(b.contentThree=='') return this.$message.error('请输入预期取得成果')
-              if(b.contentFour=='') return this.$message.error('请输入预期取得成果')
-              if(b.contentFive=='') return this.$message.error('请输入项目实施计划')
+              // if(a.textarea=='') return this.$message.error('请输入项目简介')
+              // if(b.contentOne=='') return this.$message.error('请输入项目创新点')
+              // if(b.contentTwo=='') return this.$message.error('请输入预期取得成果')
+              // if(b.contentThree=='') return this.$message.error('请输入预期取得成果')
+              // if(b.contentFour=='') return this.$message.error('请输入预期取得成果')
+              // if(b.contentFive=='') return this.$message.error('请输入项目实施计划')
               
 
 
@@ -295,7 +300,7 @@
                 message:JSON.stringify([d,[newData1,c.tableData2]]),
                 tid:a.select.sort,
                 mon:a.select.fund,
-                imgsrc:a.fileList[0].url,
+                imgsrc:a.dialogImageUrl,
                 beginTime:a.select.value1
               }
                 this.ajax

+ 111 - 91
src/views/projectApply/projectApplicationDetails.vue

@@ -79,6 +79,33 @@
         </div>
         <!-- 活动申请填写信息区域结束 -->
 
+
+         <!-- 项目封面修改上传开始 -->
+         <div style="height: 260px;">
+              <div class="tabTit">
+                <div><p>封面上传</p></div>
+              </div>
+              <hr>
+              <div style="margin-bottom: 10px;">修改项目封面</div>
+
+              <el-upload
+                class="avatar-uploader"
+                action="#"
+                disabled
+                style="position: relative;"
+                :show-file-list="false"
+                >
+                <img v-if="dialogImageUrl" :src="dialogImageUrl" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <BeUpload style="position:absolute; width: 301px;height: 180px; opacity: 0;z-index:333;left: 0px;top: 0;" @getFile="getFile" class="uploadPic" :navName="'上传封面'" :accept="accept"></BeUpload>
+              </el-upload>
+            </div>
+
+          <!-- 项目封面修改上传开始结束 -->
+
+
+
+
       <!-- 项目成员开始 -->
       <div class="tabTit">
           <div><p>项目成员</p></div>
@@ -112,12 +139,12 @@
          >
         </el-table-column>
 
-        <!-- <el-table-column
+        <el-table-column
           prop="score"
           label="学分"
           align="center"
           >
-        </el-table-column> -->
+        </el-table-column>
         
         <el-table-column
           prop="operation"
@@ -275,10 +302,16 @@
 
 <script>
   import { uuid } from 'vue-uuid';
+  import BeUpload from "../../components/tool/beUpload.vue";
     export default {
+      components: {
+        BeUpload,
+      },
       data() {
         return {
           iid:'',
+          accept:'*',
+          dialogImageUrl:'',  //图片地址
           input:'',
           delMember:false,
           amendMemberDialog:false,
@@ -304,18 +337,27 @@
             name:'',
             class:'',
             phone:'',
-            // score:''
+            score:0
           },
           amendTabMember:{       //修改项目成员
             id:'',
             name:'',
             class:'',
             phone:'',
-            // score:''
+            score:0
           }
         }
       },
       methods:{
+        getFile(val) {       //上传封面
+            console.log(val);
+            // let data=[{
+            //   name:val.fileName,
+            //   url:val.url
+            // }]
+            this.dialogImageUrl=val.url
+            // console.log(this.data.fileList);
+        },
         addMember(){       //添加成员按钮,显示对话框
             this.addMemberDialog=true
         },
@@ -377,12 +419,13 @@
             phone:this.select.tel,
             tid:this.select.sort,
             student:JSON.stringify(this.tableData),
-            con:this.textarea
+            con:this.textarea,
+            imgsrc:this.dialogImageUrl
           }
             this.ajax
                   .post(this.$store.state.api+'/UpdateProjectBase',param)
                   .then(res=>{
-                    console.log(res);
+                    // console.log(res);
                     if (res.data==1) {
                       this.$message.success('修改成功')
                       this.submitHint=false
@@ -427,6 +470,7 @@
                     this.textarea=data.brief;
                     this.tableData=JSON.parse(data.course_student) 
                     this.select.tel=data.phone;
+                    this.dialogImageUrl=data.image
                     this.select.departmentData = data['classid']
                     this.select.sort = data['typeid']
                   },err=>{
@@ -472,97 +516,74 @@
 <style lang="less">
 .projectApplication1{
 
-        .delMemberDialog{
-            font-size: 18px;
-            .el-dialog{
-              border-radius: 5px;
-              overflow: hidden;
-            }
-            .deleteContent{
-              margin: 30px 0;
-              font-size: 22px;
-              color: #000;
-            }
-            .el-dialog__header{
-              background: #32455b;
-              display: flex;
-              justify-content: center;
-            }
-            .el-dialog__title{
-              color:#fff;
-              font-size: 22px;
-            }
-            .el-dialog__body{
-              display: flex;
-              justify-content: center;
-            }
-            .dialog-footer{
-              display: flex;
-              justify-content: center;
-              box-sizing: border-box;
-              .btn5{
-                font-size: 16px;
-              }
-            }
-          }
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    // position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 300px;
+    // height: 100%;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 300px;
+    height:178px !important;
+    display: block;
+  }
 
-  .projectApplicationDetailsAddMember{     //查看详情对话框样式
-    .el-input__inner{
-          width: 300px;
-      }
+
+  .delMemberDialog{      //删除对话框
       .el-dialog{
-          width: 600px;
-          border-radius: 5px;
-          overflow: hidden;
+        border-radius: 5px;
+        overflow: hidden;
+      }
+      .deleteContent{
+        margin: 30px 0;
+        font-size: 22px;
+        color: #000;
+      }
+      .el-dialog__header{
+        background: #32455b;
+        display: flex;
+        justify-content: center;
+      }
+      .el-dialog__title{
+        color:#fff;
+        font-size: 22px;
+        position: relative;
+        top: -5px;
+      }
+      .el-dialog__body{
+        display: flex;
+        justify-content: center;
+      }
+      .dialog-footer{
+        display: flex;
+        justify-content: center;
+        box-sizing: border-box;
+        .btn5{
+          font-size: 16px;
         }
+      }
+    }
 
-        .el-dialog__body{
-          display: flex;
-          align-items: center;
-          flex-direction: column;
-        }
-        
-        .el-dialog__header{
-          background: #32455b;
-          text-align: center;
-        }
-        .el-dialog__title{
-          color: #fff;
-          position: relative;
-          top: -5px;
-          font-size: 18px;
-        }
-        .littleBlock{   //添加对话框 label和input框
-            display: flex;
-            width: 70%;
-            margin-top: 20px;
-            .dialogLabel{      //label
-              max-width: 60px;
-              min-width: 65px;
-              font-size: 16px;
-              margin-right: 10px;
-              display: inline-block;
-              text-align: justify;
-              text-justify:distribute-all-lines;
-              text-align-last: justify;
-              transform: translate(0,22%);
-            }
-          }
-        .footer{
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          [type="button"]{
-            font-size: 16px;
-          }
 
-        }
-  }
   //项目修改对话框开始
   .projectApplicationfundAddDialog{  
  
  .el-dialog__header{
    border-radius: 10px 10px 0 0;
+    background: #32455b;
+
  }
  .el-dialog{
    border-radius:10px ;
@@ -584,12 +605,12 @@
    top: 10px;
    text-align: center;
  }
- .el-dialog__header{
- background: #32455b;
- }
+
  .el-dialog__title{
    font-size: 22px;
    color:rgb(246, 247, 246);
+   display: flex;
+   justify-content: center;
  }
  .addDialogMid{
    box-sizing: border-box;
@@ -628,6 +649,5 @@
  }
 }
 }
-//项目修改对话框结束
 }
 </style>

+ 17 - 17
src/views/projectManage/ProjectManagement.vue

@@ -107,7 +107,7 @@
 
             <div class="classBlockBtn">
               <el-button type="primary" class="bt1" size="mini" @click="scheduleDetail(item.courseId)">进度详情</el-button>
-              <el-button type="primary" class="bt1" size="mini" @click="fundStatus">资金情况</el-button>
+              <el-button type="primary" class="bt1" size="mini" @click="fundStatus(item.courseId)">资金情况</el-button>
               <el-button type="primary" class="bt1" size="mini" @click="finish">结项</el-button>
             </div>
        
@@ -137,7 +137,7 @@
           items:[],      //项目列表数据
           table:{         // 分页数据
             total:0,
-            packageSize:4,
+            packageSize:8,
             currentPage:1
           },   
           options:{    //头部搜索框下拉框数据
@@ -175,12 +175,12 @@
       },
       methods:{
         scheduleDetail(val){      //进度详情
-          console.log(val);
-          localStorage.setItem('pid',JSON.stringify(val))
-          this.$router.push('/ProjectManagement1')
+          // console.log(val);
+          // localStorage.setItem('pid',JSON.stringify(val))
+          this.$router.push(`/ProjectManagement1?Id=${val}`)
         },
-        fundStatus(){     //资金情况
-          this.$router.push('/ProjectManagementFund1')
+        fundStatus(Id){     //资金情况
+          this.$router.push(`/ProjectManagementFund1?Id=${Id}`)
         },
         init(){       //对话框重置
           
@@ -245,11 +245,11 @@
 .ProjectManagement{
   .pagination{
     float: right;
-    margin: 20px 85px 10px;
+    margin: 0px 85px 10px;
   }
     .projectBlock{   //大框
       width: 100%;
-      height: 350px;
+      height: 560px;
       display: flex;
       overflow: hidden;
       flex-wrap: wrap;
@@ -258,9 +258,9 @@
           flex-shrink: 0;
           overflow: hidden;
           position: relative;
-          margin-right: 30px;
-          margin-bottom: 15px;
-          width: 310px;height: 300px;
+          margin-right: 20px;
+          margin-bottom: 5px;
+          width: 320px;height: 260px;
           background-color: rgb(255, 255, 255);
           box-shadow: 1px 2px 3px #ccc;
           border: 1px solid #ccc;
@@ -284,17 +284,17 @@
             // font-size: 14px;
           }
           img{
-            width: 100%;height: 150px;
+            width: 100%;height: 125px;
           }
 
           .classBlock1{   //中间栏
             margin-bottom: 10px;
-            margin-top: 5px;
+            margin-top: 0px;
             box-sizing: border-box;
             padding: 0 5px;
             .classBlock2{   //项目名称
               margin-left: 5px;
-              margin-bottom: 5px;
+              margin-bottom: 4px;
               margin-top: 4px;
               text-align: left;
               font-size: 18px;
@@ -304,12 +304,12 @@
               padding: 0 5px;
               font-size: 16px;
               width: 100%;
-              margin-top: 6px;
+              margin-top: 4px;
               display: flex;
               justify-content: space-between;
             }
             .classBlock4{  //博客、编号
-              margin-top: 8px;
+              margin-top: 4px;
             }
           }
 

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

@@ -121,17 +121,17 @@
           >
         </el-table-column>
         
-        <!-- <el-table-column
+        <el-table-column
           prop="operation"
           align="center"
           label="操作"
           >
-          <template #default="scope">
+          <!-- <template #default="scope"> -->
               <div class="operations">
                       <el-button type="primary" class="bt1" size="mini" style="background: #477edd">查看详情</el-button>
               </div>
-          </template>
-        </el-table-column> -->
+          <!-- </template> -->
+        </el-table-column>
       </el-table>
     <!-- 项目成员区域结束 -->
 
@@ -255,6 +255,8 @@
         this.getData();
         this.getProjectDepartmentData();
         this.getProjectTypeData();
+        // this.$route.query["Id"]
+        // console.log(this.$route.query["Id"])  //获取传递过来的项目id方法
       }
     }
 </script>

+ 76 - 13
src/views/projectManage/ProjectManagement3.vue

@@ -26,52 +26,54 @@
         tooltip-effect="dark"
         stripe
         width="100%"
+        style="height: 550px;"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
        
         <el-table-column
-          prop="projectName"
+          prop="title"
           label="活动名称"
           align="center"
           >
         </el-table-column>
         
         <el-table-column
-          prop="person"
+          prop="pro_leader"
           label="负责人"
-          min-width="60%"
           align="center"
           >
         </el-table-column>
        
         <el-table-column
-          prop="relationProject"
+          prop="PName"
           label="关联项目"
-          min-width="60%"
           align="center"
           >
         </el-table-column>
         <el-table-column
-          prop="fund"
+          prop="money"
           label="预算经费"
-          min-width="30%"
-
           align="center"
           >
         </el-table-column>
    
         <el-table-column
-          prop="section"
+          prop="name"
           label="所在部门"
+          width="140"
           align="center"
           >
         </el-table-column>
         <el-table-column
           prop="date"
+          width="160"
           label="活动时间"
           align="center"
           >
+          <template #default="scope">
+            {{ GetTime(scope.row.begin_at)}}
+          </template>
         </el-table-column>
 
 
@@ -83,7 +85,7 @@
           >
           <template #default="scope">
               <div class="operations">
-                      <el-button type="primary"  size="mini" @click="detail(scope)" style="background: #477edd">查看详情</el-button>
+                      <el-button type="primary"  size="mini" @click="detail(scope.row.acId)" style="background: #477edd">查看详情</el-button>
                       <el-button type="primary"  size="mini" style="background: #477edd">申请表</el-button>
               </div>
           </template>
@@ -91,6 +93,18 @@
         </el-table>
       </div>
       <!-- 表格部分结束 -->
+          <!-- 分页 -->
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="table.currentPage"
+            :page-size="table.packageSize"
+            layout=" prev, pager, next"
+            background
+            class="pagination"
+            :total="table.total">
+          </el-pagination>
+        <!-- 分页结束 -->
+
     </div>
   </template>
   
@@ -99,9 +113,55 @@
         data() {
           return {
             tableData:[],    //项目列表数据
+            table:{         // 分页数据
+              total:0,
+              packageSize:9,
+              currentPage:1
+            },   
           }
         },
         methods:{
+          getData(){
+            let param={
+              uid:this.$store.state.userInfo.userid,
+              pid:JSON.parse(localStorage.getItem('pid')),
+              cid:0,
+              leader:'',
+              state:99,
+              page:this.table.currentPage,
+              lim:this.table.packageSize
+            }
+            this.ajax
+                  .get(this.$store.state.api+'/GetAllActivity',param)
+
+                  .then(res=>{
+                    console.log(res.data);
+                    this.tableData=res.data[0]
+                    this.table.total=res.data[4][0].total
+                  },err=>{
+                    console.log(err);
+                  })
+          },
+          GetTime(data){
+          let cdata = JSON.parse(data);
+          if(cdata[0]==cdata[1])return cdata[0];
+          let sp1 = cdata[0].split('-')
+          let sp2  =cdata[1].split('-')
+          if(sp1[0]==sp2[0]){
+            if(sp1[1]==sp2[1]){
+              return `${sp1[0]}-${sp1[1]}-${sp1[2]} 至 ${sp2[2]}`
+            }else{
+              return `${sp1[0]}-${sp1[1]}-${sp1[2]} 至 ${sp2[1]}-${sp2[2]}`
+            }           
+          }else{
+            return cdata[0]+" 至 "+cdata[1]
+          }
+        },
+          handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
+          // console.log(`当前页: ${val}`);
+          this.table.currentPage=val
+          this.getData()
+        },
           content(){
             this.$router.push('/ProjectManagement1')
           },
@@ -124,15 +184,18 @@
             this.$router.push('/ProjectManagement3_1')
           },    
         },
-        created(){
-          
+        mounted(){
+          this.getData()
         }
       }
   </script>
   
   <style lang="less">
   .ProjectManagement3{
-
+    .pagination{   //分页
+      float: right;
+      margin: 20px 0px 10px;
+    }
 
     .projectBlock{
       margin-top: 20px;