权限新增

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.shReg.start.h" version="0.0.2" xmlns="http://www.w3.org/ns/widgets"
+<widget id="com.shReg.start.h" version="0.0.3" xmlns="http://www.w3.org/ns/widgets"
         xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>上海登记管理</name>
     <description>An awesome Ionic/Cordova app.</description>

src/app/app.constants.ts

-import * as Mock from 'mockjs';
// export const SERVER_API_URL = '/shfrdj';
export const SERVER_API_URL = 'http://218.242.131.175/shfrdj';

// export const SERVER_API_WEB = 'shfrdjweb';
export const SERVER_API_WEB = 'http://218.242.131.175/shfrdjweb';

// export const SERVER_API_BBWX = '/bbwx';
export const SERVER_API_BBWX = 'http://218.242.131.175/shfrdjweb';


Mock.setup(
    {
        timeout: 50,
    }
);

export const institutionalNature = [
    {label: '挂牌机构', value: '8'},
    {label: '内设机构', value: '7'},
    {label: '派驻机关', value: '6'},
    {label: '派出机构', value: '5'},
    {label: '分支机构', value: '4'},
    {label: '临时机构', value: '3'},
    {label: '议事协调机构', value: '2'},
    {label: '挂靠机构', value: '1'},
]
+import * as Mock from 'mockjs';
export const SERVER_API_URL = '/shfrdj';// export const SERVER_API_URL = 'http://218.242.131.175/shfrdj';

export const SERVER_API_WEB = 'shfrdjweb';
// export const SERVER_API_WEB = 'http://218.242.131.175/shfrdjweb';

export const SERVER_API_BBWX = '/bbwx';
// export const SERVER_API_BBWX = 'https://www.cesdj.cn/bbwx';


Mock.setup(
    {
        timeout: 50,
    }
);

export const institutionalNature = [
    {label: '挂牌机构', value: '8'},
    {label: '内设机构', value: '7'},
    {label: '派驻机关', value: '6'},
    {label: '派出机构', value: '5'},
    {label: '分支机构', value: '4'},
    {label: '临时机构', value: '3'},
    {label: '议事协调机构', value: '2'},
    {label: '挂靠机构', value: '1'},
]
\ No newline at end of file

src/pages/home/home.html

@@ -65,7 +65,7 @@
             <div #echart class="echart-pie"></div>
         </div>
         <div class="data">
-            <div class="table">
+            <div class="table" #table>
                 <table border="1">
                     <thead>
                     <tr>
@@ -77,14 +77,23 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr *ngFor="let item of unitsInfo">
+                    <ng-container *ngFor="let item of unitsInfo;let i = index">
+                        <tr>
                             <td>{{item.geo}}</td>
                             <td>{{type == 'unit' ? item.unitCount1 : type == 'bzrs' ? item.bzrs1 : item.syrs1}}</td>
                             <td>{{type == 'unit' ? item.unitCount2 : type == 'bzrs' ? item.bzrs2 : item.syrs2}}</td>
                             <td>{{type == 'unit' ? item.unitCount3 : type == 'bzrs' ? item.bzrs3 : item.syrs3}}</td>
                             <td>{{type == 'unit' ? item.unitTotal : type == 'bzrs' ? item.bzrsTotal : item.syrsTotal}}</td>
                         </tr>
-                    <tr>
+                        <tr style="border:1px solid #e3614d" *ngIf="i == 0">
+                            <td>区属合计:</td>
+                            <td>{{count.qscount1}}</td>
+                            <td>{{count.qscount2}}</td>
+                            <td>{{count.qscount3}}</td>
+                            <td>{{count.qscountTotal}}</td>
+                        </tr>
+                    </ng-container>
+                    <tr style="border:1px solid #e3614d">
                         <td>合计:</td>
                         <td>{{count.count1}}</td>
                         <td>{{count.count2}}</td>
@@ -95,5 +104,14 @@
                 </table>
             </div>
         </div>
+        <p class="toggle">
+            <span *ngIf="!isToggle" (click)="toggle(1)">展开
+                <ion-icon tappable name="arrow-down"></ion-icon>
+            </span>
+            <span *ngIf="isToggle" (click)="toggle(0)">收缩
+                <ion-icon tappable name="arrow-up"></ion-icon>
+            </span>
+        </p>
+
     </div>
 </ion-content>

src/pages/home/home.scss

@@ -118,4 +118,16 @@ page-home {
       padding: 2px;
     }
   }
+
+  .table {
+    height: 177px;
+    overflow: hidden;
+    transition: all 1s;
+  }
+
+  .toggle {
+    text-align: center;
+    padding: 10px 0;
+    color: #666666;
+  }
 }

src/pages/home/home.ts

