lhd

ipself-web/app/base/controller/impl/patentycCtl.js

@@ -20,14 +20,19 @@ class PatentycCtl extends CtlBase {
   async obtainreport(pobj,obj,req){
   async obtainreport(pobj,obj,req){
     var result = await this.service.obtainreport(obj);
     var result = await this.service.obtainreport(obj);
     return System.getResult2(result,null);
     return System.getResult2(result,null);
-  }  
+  }
+  
+  async reportGeneration(pobj, obj, req) {//导出报告
+    var result = await this.service.reportGeneration(obj);
+    return System.getResult2(result, null);
+  };
 
 
   //申请人分析-申请人排名
   //申请人分析-申请人排名
   async applierRank(pobj, obj, req) {
   async applierRank(pobj, obj, req) {
     var result = await this.service.applierRank(obj);
     var result = await this.service.applierRank(obj);
     return System.getResult2(result, null);
     return System.getResult2(result, null);
   };
   };
-  
+
   //申请人分析-申请人归属国分析
   //申请人分析-申请人归属国分析
   async applierCity(pobj, obj, req) {
   async applierCity(pobj, obj, req) {
     var result = await this.service.applierCity(obj);
     var result = await this.service.applierCity(obj);
@@ -117,11 +122,6 @@ class PatentycCtl extends CtlBase {
     return System.getResult2(result, null);
     return System.getResult2(result, null);
   };
   };
 
 
-  async reportGeneration(pobj, obj, req) {//导出报告
-    var result = await this.service.reportGeneration(obj);
-    return System.getResult2(result, null);
-  };
-
   async mainCountryApplyTrend(pobj, obj, req) {//区域分析-主要国家申请趋势
   async mainCountryApplyTrend(pobj, obj, req) {//区域分析-主要国家申请趋势
     var result = await this.service.mainCountryApplyTrend(obj);
     var result = await this.service.mainCountryApplyTrend(obj);
     return System.getResult2(result, null);
     return System.getResult2(result, null);
@@ -471,7 +471,7 @@ class PatentycCtl extends CtlBase {
             }
             }
           }
           }
           var pubstatus = "";
           var pubstatus = "";
-          if (patentinfo1.data.hits[i]._source.pub_status != null) {
+          if (patentinfo1.data.hits[i]._source.pub_status != null){
             pubstatus = patentinfo1.data.hits[i]._source.pub_status;
             pubstatus = patentinfo1.data.hits[i]._source.pub_status;
           }
           }
           var item = {
           var item = {
@@ -483,7 +483,7 @@ class PatentycCtl extends CtlBase {
             applydate: patentinfo1.data.hits[i]._source.filing_time,
             applydate: patentinfo1.data.hits[i]._source.filing_time,
             publishdate: publish_date,
             publishdate: publish_date,
             articletype: patentinfo1.data.hits[i]._source.pub_type,
             articletype: patentinfo1.data.hits[i]._source.pub_type,
-            pubstatus: pubstatus
+            pubstatus:pubstatus
           }
           }
           patent1.push(item);
           patent1.push(item);
         }
         }
@@ -525,7 +525,7 @@ class PatentycCtl extends CtlBase {
             applydate: patentinfo2.data.hits[i]._source.app_date,
             applydate: patentinfo2.data.hits[i]._source.app_date,
             publishdate: patentinfo2.data.hits[i]._source.pub_date,
             publishdate: patentinfo2.data.hits[i]._source.pub_date,
             articletype: patentinfo2.data.hits[i]._source.pub_type,
             articletype: patentinfo2.data.hits[i]._source.pub_type,
-            pubstatus: ""
+            pubstatus:""
           }
           }
           patent2.push(item);
           patent2.push(item);
         }
         }
@@ -980,7 +980,7 @@ class PatentycCtl extends CtlBase {
           var pubstatus = "";
           var pubstatus = "";
           if (patentinfo1.data.hits[i]._source.pub_status != null) {
           if (patentinfo1.data.hits[i]._source.pub_status != null) {
             pubstatus = patentinfo1.data.hits[i]._source.pub_status;
             pubstatus = patentinfo1.data.hits[i]._source.pub_status;
-          }
+          }      
           var item = {
           var item = {
             applynum: patentinfo1.data.hits[i]._source.filing_no,
             applynum: patentinfo1.data.hits[i]._source.filing_no,
             publishnum: publish_num,
             publishnum: publish_num,

ipself-web/app/front/entry/main.ejs

@@ -54,7 +54,7 @@
 		overflow-x:hidden;
 		overflow-x:hidden;
 	}
 	}
 	#header {
 	#header {
-		display: none;
+		/* display: none; */
 	}
 	}
 	.app-header{
 	.app-header{
 		min-width: 1200px;
 		min-width: 1200px;