diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index 8f8b8593e..d0f0f924a 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -29,9 +29,13 @@
@@ -269,8 +273,12 @@
@@ -391,24 +399,22 @@
// download_file(){
// this.params.type='all'
// },
- jugeExport(){
- if(typeof this.tableData=="undefined" || this.tableData=="null" || this.tableData==""){
- // let self=this;
- return
- }
- else{
- // let self=this;
- this.downLoadSrc= '../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi';
- }
+ popMark(){
+ alert("数据为空时,不能下载!")
},
exportData(){
// this.getOneProList(this.pro_id,'all',true,7)
// this.getOneProList(this.pro_id,'all',false,7)
// this.fileName()
- this.currentPage=1
- var saveFileName = this.getFileName()
- export2Excel(this.columns,this.tableDataID,saveFileName)
+ if (this.tableDataID!=''){
+ this.currentPage=1
+ var saveFileName = this.getFileName()
+ export2Excel(this.columns,this.tableDataID,saveFileName)
+ }else{
+ alert("数据为空时,不能下载!")
+ }
+
},
getFileName(){
diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue
index 147751e7c..6ce10c7a7 100755
--- a/web_src/js/components/UserAnalysis.vue
+++ b/web_src/js/components/UserAnalysis.vue
@@ -27,8 +27,12 @@
-
- 下载报告
+
+
+
+ 下载报告
+ 下载报告
+
@@ -183,6 +187,9 @@
},
methods: {
+ popMark(){
+ alert("数据为空时,不能下载!")
+ },
exportData(){
// this.getUserList('all_usr',7)
var saveFileName = this.getFileName()