Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-10-11 7de73ebd2bc07a51f0f9db031d6f616bdcfe549c

 web_src/src/components/dialog/recordDownload.vue

old mode 100644
new mode 100755
@@ -7,6 +7,7 @@
      </el-col>
      <el-col :span="6" >
        <el-button icon="el-icon-download" v-if="percentage < 100" size="mini" title="点击下载可将以缓存部分下载到本地" @click="download()">停止缓存并下载</el-button>
        <el-button icon="el-icon-download" v-if="downloadFile" size="mini" title="点击下载" @click="downloadFileClientEvent()">点击下载</el-button>
      </el-col>
    </el-row>
  </el-dialog>
@@ -21,7 +22,7 @@
export default {
    name: 'recordDownload',
    created() {

      window.addEventListener('beforeunload', this.stopDownloadRecord)

    },
    data() {
@@ -39,7 +40,8 @@
          taskId: null,
          getProgressRun: false,
          getProgressForFileRun: false,
          timer: null
          timer: null,
          downloadFile: null,

        };
    },
@@ -187,8 +189,9 @@
                this.percentage = parseFloat(res.data.data[0].percentage)*100
                 if (res.data.data[0].percentage === '1') {
                   this.getProgressForFileRun = false;
                   window.open(res.data.data[0].downloadFile)
                   this.close();
                   this.downloadFile = res.data.data[0].downloadFile
                   this.title = "文件处理完成，点击按扭下载"
                   // window.open(res.data.data[0].downloadFile)
                 }else {
                   if (callback)callback()
                 }
@@ -196,7 +199,13 @@
          }).catch(function (error) {
            console.log(error);
          });
        }
        },
      downloadFileClientEvent: function (){
        window.open(this.downloadFile )
      }
    },
    destroyed() {
      window.removeEventListener('beforeunload', this.stopDownloadRecord)
    }
};
</script>