zy 1 éve
szülő
commit
e4a1a5890e

+ 27 - 18
neim-ui/src/views/manualEntry/projectEvolveEntry/index.vue

@@ -15,8 +15,11 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" align="center">
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <el-button @click="uploadEvolve(scope.row)" slot="trigger" size="mini" type="text" icon="el-icon-upload2">上传进展</el-button>
-            <el-button icon="el-icon-download" :loading="exportLoading" @click="handleAllExport(scope.row)" type="text" size="small">下载最新进展
+            <el-button @click="uploadEvolve(scope.row)" slot="trigger" size="mini" type="text" icon="el-icon-upload2">
+              上传进展
+            </el-button>
+            <el-button icon="el-icon-download" :loading="exportLoading" @click="handleAllExport(scope.row)" type="text"
+                       size="small">下载最新进展
             </el-button>
             </el-button>
             <!--            <el-button icon="el-icon-upload2" @click="handleClick(scope.row)" type="text" size="small"></el-button>-->
             <!--            <el-button icon="el-icon-upload2" @click="handleClick(scope.row)" type="text" size="small"></el-button>-->
             <el-button icon="el-icon-upload2" @click="handleClick(scope.row)" type="text" size="small">上传附件</el-button>
             <el-button icon="el-icon-upload2" @click="handleClick(scope.row)" type="text" size="small">上传附件</el-button>
@@ -85,8 +88,9 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import {getProjectInfo,projectProgressParse,uploadProjectAnnex} from "@/api/biz/manualEntry/projectEvolveEntry";
+import {getProjectInfo, projectProgressParse, uploadProjectAnnex} from "@/api/biz/manualEntry/projectEvolveEntry";
 import download from '@/plugins/download'
 import download from '@/plugins/download'
+
 export default {
 export default {
   // 项目进展录入
   // 项目进展录入
   name: "index",
   name: "index",
@@ -95,8 +99,8 @@ export default {
       row: '',
       row: '',
       tableData: [],
       tableData: [],
       dialogVisible: false,
       dialogVisible: false,
-      fjDialogVisible:false,
-      exportLoading:false,
+      fjDialogVisible: false,
+      exportLoading: false,
       page: {
       page: {
         total: 0, // 总页数
         total: 0, // 总页数
         currentPage: 1, // 当前页数
         currentPage: 1, // 当前页数
@@ -109,12 +113,12 @@ export default {
   },
   },
   methods: {
   methods: {
     initInfo() {
     initInfo() {
-      getProjectInfo().then(res=>{
+      getProjectInfo().then(res => {
         console.log(res.data)
         console.log(res.data)
         this.tableData = res.data
         this.tableData = res.data
         this.page.total = this.tableData.length
         this.page.total = this.tableData.length
-      }).catch(err=>{
-        console.log('获取项目信息异常:'+err)
+      }).catch(err => {
+        console.log('获取项目信息异常:' + err)
       })
       })
     },
     },
     beforeUpload(file) {
     beforeUpload(file) {
@@ -162,7 +166,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    uploadEvolve(row){
+    uploadEvolve(row) {
       this.row = row
       this.row = row
       this.dialogVisible = true
       this.dialogVisible = true
     },
     },
@@ -174,13 +178,17 @@ export default {
     handleAllExport(row) {
     handleAllExport(row) {
       this.exportLoading = true
       this.exportLoading = true
       download.exportAllData("/manualEntry/exportProjectEvolve", row.id);
       download.exportAllData("/manualEntry/exportProjectEvolve", row.id);
-      this.downPdfTimer = setInterval(() => {
-        if (Cookies.get('exportLoading')) {
-          this.exportLoading = false
-          clearInterval(this.downPdfTimer)
-          Cookies.remove("exportLoading");
-        }
-      }, 500)
+      setInterval(() => {
+        this.exportLoading = false
+      }, 5000)
+
+      // this.downPdfTimer = setInterval(() => {
+      //   if (Cookies.get('exportLoading')) {
+      //
+      //     clearInterval(this.downPdfTimer)
+      //     Cookies.remove("exportLoading");
+      //   }
+      // }, 500)
     },
     },
     /*pageSize改变*/
     /*pageSize改变*/
     handleSizeChange(val) {
     handleSizeChange(val) {
@@ -206,10 +214,11 @@ export default {
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
-.operateDiv{
+.operateDiv {
   display: flex;
   display: flex;
 }
 }
-.block{
+
+.block {
   float: right;
   float: right;
   margin: 1%;
   margin: 1%;
 }
 }