Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvity.vue

@@ -454,6 +454,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
           this.getData();
         },
         getData(){
+          this.loading = true;
           this.ajax.get(this.$store.state.api+"/GetAllActivity",{
             uid:this.$store.state.userInfo.userid,
             pid:this.pavalues.value,
@@ -474,6 +475,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
             this.options1 = data[2];
             this.options2 = data[3];
             this.Page.total = data[4][0]['total'];
+            this.loading = false;
           }).catch(err=>{
             this.$message.error(err.message)
           })

src/views/activityManage/makerActvityDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 创客创新-查看详细 -->
-     <div class="makerActvityDetails">
+     <div class="makerActvityDetails" v-loading="loading">
 
             <div class="vfpHeader">
               <div class="titleOne">活动详情</div>
@@ -571,6 +571,7 @@ export default {
         })
     },
     getData(){
+      this.loading = true;
       this.ajax.get(this.$store.state.api+"/GetActivityDetail",{
         uid:this.$store.state.userInfo.userid,
         aId:this.$route.query["Id"]
@@ -583,7 +584,7 @@ export default {
         data.reportFile = data.reportFile==''||data.reportFile==null?[]:JSON.parse(data.reportFile)
         this.tableData = data;
         this.oldMoney += Number(this.tableData.money)
-        console.log(this.tableData)
+        this.loading = false;
       }).catch(err=>{
         this.$message.error(err.message)
       })

src/views/credit/credit.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 学分登记 -->
-  <div class="credit">
+  <div class="credit" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">学分登记</div>
     </div>
@@ -191,6 +191,7 @@
           tableData:[],
           ScoreData:[],
           queryScoreDialog:false,
+          loading:false,
           pavalues:{
             value:'',
             value1:'',
@@ -213,6 +214,7 @@
           this.multipleSelection = val;
         },
         getData(){
+          this.loading = true;
           this.ajax.get(this.$store.state.api+"/GetProjectIsEndProject",{
             uid:this.$store.state.userInfo.userid,
             pid:this.pavalues.value,
@@ -230,6 +232,7 @@
             this.options3 = res.data[4]
             this.Page.total = res.data[5][0]['total']
             this.tableData = data;
+            this.loading = false;
           }).catch(err=>{
             console.log(err)
           })

src/views/credit/credit1.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 学分登记修改 -->
-    <div class="credit1">
+    <div class="credit1" v-loading="loading">
 
       <div class="vfpHeader">
         <div class="titleOne">学分登记</div>
@@ -159,6 +159,7 @@
         data() {
           return {
             changeScoreDialog:false,
+            loading:false,
             changeScoreTable:{
               id:"",
               class:"",
@@ -188,6 +189,7 @@
             this.changeScoreDialog = true;
           },
           getData(){
+            this.loading = true;
             this.ajax.get(this.$store.state.api+"/GetProjectEndByID",{
               uid:this.$store.state.userInfo.userid,
               pid:this.$route.query["Id"]
@@ -195,6 +197,7 @@
               let data = res.data[0][0]
               data['course_student'] = JSON.parse(data['course_student'])
               this.tableData = data;
+              this.loading = false;
             }).catch(err=>{
               console.log(err)
             })

src/views/firm.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 创业公司登记 -->
-  <div class="firm">
+  <div class="firm" v-loading="loading">
     <!-- <div class="pAHeader"> -->
       <!-- <div class="pAHeader1">创业公司登记</div> -->
     <!-- </div> -->
@@ -156,6 +156,7 @@ export default {
       accept: "*",
       // showFileType: 0,
       dialogVisible1: false,
+      loading:false,
       delId:"",
       input:"",
       tableData: [],
@@ -245,6 +246,7 @@ export default {
         });
     },
     getData() {
+      this.loading = true;
       this.tableData = [];
       this.ajax
         .get(this.$store.state.api + "/GetFirmFile", {
@@ -260,6 +262,7 @@ export default {
           });
           this.Page.total = res.data[1][0]["total"];
           this.progress.show = false;
+          this.loading = false;
         })
         .catch((err) => {
           console.log(err);

src/views/fundManage/makerfund.vue

@@ -542,6 +542,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
           this.getData()
         },
         getData(){
+          this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               filter:this.selectInp.filter,
@@ -563,6 +564,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
                   this.leaderSelects=data[3];
                   console.log(data[4][0]);
                   this.table.total=data[4][0].total
+                  this.loading = false;
                 },err=>{
                   console.log(err);
                 })

src/views/fundManage/makerfundDetails.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 创客资金申请表单 -->
-  <div class="makerfundApply">
+  <div class="makerfundApply" v-loading="loading">
     <div class="vfpHeader">
         <div class="titleOne">创客资金申请</div>
         <div class="smallTitle" style="left: 150px;">创客资金申请详情</div>
@@ -484,7 +484,7 @@ export default {
             // ], 
             status:'',   //审核状态
             auditDialog:false,   //审核按钮
-
+            loading:false,
             checkList: [],
             accept:"*",
             submitHint:false,   //提交按钮
@@ -1069,7 +1069,8 @@ export default {
             this.progress.show = false;
             // this.imageUrl=require("../../assets/img/jj.jpg")
         },
-        getData(){     
+        getData(){
+            this.loading = true;
             let param={
                 uid:this.$store.state.userInfo.userid,
             }
@@ -1079,6 +1080,7 @@ export default {
                 .then(res=>{
                     // console.log(res.data[0]);
                     this.projectFilter=res.data[0]
+                    this.loading = false;
                 },err=>{
                     console.log(err);
                 })

src/views/messageNotification.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 消息通知 -->
-  <div class="messageNotification">
+  <div class="messageNotification" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">消息通知</div>
     </div>
@@ -155,6 +155,7 @@
         },
       data() {
         return {
+          loading:false,
           customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
@@ -280,6 +281,7 @@
             // if(this.value==1){
             //   this.value=''
             // }
+            this.loading = true;
             let currentPage=this.table.currentPage;
             const param={
               uid:this.$store.state.userInfo.userid,
@@ -298,6 +300,7 @@
                 }
                 this.tableData=res.data[0];
                 this.table.total=res.data[1][0].total;
+                this.loading = false;
               },err=>{
                 console.log(err);
               })

src/views/projectApply/projectApplication.vue

@@ -451,6 +451,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
           this.$router.push('/projectApplicationApplyMain')
         },
         getData(){    //获取表格数据
+          this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,
             pid:this.selectInp.filter,  //筛选
@@ -476,7 +477,7 @@ import downloadFile from '@/components/tool/downloadFile.js';
                 a.sort=data[3];
                 a.person=data[4];
                 this.table.total=data[5][0].total
-                
+                this.loading = false;
               },err=>{
                 console.log(err);
               })  

src/views/projectApply/projectApplication2.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目立项申请查看详细项目详细 -->
-    <div class="projectApplication2">
+    <div class="projectApplication2" v-loading="loading">
 
         <div class="vfpHeader">
             <div class="titleOne">项目立项申请</div>
@@ -80,6 +80,7 @@ import { VueEditor } from "vue2-editor";
         data() {
           return {
             isUpload:'',
+            loading:false,
             data:[["","","","",""],[]],
             submitHint:false,
             customToolbar: [
@@ -120,6 +121,7 @@ import { VueEditor } from "vue2-editor";
             this.submitHint=false
           },
           getData(){   //初始化完成获取基本数据进行填充
+            this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid'))
@@ -131,7 +133,8 @@ import { VueEditor } from "vue2-editor";
                       this.isUpload=res.data[0][0].isupload;
                       let GetData=JSON.parse(res.data[0][0].chapters)
                       // console.log(GetData);
-                      this.data=GetData
+                      this.data=GetData;
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/projectApply/projectApplicationDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目立项申请查看详细项目基本内容 -->
-  <div class="projectApplication1">
+  <div class="projectApplication1" v-loading="loading">
     <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目立项申请</div>
@@ -286,6 +286,7 @@
           amendMemberDialog:false,
           addMemberDialog:false,
           submitHint:false,
+          loading:false,
           select:{    //数据详情框数据
             project:'',   
             person:'',
@@ -444,6 +445,7 @@
           this.$router.push('/projectApplication')
         },
         getData(){   //初始化完成获取基本数据进行填充
+          this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,
             pid:JSON.parse(localStorage.getItem('pid'))
@@ -464,6 +466,7 @@
                     this.select.departmentData = data['classid']
                     this.select.sort = data['typeid']
                     this.isUpload=data['isupload']
+                    this.loading = false;
                   },err=>{
                     console.log(err);
                   })

src/views/projectManage/ProjectManagement.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理页面 -->
-  <div class="ProjectManagement">
+  <div class="ProjectManagement" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">项目管理</div>
     </div>
@@ -73,6 +73,20 @@
           </el-option>
         </el-select>
       </div>
+
+      <div class="selectsBlock">
+        <span class="selectLabel">年份</span>
+        <el-select v-model="selectInp.year" @change="getData" placeholder="请选择">
+          <el-option label="所有年份" value=""></el-option>
+          <el-option
+            v-for="(item,index) in options.yearData"
+            :key="index"
+            :label="item.time"
+            :value="item.time">
+          </el-option>
+        </el-select>
+      </div>
+
       </div>
       <div class="ProjectManagementQuery">
         <el-input v-model="selectText" style="340px" placeholder="请输入项目名称"></el-input>
@@ -203,6 +217,7 @@ import beUpload from '../../components/tool/beUpload'
           endDialog:false,
           DelFileDialog:false,
           NoReportActivity:false,
+          loading:false,
           tit:'',    //完结框项目名称
           items:[],      //项目列表数据
           table:{         // 分页数据
@@ -241,6 +256,7 @@ import beUpload from '../../components/tool/beUpload'
                 label:"已审核"
               },
             ],
+            yearData:[],
           },
           selectInp:{     //select选定所显示的值 
             filter:'',     //不要带引号，select框是根据id来选择下面数据的
@@ -248,6 +264,7 @@ import beUpload from '../../components/tool/beUpload'
             sort:'',
             state:'',
             leader:'',
+            year:"",
           },
           file:[],
           checkActivityFinishData:[],
@@ -359,6 +376,7 @@ import beUpload from '../../components/tool/beUpload'
           this.getData()
         },
         getData(){        //获取渲染数据
+          this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,  //当前账号id
             pid:this.selectInp.filter,  //筛选
@@ -366,6 +384,7 @@ import beUpload from '../../components/tool/beUpload'
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.leader,  //负责人
             st:this.selectInp.state,  //审核状态
+            year:this.selectInp.year,
             textInp:this.selectText,
             page:this.table.currentPage,  //当前页
             lim:this.table.packageSize,  //限制获取几条数据
@@ -381,7 +400,9 @@ import beUpload from '../../components/tool/beUpload'
                 a.department=data[2];
                 a.sort=data[3];
                 a.person=data[4];
+                a.yearData = data[6]
                 this.table.total=data[5][0].total
+                this.loading = false;
               },err=>{
                 console.log(err);
               })  

src/views/projectManage/ProjectManagement1.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目基本内容 -->
-  <div class="ProjectManagement1">
+  <div class="ProjectManagement1" v-loading="loading">
     <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目管理</div>
@@ -161,6 +161,7 @@
             project:'',   
             person:'',
             departmentData:"",  //部门框值
+            loading:false,
             sort:'',     //分类值
             tel:'',
             Date:'',
@@ -175,6 +176,7 @@
       },
       methods:{
         getData(){   //初始化完成获取基本数据进行填充
+          this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,
             pid:JSON.parse(localStorage.getItem('pid'))
@@ -193,6 +195,7 @@
                     this.select.tel=data.phone;
                     this.select.departmentData = data['classid']
                     this.select.sort = data['typeid']
+                    this.loading = false;
                   },err=>{
                     console.log(err);
                   })

src/views/projectManage/ProjectManagement2.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目详细 -->
-    <div class="ProjectManagement2">
+    <div class="ProjectManagement2" v-loading="loading">
       <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目管理</div>
@@ -68,6 +68,7 @@ import { VueEditor } from "vue2-editor";
           return {
             data:[["","","","",""],[]],
             submitHint:false,
+            loading:false,
             customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
@@ -77,6 +78,7 @@ import { VueEditor } from "vue2-editor";
         },
         methods:{
           getData(){   //初始化完成获取基本数据进行填充
+            this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid'))
@@ -89,6 +91,7 @@ import { VueEditor } from "vue2-editor";
                       // console.log(GetData)
                       this.data=GetData
                       // console.log(this.data);
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/projectManage/ProjectManagement3.vue

@@ -125,6 +125,7 @@
           },
           getData(){
             // console.log(localStorage.getItem('pid'))
+            this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid')),
@@ -141,6 +142,7 @@
                     console.log(res.data);
                     this.tableData=res.data[0]
                     this.table.total=res.data[4][0].total
+                    this.loading = false;
                   },err=>{
                     console.log(err);
                   })
@@ -197,11 +199,6 @@
   
   <style lang="less">
   .ProjectManagement3{
-    .pagination{   //分页
-      // float: right;
-      // margin: 20px 0px 10px;
-    }
-
     .projectBlock{
       margin-top: 20px;
     }

src/views/projectManage/ProjectManagement3_1.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 活动开展 查看详细-->
-    <div class="ProjectManagement3_1">
+    <div class="ProjectManagement3_1" v-loading="loading">
       <div class="vfpHeader">
       <!-- 详情页 -->
           <div class="titleOne">项目管理</div>
@@ -255,6 +255,7 @@
         data() {
           return {
             updateActivity:false,
+            loading:false,
             isAddMember:1,
             state:0,
             customToolbar: [
@@ -292,6 +293,7 @@
         methods:{
         
               getData(){       //获取基础信息
+                this.loading = true;
                 this.ajax.get(this.$store.state.api+"/GetActivityDetail",{
                   uid:this.$store.state.userInfo.userid,
                   // aId:this.$route.query["Id"]
@@ -312,6 +314,7 @@
                   this.tableData=JSON.parse(data.course_teacher)
                   this.textareaS=JSON.parse(data.chapters)
                   this.state=data.state
+                  this.loading = false;
                 }).catch(err=>{
                   this.$message.error(err.message)
                 })

src/views/projectManage/ProjectManagement4.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目附件 -->
-    <div class="ProjectManagement4">
+    <div class="ProjectManagement4" v-loading="loading">
       <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目管理</div>
@@ -134,6 +134,7 @@
             //   packageSize:2,
             //   currentPage:1
             // }, 
+            loading:false,
             state:0,
             showFile:false,
             showFileType: 0,
@@ -210,6 +211,7 @@
         //   this.getData()
         // },
           getData(){       //获取基础信息
+            this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
@@ -228,6 +230,7 @@
                         k=JSON.parse(l)
                       });
                       this.tableData=k
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/projectManage/ProjectManagement5.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目结题附件 -->
-    <div class="ProjectManagement5">
+    <div class="ProjectManagement5" v-loading="loading">
       <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目管理</div>
@@ -132,6 +132,7 @@
             //   packageSize:8,
             //   currentPage:1
             // }, 
+            loading:false,
             state:0,
             showFile:false,
             showFileType: 0,
@@ -210,6 +211,7 @@
           //   this.getData()
           // },
           getData(){       //获取基础信息
+              this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
@@ -222,6 +224,7 @@
                       this.state=res.data[0][0].isupload;
                       let file = JSON.parse(res.data[0][0]['endFile']);
                       this.tableData=file
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/projectManage/ProjectManagementFund1.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目资金使用情况 -->
-  <div class="ProjectManagementFund1">
+  <div class="ProjectManagementFund1" v-loading="loading">
         <div class="vfpHeader">
             <div class="titleOne">预算经费</div>
             <el-button type="primary" @click="back">返回</el-button>
@@ -207,11 +207,12 @@
           textarea:'',
           input:'',
           value: '',
-
+          loading:false,
         }
       },
       methods:{
         getData(){   //初始化完成获取基本数据进行填充
+          this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid'))
@@ -234,6 +235,7 @@
                       this.remainFund=this.allFund - this.useFund
                       // console.log((this.useFund / 10000));
                       // console.log();
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/projectManage/ProjectManagementFund2.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 资金申报明细 -->
-    <div class="ProjectManagementFund2">
+    <div class="ProjectManagementFund2" v-loading="loading">
         <div class="vfpHeader">
             <div class="titleOne">预算经费</div>
             <el-button type="primary" @click="$router.push('/ProjectManagement')">返回</el-button>
@@ -80,7 +80,8 @@
       export default {
         data() {
           return {
-            tableData:[]
+            tableData:[],
+            loading:false,
           }
         },
         methods:{
@@ -91,6 +92,7 @@
             this.$router.push('/ProjectManagementFund2')
           },
           getData(){
+            this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               cid:JSON.parse(localStorage.getItem('pid'))
@@ -102,6 +104,7 @@
                 .then(res=>{
                     console.log(res.data[0]);
                     this.tableData=res.data[0]
+                    this.loading = false;
                 },err=>{
                     console.log(err);
                 })

src/views/projectSettlement/projectSettlement.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目结项 -->
-  <div class="projectSettlement">
+  <div class="projectSettlement" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">项目结项</div>
     </div>
@@ -195,6 +195,7 @@
       data() {
         return {
           submitHint:false,
+          loading:false,
           iid:'',
           tit:'',
           options:{    //头部搜索框下拉框数据
@@ -268,6 +269,7 @@
           this.getData()
         },
         getData(){    //获取表格数据
+          this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,
             pid:this.selectInp.filter,  //筛选
@@ -292,6 +294,7 @@
                 a.sort=data[3];
                 a.person=data[4];
                 this.table.total=data[5][0].total
+                this.loading = false;
               },err=>{
                 console.log(err);
               })  

src/views/projectSettlement/projectSettlement1.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目结项 项目基本内容 -->
-    <div class="projectSettlement1">
+    <div class="projectSettlement1" v-loading="loading">
 
         <!-- 详情页 -->
       <div class="vfpHeader">
@@ -169,6 +169,7 @@
               value: '选项1',
               label: '中德学院'
             }],
+            loading:false,
             select:{    //数据详情框数据
               project:'',   
               person:'',
@@ -193,6 +194,7 @@
         },
         methods:{
           getData(){
+            this.loading = true;
             let param={
             uid:this.$store.state.userInfo.userid,
             pid:JSON.parse(localStorage.getItem('pid'))
@@ -214,6 +216,7 @@
                     this.select.endTime=data.endTime
                     this.select.departmentData = data['classid']
                     this.select.sort = data['typeid']
+                    this.loading=false;
                   },err=>{
                     console.log(err);
                   })

src/views/projectSettlement/projectSettlement2.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目详细 -->
-    <div class="ProjectManagement2">
+    <div class="ProjectManagement2" v-loading="loading">
       <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目管理</div>
@@ -67,6 +67,7 @@ import { VueEditor } from "vue2-editor";
         data() {
           return {
             data:[["","","","",""],[]],
+            loading:false,
             submitHint:false,
             customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
@@ -77,6 +78,7 @@ import { VueEditor } from "vue2-editor";
         },
         methods:{
           getData(){   //初始化完成获取基本数据进行填充
+            this.loading = true;
             let param={
               uid:this.$store.state.userInfo.userid,
               pid:JSON.parse(localStorage.getItem('pid'))
@@ -88,6 +90,7 @@ import { VueEditor } from "vue2-editor";
                       let GetData=JSON.parse(res.data[0][0].chapters)
                       // console.log(GetData)
                       this.data=GetData
+                      this.loading = false;
                       // console.log(this.data);
                     },err=>{
                       console.log(err);

src/views/projectSettlement/projectSettlement3.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目附件 -->
-    <div class="ProjectManagement4">
+    <div class="ProjectManagement4" v-loading="loading">
       <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目管理</div>
@@ -129,6 +129,7 @@
             }, 
             // showFile:false,
             showFileType: 0,
+            loading:false,
             // showFileUrl: "",
             tableData:[],
             showFile: false,
@@ -192,6 +193,7 @@
           this.getData()
         },
           getData(){       //获取基础信息
+            this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
@@ -208,6 +210,7 @@
                         k=JSON.parse(l)
                       });
                       this.tableData=k
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/projectSettlement/projectSettlement4.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目管理 项目结题附件 -->
-    <div class="ProjectManagement5">
+    <div class="ProjectManagement5" v-loading="loading">
       <div class="vfpHeader">
       <!-- 详情页 -->
         <div class="titleOne">项目管理</div>
@@ -132,6 +132,7 @@
             //   currentPage:1
             // }, 
             showFileType: 0,
+            loading:false,
             tableData:[],  //附件列表
             file:'',    //上传文件数据
             showFile: false,
@@ -201,6 +202,7 @@
             this.getData()
           },
           getData(){       //获取基础信息
+            this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
@@ -217,6 +219,7 @@
                       // console.log(file)
                      
                       this.tableData=file
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/projectSettlement/projectSettlement5.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 项目结项 结项评语 -->
-    <div class="projectSettlement2">
+    <div class="projectSettlement2" v-loading="loading">
       <div class="vfpHeader">
           <div class="titleOne">项目管理</div>
           <div class="smallTitle" style="left: 100px;">项目详情</div>
@@ -169,6 +169,7 @@
           return {
             accept:"*",
             dialogVisible1:false,
+            loading:false,
             showFile:false,
             showFileType: 0,
             showFileUrl: "",
@@ -241,6 +242,7 @@
             },
 
             getData(){       //获取基础信息
+              this.loading = true;
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
@@ -255,6 +257,7 @@
                       if(JSON.parse(data[0].endProjectRemark)!=null){
                         this.AllRemark=JSON.parse(data[0].endProjectRemark)
                       }
+                      this.loading = false;
                     },err=>{
                       console.log(err);
                     })

src/views/resultShow/resultShowDetail.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 成果展示 项目成果展示 -->
-    <div class="rs1apply">
+    <div class="rs1apply" v-loading="loading">
         <!-- 头部展示区开始 -->
         <div class="header">
             <div class="imgBlock">
@@ -478,6 +478,7 @@
         data() {
           return {
             pageState:0,
+            loading:false,
             TitleMessage:{ClassName:"",EndTime:"",TypeName:"",beginTime:"",brief:"",course_student:[],image:"",pro_leader:"",title:""},
             DetailMessage:[],
             ProjectFile:[],
@@ -495,13 +496,13 @@
         },
         methods:{
             getData(){
+                this.loading = true;
                 this.ActivityLookFile = [];
                 this.ajax.get(this.$store.state.api+"/GetProjectDetailIsConclusion",{
                     uid:this.$store.state.userInfo.userid,
                     pid:this.$route.query["Id"]
                 }).then(res=>{
                     let FormData = res.data;
-                    console.log(FormData)
                     this.TitleMessage = FormData[0][0]
                     this.TitleMessage['course_student'] = JSON.parse(this.TitleMessage['course_student']);
                     this.DetailMessage= JSON.parse(FormData[1][0]['chapters'])[0];
@@ -521,8 +522,8 @@
                             }else this.ActivityLookFile.push({url:"",type:""})
                         })
                     };
-                    console.log(this.ActivityLookFile)
                     if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+                    this.loading = false;
                 }).catch(err=>{
                     console.log(err)
                 })

src/views/resultShow/resultsShow.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 成果展示 -->
-  <div class="resultsShow">
+  <div class="resultsShow" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">成果展示</div>
     </div>
@@ -138,6 +138,7 @@
           options2:[],
           options3:[],
           options4:[],
+          loading:false,
           pavalues:{
             value:0,
             value1:0,
@@ -161,6 +162,7 @@
           window.open(`/#/resultShowDetail?Id=${Id}`)
         },
         getData(){        //获取渲染数据
+          this.loading = true;
           let param={
             uid:this.$store.state.userInfo.userid,  //当前账号id
             pid:this.pavalues.value,  //筛选
@@ -175,7 +177,6 @@
           this.ajax    
             .get(this.$store.state.api+'/GetProjectIsConclusion',param)
               .then(res=>{
-                console.log(res)
                 let data = res.data;
                 this.items = data[0];
                 this.options = data[1];
@@ -183,6 +184,7 @@
                 this.options2 = data[3];
                 this.options3 = data[4];
                 this.Page.total = data[5][0]['total']
+                this.loading = false;
               },err=>{
                 console.log(err);
               })