lhd

ipop-web/app/front/vues/pages/patentanalysis/patentanalysis.js

@@ -2,6 +2,7 @@
     template: '${tmpl}',
     template: '${tmpl}',
         data: function() {
         data: function() {
             return {
             return {
+                Reporttype: false,
                 dataUid: '735f9cd0-c103-11ea-9ecd-1d1c3e85a974',
                 dataUid: '735f9cd0-c103-11ea-9ecd-1d1c3e85a974',
                 timer: 0,
                 timer: 0,
                 srcIframe: '',
                 srcIframe: '',
@@ -2864,7 +2865,12 @@
             }else if (this.activeMenu >= "10") {
             }else if (this.activeMenu >= "10") {
                 console.log(this.dimensionListObj1[key - 10].name);
                 console.log(this.dimensionListObj1[key - 10].name);
                 this.method = this.dimensionListObj1[key - 10].name;
                 this.method = this.dimensionListObj1[key - 10].name;
-                this.ezReportUploadData();
+                if (this.Reporttype) {
+                    this.ezGetReport()
+                }else {
+                    this.ezReportUploadData();
+                }
+                
                 setTimeout(()=> {this.reinitIframe()}, 3000);
                 setTimeout(()=> {this.reinitIframe()}, 3000);
             }
             }
         },
         },
@@ -7095,9 +7101,8 @@
                 console.log(d);
                 console.log(d);
                 if(d.status == 0){
                 if(d.status == 0){
                     loadingbyc.close();
                     loadingbyc.close();
-                    /*clearInterval(that.timer);*/
+                    that.Reporttype = true;
                     that.ezGetReport()
                     that.ezGetReport()
-
                 }else{
                 }else{
                   if (that.timer == 20) {
                   if (that.timer == 20) {
                     loadingbyc.close();
                     loadingbyc.close();