[完善]完善报表统计

proxy.config.json

@@ -1,6 +1,6 @@
 {
     "/api": {
-      "target": "http://39.106.78.171:8000",
+      "target": "http://121.36.37.70:8201",
       "secure": false,
       "changeOrigin": true
     }

src/app/statistic-analysis/combined-query/combined-query.component.ts

@@ -223,8 +223,8 @@ export class CombinedQueryComponent implements OnInit {
   preparelevel = [1] //单位状态
   plcheck: boolean //编制级别勾选框
   planCategory = [] //预案级别
-  integritySort = 1 //单位排序字段
+  integritySort //单位排序字段
-  yuanintegritySort = 1 //预案排序字段
+  yuanintegritySort  //预案排序字段
   isMasklayer = false
   async getAllPlanInfo() {
     console.log(this.preparelevel)
@@ -236,8 +236,8 @@ export class CombinedQueryComponent implements OnInit {
       TimeIntervalEnd: this.dwendtime || '',
       BuildingTypeIds: this.unittype || [],
       CompanyStatuses: this.preparelevel || [],
-      SortBy: 'totalCount',
+      SortBy: this.integritySort ? 'totalCount' : '',
-      SortType: this.integritySort
+      SortType: this.integritySort || ''
     }
     let yuandata = {
       QueryMode: this.preparelevels,
@@ -247,8 +247,8 @@ export class CombinedQueryComponent implements OnInit {
       TimeIntervalEnd: this.yuanendtime || '',
       PlanCategories: this.planCategory || [],
       PlanTypes: this.reservePlanType || [],
-      SortBy: 'totalCount',
+      SortBy: this.yuanintegritySort ? 'totalCount' : '',
-      SortType: this.yuanintegritySort
+      SortType: this.yuanintegritySort || ''
     }
     // console.log(666, paramsdata)
     this.isMasklayer = true
@@ -434,6 +434,8 @@ export class CombinedQueryComponent implements OnInit {
   //重置
   reset() {
     this.orRecord = []
+    this.integritySort = ''
+    this.yuanintegritySort = ''
     if (this.preparelevels == 0) {
       this.js = this.organizationName
       this.jsId = this.organizationId