app

src/components/search-filter/search-filter.ts

@@ -96,13 +96,13 @@ export class SearchFilterComponent {
     reset() {
         this.maleObj = {code: ''}
         this.lawIndustryObj = {code: ''}
-        this.areaList.map(x => x.active = true)
-        this.industryList.map(x => x.active = true)
-        this.fundingList.map(x => x.active = true)
-        this.causeList.map(x => x.active = true)
-        this.specificationsList.map(x => x.active = true)
-        this.natureList.map(x => x.active = true)
-        this.categoryList.map(x => x.active = true)
+        this.areaList.map(x => x.active = false)
+        this.industryList.map(x => x.active = false)
+        this.fundingList.map(x => x.active = false)
+        this.causeList.map(x => x.active = false)
+        this.specificationsList.map(x => x.active = false)
+        this.natureList.map(x => x.active = false)
+        this.categoryList.map(x => x.active = false)
     }
 
     //确定

src/pages/home/contact-detail/contact-detail.html

@@ -28,7 +28,7 @@
                 </div>
             </div>
         </ion-item>
-        <ion-item>
+        <ion-item *ngIf="personInfo.role != 4">
             <div class="info-item">
                 <span class="info-span">手机号</span>
                 <div class="info-item-content">

src/pages/home/contact-list/contact-list.html

@@ -17,7 +17,7 @@
                             <span class="contact-name">{{person.name}}</span>
                         </div>
                         <div>
-                            <span class="contact-handphone">手机：{{person.mobilePhone || "-"}}</span>
+                            <span *ngIf="role != 4" class="contact-handphone">手机：{{person.mobilePhone || "-"}}</span>
                             <span class="contact-telphone">座机：{{person.telPhone || "-"}}</span>
                         </div>
                     </div>

src/pages/home/contact-list/contact-list.ts

@@ -45,7 +45,7 @@ export class ContactListPage {
         this.homeSer.getOrgList(data).subscribe(
             (res) => {
                 this.page.list = res.list.user.filter(e => e.orderNum != "" && e.areacode == this.area.code);
-                res.list.user.map(x=> x.role == 4 ? x.mobilePhone = x.mobilePhone.replace(/^(.*).{4}$/, "$1****") : '')
+                res.list.user.map(x=> x.role == 4 ? x.telPhone = x.telPhone.replace(/^(.*).{4}$/, "$1****") : '')
                 this.page.noNumList = res.list.user.filter(e => e.orderNum == "" && e.areacode == this.area.code);
                 this.page.list.sort((a, b) => a.orderNum - b.orderNum);
                 console.log(this.page.list);

src/pages/home/data-report/data-report.html

@@ -7,7 +7,7 @@
 <ion-content>
     <div class="echart-title">
         <span>数据报表分类</span>
-        <ion-select [(ngModel)]="dataType" cancelText="取消" okText="确定" placeholder="选择">
+        <ion-select [(ngModel)]="dataType" cancelText="取消" okText="确定" placeholder="选择" (ngModelChange)="changeType(dataType)">
             <ion-option value="事业单位总览信息">事业单位总览信息</ion-option>
             <ion-option value="事业单位分类信息">事业单位分类信息</ion-option>
             <ion-option value="实名制上报率">实名制上报率</ion-option>
@@ -103,25 +103,34 @@
                         <thead>
                         <tr>
                             <th>隶属</th>
-                            <th>全额拨款</th>
-                            <th>差额拨款</th>
-                            <th>自收自支</th>
+                            <th>行政<br/>类</th>
+                            <th>参照<br/>行政类</th>
+                            <th>公益<br/>一类</th>
+                            <th>公益<br/>二类</th>
+                            <th>经营<br/>类</th>
+                            <th>暂缓<br/>分类</th>
                             <th>小计</th>
                         </tr>
                         </thead>
                         <tbody>
-                        <tr *ngFor="let item of unitsInfo">
-                            <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 *ngFor="let item of pieData">
+                            <td>{{item.geoApp}}</td>
+                            <td>{{type1 == '单位数(个)' ? item.unitCount1 : type1 == '编制人数(人)' ? item.bzrs1 : item.syrs1}}</td>
+                            <td>{{type1 == '单位数(个)' ? item.unitCount2 : type1 == '编制人数(人)' ? item.bzrs2 : item.syrs2}}</td>
+                            <td>{{type1 == '单位数(个)' ? item.unitCount3 : type1 == '编制人数(人)' ? item.bzrs3 : item.syrs3}}</td>
+                            <td>{{type1 == '单位数(个)' ? item.unitCount4 : type1 == '编制人数(人)' ? item.bzrs4 : item.syrs4}}</td>
+                            <td>{{type1 == '单位数(个)' ? item.unitCount5 : type1 == '编制人数(人)' ? item.bzrs5 : item.syrs5}}</td>
+                            <td>{{type1 == '单位数(个)' ? item.unitCount6 : type1 == '编制人数(人)' ? item.bzrs6 : item.syrs6}}</td>
+                            <td>{{type1 == '单位数(个)' ? item.unitTotal : type1 == '编制人数(人)' ? item.bzrsTotal : item.syrsTotal}}</td>
                         </tr>
                         <tr>
-                            <td>合计:</td>
+                            <td>合计</td>
                             <td>{{count.count1}}</td>
                             <td>{{count.count2}}</td>
                             <td>{{count.count3}}</td>
+                            <td>{{count.count4}}</td>
+                            <td>{{count.count5}}</td>
+                            <td>{{count.count6}}</td>
                             <td>{{count.countTotal}}</td>
                         </tr>
                         </tbody>

src/pages/home/data-report/data-report.ts

@@ -25,6 +25,9 @@ export class DataReportPage {
         count1: 0,
         count2: 0,
         count3: 0,
+        count4: 0,
+        count5: 0,
+        count6: 0,
         countTotal: 0,
     };
 
@@ -52,6 +55,13 @@ export class DataReportPage {
         this.getPie();
     }
 
+    // 切换主信息
+    changeType(value) {
+        if(value == '事业单位分类信息'){
+            this.drawPie();
+        }
+    }
+
     //单位信息总览
     getUnits() {
         const data = {
@@ -72,12 +82,10 @@ export class DataReportPage {
     }
 
     countInfo() {
-        this.count = {
-            count1: 0,
-            count2: 0,
-            count3: 0,
-            countTotal: 0,
-        };
+        this.count.count1 = 0
+        this.count.count2 = 0
+        this.count.count3 = 0
+        this.count.countTotal = 0
         if (this.type == 'unit') {
             this.unitsInfo.forEach(e => {
                 this.count.count1 += e.unitCount1;
@@ -257,7 +265,7 @@ export class DataReportPage {
         )
     }
 
-    //
+    // 事业单位分类信息
     getPie() {
         const data = {
             yearmonth: this.yearmonth1
@@ -265,21 +273,56 @@ export class DataReportPage {
         this.homeSer.statisticUnitcatetory(data).subscribe(
             (res) => {
                 this.pieData = res.data;
-                this.drawPie();
             }
         )
     }
 
     drawPie() {
+        this.count = {
+            count1: 0,
+            count2: 0,
+            count3: 0,
+            count4: 0,
+            count5: 0,
+            count6: 0,
+            countTotal: 0,
+        }
         let keyword = '';
         if (this.type1 == '单位数(个)') {
             keyword = 'unitCount';
+            this.pieData.forEach(e => {
+                this.count.count1 += e.unitCount1;
+                this.count.count2 += e.unitCount2;
+                this.count.count3 += e.unitCount3;
+                this.count.count4 += e.unitCount4;
+                this.count.count5 += e.unitCount5;
+                this.count.count6 += e.unitCount6;
+                this.count.countTotal += e.unitTotal;
+            })
         }
         if (this.type1 == '编制人数(人)') {
             keyword = 'bzrs';
+            this.pieData.forEach(e => {
+                this.count.count1 += e.bzrs1;
+                this.count.count2 += e.bzrs2;
+                this.count.count3 += e.bzrs3;
+                this.count.count4 += e.bzrs4;
+                this.count.count5 += e.bzrs5;
+                this.count.count6 += e.bzrs6;
+                this.count.countTotal += e.bzrsTotal;
+            })
         }
         if (this.type1 == '实有人数(人)') {
             keyword = 'syrs';
+            this.pieData.forEach(e => {
+                this.count.count1 += e.syrs1;
+                this.count.count2 += e.syrs2;
+                this.count.count3 += e.syrs3;
+                this.count.count4 += e.syrs4;
+                this.count.count5 += e.syrs5;
+                this.count.count6 += e.syrs6;
+                this.count.countTotal += e.syrsTotal;
+            })
         }
         const data = [
             {

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

@@ -30,7 +30,7 @@
             <span *ngIf="option.type != '3'" class="clear filter" tappable (click)="filterConditions()">筛选</span>
         </div>
     </ion-navbar>
-    <p *ngIf="searchState" style="background: #fff;text-align: center;color: #999;padding: 10px 0;">共查询到{{info.totalCount}}条</p>
+    <p [ngStyle]="{'display': searchState ? 'block': 'none'}" style="background: #fff;text-align: center;color: #999;padding: 10px 0;">共查询到{{info.totalCount}}条</p>
 </ion-header>
 
 <ion-content>
@@ -49,9 +49,10 @@
                         <p *ngIf="option.viewType == '1'" class="person-name">{{item?.mc}}</p>
 <!--                            <ion-icon *ngIf="option.type == '3'" name="build-outline" style="color:chartreuse;"></ion-icon>-->
                             <!--<ion-icon [name]="item.filenumber ? 'close-circle-outline' : 'checkmark-circle-outline'" ></ion-icon>-->
-                        <span [ngStyle]="{'color': item.filenumber ? 'gray' : 'green'}"><img [src]="item.filenumber ? './assets/imgs/revocation.png' : './assets/imgs/normal.png'" style="width: 16px;height: 16px;margin-right: 4px;"/>  {{item.filenumber ? '撤销' : '正常'}}</span>
 
                         <p *ngIf="option.viewType == '2'" class="person-name">{{item?.name}}</p>
+                        <span [ngStyle]="{'color': item.filenumber ? 'gray' : '#008000', 'border-color': item.filenumber ? 'gray' : '#008000a8' }">{{item.filenumber ? '撤销' : '正常'}}</span>
+
                     </div>
                 </div>
             </div>

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

@@ -145,8 +145,13 @@ page-info-list {
       span{
         display: flex;
         white-space: nowrap;
-        min-width: 55px;
+        min-width: 35px;
         align-items: center;
+        font-size: 12px;
+        padding: 2px 5px;
+        height: 24px;
+        border: 1px solid;
+        border-radius: 4px;
       }
     }
   }