@@ -24,6 +24,7 @@ import * as echarts from 'echarts';
 })
 export class HomePage {
     @ViewChild('echart') echart: ElementRef;//显示图形的容器
+    @ViewChild('table') table: ElementRef;
 
     echartData;
     type = 'unit';
@@ -38,12 +39,17 @@ export class HomePage {
     roles = [];
     count = {
         count1: 0,
+        qscount1: 0,
         count2: 0,
+        qscount2: 0,
         count3: 0,
+        qscount3: 0,
         countTotal: 0,
+        qscountTotal: 0,
     };
 
     yearList = [];
+    isToggle;
 
     constructor(public navCtrl: NavController, public homeSer: HomeService, private loadCtrl: LoadingController,
                 private commonSer: CommonService, private storage: Storage,
@@ -82,7 +88,7 @@ export class HomePage {
                 if (res.code == 0) {
                     this.unitsInfo = res.data;
                     this.switchEchart();
-                    this.countInfo()
+                    this.countInfo();
                 }
                 loading.dismiss();
             }
@@ -90,13 +96,27 @@ export class HomePage {
     }
 
     countInfo() {
+        this.count = {
+            count1: 0,
+            qscount1: 0,
+            count2: 0,
+            qscount2: 0,
+            count3: 0,
+            qscount3: 0,
+            countTotal: 0,
+            qscountTotal: 0,
+        };
         if (this.type == 'unit') {
             this.unitsInfo.forEach(e => {
                 this.count.count1 += e.unitCount1;
-                this.count.count2 += e.unitCount1;
-                this.count.count3 += e.unitCount1;
+                this.count.count2 += e.unitCount2;
+                this.count.count3 += e.unitCount3;
                 this.count.countTotal += e.unitTotal;
             })
+            this.count.qscount1 = this.count.count1 - this.unitsInfo[0].unitCount1;
+            this.count.qscount2 = this.count.count2 - this.unitsInfo[0].unitCount2;
+            this.count.qscount3 = this.count.count3 - this.unitsInfo[0].unitCount3;
+            this.count.qscountTotal = this.count.countTotal - this.unitsInfo[0].unitTotal;
         }
         if (this.type == 'bzrs') {
             this.unitsInfo.forEach(e => {
@@ -105,6 +125,10 @@ export class HomePage {
                 this.count.count3 += e.bzrs3;
                 this.count.countTotal += e.bzrsTotal;
             })
+            this.count.qscount1 = this.count.count1 - this.unitsInfo[0].bzrs1;
+            this.count.qscount2 = this.count.count2 - this.unitsInfo[0].bzrs2;
+            this.count.qscount3 = this.count.count3 - this.unitsInfo[0].bzrs3;
+            this.count.qscountTotal = this.count.countTotal - this.unitsInfo[0].bzrsTotal;
         }
         if (this.type == 'syrs') {
             this.unitsInfo.forEach(e => {
@@ -113,6 +137,10 @@ export class HomePage {
                 this.count.count3 += e.syrs3;
                 this.count.countTotal += e.syrsTotal;
             })
+            this.count.qscount1 = this.count.count1 - this.unitsInfo[0].syrs1;
+            this.count.qscount2 = this.count.count2 - this.unitsInfo[0].syrs2;
+            this.count.qscount3 = this.count.count3 - this.unitsInfo[0].syrs3;
+            this.count.qscountTotal = this.count.countTotal - this.unitsInfo[0].syrsTotal;
         }
     }
 
@@ -207,4 +235,15 @@ export class HomePage {
     goToPersonInfo() {
         this.navCtrl.push(PersonPage)
     }
+
+    //展开or收缩
+    toggle(type) {
+        if (type == 1) {
+            this.table.nativeElement.style.height = '625px';
+            this.isToggle = true;
+        } else {
+            this.table.nativeElement.style.height = '177px';
+            this.isToggle = false;
+        }
+    }
 }

src/pages/home/report-info/info-detail/info-detail.scss

@@ -15,4 +15,9 @@ page-info-detail {
   .year span {
     color: #4db50e;
   }
+
+  .item-box .left {
+    text-align: left;
+    padding-left: 6px;
+  }
 }

src/pages/home/report-info/year-report/year-report.html

@@ -63,7 +63,7 @@
         <div class="item-box">
             <div class="left">开展业务活动情况:</div>
             <div class="right">
-                <span [innerHTML]="reportObj?.kzywqk"></span>
+                <p [innerHTML]="reportObj?.kzywqk"></p>
             </div>
         </div>
         <div class="item-box">
@@ -106,13 +106,13 @@
         <div class="item-box">
             <div class="left">受奖惩评估及诉讼投诉情况:</div>
             <div class="right">
-                <span>{{ reportObj?.jctsqk || '无'}}</span>
+                <p [innerHTML]="reportObj?.jctsqk || '无'"></p>
             </div>
         </div>
         <div class="item-box">
             <div class="left">接受捐赠资助及其使用情况:</div>
             <div class="right">
-                <span>{{ reportObj?.jszcqk || '无'}}</span>
+                <p [innerHTML]="reportObj?.jszcqk || '无'"></p>
             </div>
         </div>
     </div>

src/pages/home/report-info/year-report/year-report.scss

@@ -8,4 +8,9 @@ page-year-report {
       padding: 2px;
     }
   }
+
+  .item-box .left {
+    text-align: left;
+    padding-left: 6px;
+  }
 }