Browse Source

bug修改

ljb 8 months ago
parent
commit
ffc58260cc

+ 10 - 0
src/api/achiveManage/archiveList.js

@@ -9,3 +9,13 @@ export const getList = (params) => {
     }
   })
 }
+
+export const downAllFile = (params) => {
+  return request({
+    url: '/api/kd-scientific/archive/center/download',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}

+ 10 - 2
src/api/common.js

@@ -6,13 +6,17 @@ import { Message } from 'element-ui';
  * @param url 接口地址
  * @param params 接口参数
  */
-export const exportBlob = (url, params) => {
+export const exportBlob = (url, params, onDownloadProgress) => {
   return new Promise((resolve, reject) => {
     request({
       url: url,
       params,
       method: 'get',
       responseType: 'blob',
+      onDownloadProgress: (progressEvent) => {
+        const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+        onDownloadProgress && onDownloadProgress(progress);
+      }
     }).then(res => {
       if (res.data.type.indexOf('json') > -1) {
         let reader = new FileReader();
@@ -28,13 +32,17 @@ export const exportBlob = (url, params) => {
   });
 }
 
-export const exportBloByPost = (url, data) => {
+export const exportBloByPost = (url, data, onDownloadProgress) => {
   return new Promise((resolve, reject) => {
     request({
       url: url,
       data,
       method: 'post',
       responseType: 'blob',
+      onDownloadProgress: (progressEvent) => {
+        const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+        onDownloadProgress && onDownloadProgress(progress);
+      }
     }).then(res => {
       if (res.data.type.indexOf('json') > -1) {
         let reader = new FileReader();

+ 6 - 4
src/views/RD-system-manage/list.vue

@@ -49,7 +49,7 @@
           :disabled="!row.isDel"
           @click="rowDel(row)"
         >
-          删 除
+          清除附件
         </el-button> 
       </template>
 
@@ -241,12 +241,14 @@ export default window.$crudCommon({
     Object.keys(data).forEach(fileType => {
       if (data[fileType].length) {
         data[fileType].forEach(item => {
+          let zdwjdz = !!item.zdwjdz ? JSON.parse(item.zdwjdz) : [];
+          let zdsszm = !!item.zdwjdz ? JSON.parse(item.zdwjdz) : [];
           newList.push({
             wjlx: fileType,
             ...item,
-            zdwjdz: !!item.zdwjdz ? JSON.parse(item.zdwjdz) : [],
-            zdsszm: !!item.zdsszm ? JSON.parse(item.zdsszm) : [],
-            isDel: true
+            zdwjdz,
+            zdsszm,
+            isDel: zdwjdz.length || zdsszm.length ? true : false,
           });
         });
       } else {

+ 8 - 4
src/views/archive-manage/archive-list.vue

@@ -68,6 +68,7 @@ import {getToken} from "@/util/auth";
 import {downloadXls, downloadFileByUrl} from "@/util/util";
 import moment from "moment";
 import { getDictValueByKey } from '@/api/system/dict';
+import { downAllFile } from "@/api/achiveManage/archiveList"
 import { mapGetters } from "vuex";
 
 
@@ -239,10 +240,13 @@ export default window.$crudCommon({
       downloadFileByUrl(file.value, file.label);
     },
     handleDownAll(downUrl) {
-      let downParams = { year: this.params.year };
-      exportBlob(`${downUrl}?${this.website.tokenHeader}=${getToken()}`, downParams).then(res => {
-        downloadXls(res.data, `${this.pageTitle}.zip`);
-      });
+      // let downParams = { year: this.params.year };
+      // exportBlob(`${downUrl}?${this.website.tokenHeader}=${getToken()}`, downParams).then(res => {
+      //   downloadXls(res.data, `${this.pageTitle}.zip`);
+      // });
+      downAllFile({ year: this.params.year }).then(res => {
+        console.log(res)
+      })
     },
     handleRowDown() {
       this.$message.warning("功能建设中...");

+ 3 - 3
src/views/archive-manage/file-supplement.vue

@@ -66,8 +66,6 @@ import {downloadXls, downloadFileByUrl} from "@/util/util";
 import moment from "moment";
 import { getDictValueByKey } from '@/api/system/dict';
 import { mapGetters } from "vuex";
-import JSZip from "jszip";
-import FileSaver from "file-saver";
 
 
 export default window.$crudCommon({
@@ -205,7 +203,9 @@ export default window.$crudCommon({
     },
     handleDownAll() {
       let downParams = { year: this.params.year };
-      exportBlob(`/api/kd-scientific/archive/fjbczl/download?${this.website.tokenHeader}=${getToken()}`, downParams).then(res => {
+      exportBlob(`/api/kd-scientific/archive/fjbczl/download?${this.website.tokenHeader}=${getToken()}`, downParams, (progress) => {
+        // console.log(progress)
+      }).then(res => {
         downloadXls(res.data, `${this.pageTitle}.zip`);
       });
     },

+ 1 - 1
src/views/project-manage/implement.vue

@@ -118,7 +118,7 @@ export default window.$crudCommon({
   },
   computed: {
     pageTitle() {
-      return `${this.selProject.xmmc || ''}阶段性报告列表`
+      return `${this.selProject.xmmc || ''}项目实施列表`
     }
   },
   created() {

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/zjtl-cost-summary-list.vue.vue

@@ -94,7 +94,7 @@ export default window.$crudCommon({
   methods: {
     // 合计
     summaryMethod({ columns, data }) {
-      return summaryMethod(columns, data, this.option.sumColumnList, 'XMMC');
+      return summaryMethod(columns, data, this.option.sumColumnList, 'xmmc');
     },
     loadData() {
       this.loading = true;