update

doc/交接.txt

-安装依赖
-安装依赖
-1、npm install  //安装依赖
-2、npm install -g ionic  //安装ionic命令
-3、npm install -g cordova  //安装Cordova打包apk工具命令
-4、cordova plaform add android  //添加android平台
-5、npm install -g cordova-hot-code-push-cli  //下载热更新命令工具
-6、ionic serve  //启动项目
-
-跳板机  180.168.156.211 4123   root/Cesgroup123
-ssh -p 4123 root@180.168.156.211 登录命令
-scp -r -P 4123 www/ root@180.168.156.211:/root  上传文件命令
-
-内网服务器：10.250.199.29   root/cesgroup
-ssh -p 22 root@10.250.199.29
-scp -r www/ root@10.250.199.29:/usr/local/nginx/html  上传文件命令
-
-服务器上面的前端代码目录 /usr/local/nginx/www
-
-打包部署
-1、ionic build --prod
-2、cordova-hcp build
-3、上传文件到服务器
-4、cordova-hcp build
-
-
-android平台 --生产包
-1、cordova platform add android //添加Android平台，即生成android代码
-2、cordova build android --release 目录/platform/android/app/build/output/release/app-unrelease.apk //生成android生产包，将html代码打包进入apk中
-3、签名命令：jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore my-release-key.keystore app-release-unsigned.apk shreg
-  密码  shregshreg  将apk签名
-
-android ---debug包
-1、电脑通过数据线连接手机，手机打开开发者模式，
-
-2、ionic cordova run android
-直接打debug包，装到手机上面，打开webviewdebug软件，点击【启动调试】，看到自己的app，点击【inspect】，进入调试；
-
-
-13321810809
-qweasd123
+安装依赖
+安装依赖
+1、npm install  //安装依赖
+2、npm install -g ionic  //安装ionic命令
+3、npm install -g cordova  //安装Cordova打包apk工具命令
+4、cordova platform add android  //添加android平台
+5、npm install -g cordova-hot-code-push-cli  //下载热更新命令工具
+6、ionic serve  //启动项目
+
+跳板机  180.168.156.211 4123   root/Cesgroup123
+ssh -p 4123 root@180.168.156.211 登录命令
+scp -r -P 4123 www/ root@180.168.156.211:/root  上传文件命令 ps:进去当前文件夹目录下运行
+
+内网服务器：10.250.199.29   root/cesgroup
+ssh -p 22 root@10.250.199.29
+scp -r www/ root@10.250.199.29:/usr/local/nginx/html  上传文件命令
+
+服务器上面的前端代码目录 /usr/local/nginx/www
+
+查看 nginx配置：vi nginx.conf
+
+打包部署
+1、ionic build --prod
+2、cordova-hcp build
+3、上传文件到服务器
+4、cordova-hcp build
+
+
+android平台 --生产包
+1、cordova platform add android //添加Android平台，即生成android代码
+2、cordova build android --release 目录/platform/android/app/build/output/release/app-unrelease.apk //生成android生产包，将html代码打包进入apk中
+3、2步骤有报错就把platform里面android导入到android studio 如果出现version版本问题。。。
+4、拖到一个目录底下 => 签名命令：jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore my-release-key.keystore app-release-unsigned.apk shreg
+  密码  shregshreg  将apk签名
+
+
+2、ionic cordova run android
+直接打debug包，装到手机上面，打开webviewdebug软件，点击【启动调试】，看到自己的app，点击【inspect】，进入调试；
+3、签名命令：jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore my-release-key.keystore app-release-unsigned.apk shreg
+
+
+13321810809  
+qweasd123
+
+
+cordova platform rm android
+cordova platform add android
+
+ionic cordova run android 
+这个是把debug包安装到你手机上
\ No newline at end of file

src/components/search-filter/search-filter.html

 <!-- Generated template for the SearchSidebarComponent component -->
 
 <div class="search-sidebar">
-    <div class="all-address">
+    <div class="all-address" (on-swipe)="scrollIntoView()">
         <div>
             <p>隶属</p>
             <span (click)="selectArea(item)" *ngFor="let item of areaList"
                   [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
         </div>
+        <div *ngIf="unitType == '1' || unitType == '0'">
+            <p>状态</p>
+            <span (click)="selectState(item)" *ngFor="let item of stateList"
+                  [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
+        </div>
+
+        <div *ngIf="unitType == '1' || unitType == '0'">
+            <p>规格</p>
+            <span (click)="selectSpecifications(item)" *ngFor="let item of specificationsList"
+                  [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
+        </div>
+        <div *ngIf="unitType == '1'">
+            <p>参公</p>
+            <span (click)="selectMale(item)" *ngFor="let item of maleList"
+                  [ngClass]="{'selectItem':maleObj?.code == item.code}">{{item.name}}</span>
+        </div>
         <div *ngIf="unitType == '1'">
             <p>行业</p>
             <span (click)="selectIndustry(item)" *ngFor="let item of industryList"
@@ -18,25 +34,10 @@
                   [ngClass]="{'selectItem':lawIndustryObj?.code == item.code}">{{item.name}}</span>
         </div>
         <div *ngIf="unitType == '1'">
-            <p>经费</p>
-            <span (click)="selectFunding(item)" *ngFor="let item of fundingList"
-            [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
-        </div>
-        <div *ngIf="unitType == '1'">
-            <p>单位</p>
+            <p>类别</p>
             <span (click)="selectCause(item)" *ngFor="let item of causeList"
                   [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
         </div>
-        <div *ngIf="unitType == '1'">
-            <p>参公</p>
-            <span (click)="selectMale(item)" *ngFor="let item of maleList"
-                  [ngClass]="{'selectItem':maleObj?.code == item.code}">{{item.name}}</span>
-        </div>
-        <div *ngIf="unitType == '0'">
-            <p>规格</p>
-            <span (click)="selectSpecifications(item)" *ngFor="let item of specificationsList"
-                  [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
-        </div>
         <div *ngIf="unitType == '2'">
             <p>性质</p>
             <span (click)="selectNature(item)" *ngFor="let item of natureList"
@@ -47,7 +48,17 @@
             <span (click)="selectCategory(item)" *ngFor="let item of categoryList"
                   [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
         </div>
+
+        <div *ngIf="unitType == '1'">
+            <p>经费</p>
+            <span (click)="selectFunding(item)" *ngFor="let item of fundingList"
+            [ngClass]="{'selectItem': item.active}">{{item.name}}</span>
+        </div>
     </div>
+    
+    <ion-icon name="ios-arrow-down" id="dibu"></ion-icon>
+    <ion-icon name="ios-arrow-down" id="dibu1"></ion-icon>
+
     <div class="footer">
         <div tappable (click)="reset()">重置</div>
         <div tappable (click)="confirm()">确定</div>

src/components/search-filter/search-filter.scss

@@ -57,6 +57,21 @@ search-filter {
         //background: linear-gradient(100deg, #fed675 0%, rgba(255, 201, 45, 1) 100%);
       }
     }
+
+    #dibu{
+      position: fixed;
+      bottom: 72px;
+      right: 60px;
+      color: #0014ff;
+      z-index: 1;
+    }
+    #dibu1{
+      position: fixed;
+      bottom: 76px;
+      right: 60px;
+      color: #0014ff;
+      z-index: 1;
+    }
   }
 
   .time {

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

@@ -14,6 +14,7 @@ export class SearchFilterComponent {
     text: string;
 
     areaObj;
+    stateObj;
     industryObj;
     fundingObj;
     causeObj;
@@ -23,14 +24,15 @@ export class SearchFilterComponent {
     maleObj;
     lawIndustryObj;
     areaList = [];
+    stateList = [];
     industryList = [];
     fundingList = [];
     causeList = [];
     specificationsList = [];
     natureList = []
     categoryList = []
-    maleList = [{name: '全部',code: ''},{name: '是',code: '1'},{name: '否',code: '0'}];
-    lawIndustryList = [{code: '交通', name: '交通'},{code: '环境', name: '环境'},{code: '文化', name: '文化'},{code: '旅游', name: '旅游'},{code: '民政', name: '民政'}]
+    maleList = [{name: '是',code: '1'},{name: '否',code: '0'}];
+    lawIndustryList = [{code: '市场监督', name: '市场监督'},{code: '交通', name: '交通'},{code: '环境', name: '环境'},{code: '文化', name: '文旅'},{code: '农业', name: '农业'},{code: '民政', name: '民政'}]
     unitType = '';
 
     constructor(private viewCtrl: ViewController, private params: NavParams,
@@ -39,12 +41,14 @@ export class SearchFilterComponent {
                 private loginSer: LoginService,
                 private HomeSer: HomeService) {
                     this.areaObj = this.params.get("area");
+                    this.stateObj = this.params.get("state")
                     this.industryObj = this.params.get("industry");
                     this.fundingObj = this.params.get("funding");
                     this.causeObj = this.params.get("cause");
                     this.maleObj = this.params.get("male");
                     this.lawIndustryObj = this.params.get("lawIndustry");
                     this.areaList = this.params.get("areaList");
+                    this.stateList = this.params.get("stateList");
                     this.industryList = this.params.get("industryList");
                     this.fundingList = this.params.get("fundingList");
                     this.causeList = this.params.get("causeList");
@@ -59,6 +63,10 @@ export class SearchFilterComponent {
     selectArea(item) {
         item.active = !item.active
     }
+    //状态选择
+    selectState(item) {
+        item.active = !item.active
+    }
     //行业选择
     selectIndustry(item) {
         item.active = !item.active
@@ -97,6 +105,7 @@ export class SearchFilterComponent {
         this.maleObj = {code: ''}
         this.lawIndustryObj = {code: ''}
         this.areaList.map(x => x.active = false)
+        this.stateList.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)
@@ -108,6 +117,7 @@ export class SearchFilterComponent {
     //确定
     confirm() {
         this.areaObj = this.areaList.filter(x => x.active)
+        this.stateObj = this.stateList.filter(x => x.active)
         this.industryObj = this.industryList.filter(x => x.active)
         this.fundingObj = this.fundingList.filter(x => x.active)
         this.causeObj = this.causeList.filter(x => x.active)
@@ -116,6 +126,7 @@ export class SearchFilterComponent {
         this.categoryObj = this.categoryList.filter(x => x.active)
         const data = {
             area: this.areaObj,
+            state: this.stateObj,
             industry: this.industryObj,
             funding: this.fundingObj,
             cause: this.causeObj,

src/pages/home/home.html

@@ -7,7 +7,7 @@
         </ion-buttons>
         <ion-buttons end class="mine-button">
             <button (click)="goToPersonInfo()" class="mine-home">
-                <span>{{mineInfo?.name.slice(-2)}}</span>
+                <span>{{mineInfo?.name.slice(0, 1) + '*'}}</span>
             </button>
         </ion-buttons>
     </ion-navbar>

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

@@ -62,6 +62,12 @@
                 </div>
             </div>
             <div class="item-box">
+                <div class="left">隶属:</div>
+                <div class="right">
+                    <span>{{ infoObj.geo_codeLabel}}</span>
+                </div>
+            </div>
+            <div class="item-box">
                 <div class="left">{{type != 0 ? '原事证号' : '归档号'}}:</div>
                 <div class="right">
                     <span>{{ infoObj.zsh}}</span>
@@ -86,7 +92,7 @@
                 </div>
             </div>
             <div class="item-box">
-                <div class="left">机构级别:</div>
+                <div class="left">机构规格:</div>
                 <div class="right">
                     <span>{{ infoObj.jggg}}</span>
                 </div>
@@ -251,6 +257,12 @@
                     <span>{{infoObj?.issueDateStr || "-"}}</span>
                 </div>
             </div>
+            <div class="item-box">
+                <div class="left">隶属:</div>
+                <div class="right">
+                    <span>{{ infoObj.geoStr}}</span>
+                </div>
+            </div>
             <div class="item-box" *ngIf="infoObj?.jgxzStr == '事业单位非法人'">
                 <div class="left">有效期至:</div>
                 <div class="right">

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

@@ -29,8 +29,9 @@
             </span>
             <span *ngIf="option.type != '3'" class="clear filter" tappable (click)="filterConditions()">筛选</span>
         </div>
+        <!-- <p [hidden]="!searchState" style="background: #fff;text-align: center;color: #999;padding: 10px 0;">共查询到{{info.totalCount}}条</p> -->
+        <!-- <p *ngIf="searchState" style="background: #fff;text-align: center;color: #999;padding: 10px 0;">共查询到{{info.totalCount}}条</p> -->
     </ion-navbar>
-    <p [ngStyle]="{'display': searchState ? 'block': 'none'}" style="background: #fff;text-align: center;color: #999;padding: 10px 0;">共查询到{{info.totalCount}}条</p>
 </ion-header>
 
 <ion-content>
@@ -38,11 +39,15 @@
         <h6>历史记录</h6>
         <li *ngFor="let item of option.history" (click)="historyField(item)">{{item}}</li>
     </ul>
+    <div [hidden]="!searchState" ion-fixed style="width: 100%;text-align: center;color: #999;padding: 10px 0;background: #fff;">
+        共查询到{{info.totalCount || 0}}条 <span *ngIf="info.REG || info.PWCNL">正常{{info.REG || 0}}条，撤销{{info.PWCNL || 0}}条</span>
+    </div>
+    
     <div *ngIf="searchState || info.list && option.type != '3'">
         <ion-refresher (ionRefresh)="getList($event)">
             <ion-refresher-content pullingText="下拉刷新" refreshingSpinner="bubbles"></ion-refresher-content>
         </ion-refresher>
-        <div class="list">
+         <div class="list">
             <div *ngFor="let item of info.list" (click)="goToDetail(item)">
                 <div class="group">
                     <div class="inner-group">

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

@@ -5,6 +5,7 @@ import {LoginService} from "../../../login/login.service";
 import {InfoDetailPage} from "../info-detail/info-detail";
 import {SearchFilterComponent} from "../../../../components/search-filter/search-filter";
 import {DealService} from "../../../deal/deal.service";
+import {CommonService} from "../../../../core/common.service";
 
 @Component({
   selector: 'page-info-list',
@@ -31,6 +32,8 @@ export class InfoListPage {
     limit: 20,
     search: '',
     totalCount: null,
+    PWCNL: null,
+    REG: null,
     type: 3,
     typeDataArr: [],
     typeFilter: [
@@ -40,6 +43,7 @@ export class InfoListPage {
     ],
     // 过滤条件
     area: [],
+    state: [],
     industry: [],
     funding: [],
     cause: [],
@@ -54,6 +58,7 @@ export class InfoListPage {
 
   // 过滤条件列表
   areaList = [];
+  stateList = [];
   industryList = [];
   fundingList = [];
   causeList = [];
@@ -66,7 +71,7 @@ export class InfoListPage {
   arr = new Array(10)
 
   constructor(public navCtrl: NavController, public navParams: NavParams,private alertCtrl: AlertController,
-              private loadCtrl: LoadingController, private homeSer: HomeService,
+              private loadCtrl: LoadingController, private homeSer: HomeService, private commonSer: CommonService,
               private loginSer: LoginService, private modalCtrl: ModalController,) {
                 this.getInit()
               }
@@ -80,6 +85,7 @@ export class InfoListPage {
 
   getInit(){ // 请求
     this.getArea()
+    this.getState()
     this.getIndustryList()
     this.getFundingList()
     this.getCauseList()
@@ -94,6 +100,7 @@ export class InfoListPage {
     if (this.option.type === '0') this.info.typeDataArr = this.info.typeFilter.filter(x => x.id !== 1)
     if (this.option.type === '2') this.info.typeDataArr = this.info.typeFilter.filter(x => x.id == 3 || x.id == 4)
     this.info.area = [];
+    this.info.state = [];
     this.info.industry = [];
     this.info.funding = [];
     this.info.cause = [];
@@ -126,7 +133,6 @@ export class InfoListPage {
       arr.unshift(this.info.search) //添加入数组
       localStorage.setItem('history',JSON.stringify(arr)); // 存local
     }
-
     this.option.type === '2' ? this.getCreditor(event) : this.getUnit(event); //调查list接口
   }
 
@@ -153,6 +159,13 @@ export class InfoListPage {
         this.option.viewType = '2';
         this.info.list = res.page.list.object;
         this.info.totalCount = res.page.totalCount;
+        if(res.page.PWCNL || res.page.REG){
+          this.info.PWCNL = res.page.PWCNL;
+          this.info.REG = res.page.REG;
+        } else {
+          this.info.PWCNL = null
+          this.info.REG = null
+        }
       }
     )
   }
@@ -168,6 +181,7 @@ export class InfoListPage {
       limit: this.info.limit,
       type: '1',
       areacode: this.info.area ? this.info.area.map(x => x.code) : [],
+      dwzt: this.info.state ? this.info.state.map(x => x.code) : [],
       openid: "",
       isUnit: this.option.list.filter(x => x.type === this.option.type).map(x => x.type).toString(),
       hyfl: this.info.industry ? this.info.industry.map(x => x.code) : [],
@@ -180,12 +194,22 @@ export class InfoListPage {
     };
     this.homeSer.unitfind(data).subscribe(
       (res) => {
-        this.searchState = true
         loadCtrl.dismiss();
+        if (!res.page){
+          return this.commonSer.toast(res.msg)
+        }
+        this.searchState = true
         if (event) event.complete();
         this.option.viewType = '1';
         this.info.list = res.page.list.object;
         this.info.totalCount = res.page.totalCount;
+        if(res.page.PWCNL || res.page.REG){
+          this.info.PWCNL = res.page.PWCNL;
+          this.info.REG = res.page.REG;
+        } else {
+          this.info.totalCount = null
+          this.info.REG = null
+        }
       }
     )
   }
@@ -207,6 +231,7 @@ export class InfoListPage {
       limit: this.info.limit,
       type: '1',
       areacode: this.info.area ? this.info.area.map(x => x.code) : [],
+      dwzt: this.info.state ? this.info.state.map(x => x.code) : [],
       openid: "",
       isUnit: this.option.list.filter(x => x.type === this.option.type).map(x => x.type).toString(),
       hyfl: this.info.industry ? this.info.industry.map(x => x.code) : [],
@@ -215,7 +240,7 @@ export class InfoListPage {
       searchType: this.info.type,
       civilServantManagement: this.info.male.code,
       jggg: this.info.specifications ? this.info.specifications.map(x => x.code) : [],
-      xzzf_hy: this.info.lawIndustry.code,
+      xzzf_hy: this.info.lawIndustry.code
     };
     this.homeSer.unitfind(data).subscribe(
       (res) => {
@@ -223,6 +248,10 @@ export class InfoListPage {
         if (event) event.complete();
         this.info.list = this.info.list.concat(res.page.list.object);
         this.info.totalCount = res.page.totalCount;
+        if(res.page.PWCNL || res.page.REG){
+          this.info.PWCNL = res.page.PWCNL;
+          this.info.REG = res.page.REG;
+        }
       }
     )
   }
@@ -249,6 +278,10 @@ export class InfoListPage {
         if (event) event.complete();
         this.info.list = this.info.list.concat(res.page.list.object);
         this.info.totalCount = res.page.totalCount;
+        if(res.page.PWCNL || res.page.REG){
+          this.info.PWCNL = res.page.PWCNL;
+          this.info.REG = res.page.REG;
+        }
       }
     )
   }
@@ -268,6 +301,7 @@ export class InfoListPage {
     let modal = this.modalCtrl.create(SearchFilterComponent, {
         unitType: this.option.type,
         area: this.info.area,
+        state: this.info.state,
         industry: this.info.industry,
         funding: this.info.funding,
         cause: this.info.cause,
@@ -279,6 +313,7 @@ export class InfoListPage {
         male: this.info.male,
 
         areaList: this.areaList,
+        stateList: this.stateList,
         industryList: this.industryList,
         fundingList: this.fundingList,
         causeList: this.causeList,
@@ -293,6 +328,7 @@ export class InfoListPage {
     modal.onDidDismiss(res => {
       if (res) {
         this.info.area = res.area
+        this.info.state = res.state
         this.info.industry = res.industry
         this.info.funding = res.funding
         this.info.cause = res.cause
@@ -320,13 +356,18 @@ export class InfoListPage {
       (res) => {
         if (res.list) {
           this.areaList = res.list;
-          this.areaList.unshift({code: "0", name: "全市"})
-          this.areaList.splice(2, 0, {code: "-1", name: "区属"})
+          this.areaList.splice(1, 0, {code: "-1", name: "区属"})
           this.areaList.map(x => { x.active = false })
         }
       }
     )
   }
+
+
+  //获取区属
+  getState() {
+    this.stateList = [{name: '正常',code: 'REG', active: false},{name: '撤销',code: 'PWCNL', active: false}]
+  }
   // 获取行业
   getIndustryList() {
     this.homeSer.getIndustryList({}).subscribe(
@@ -361,6 +402,7 @@ export class InfoListPage {
         if (res.list) {
           this.causeList = res.list;
           this.causeList = this.causeList.filter(x => x.code == '2' || x.code == '3' || x.code == '4' || x.code == '5' || x.code == '6' || x.code == '7' || x.code == '8')
+          this.causeList.map(x => x.name = x.name.replace('范围', ''))
           this.causeList.map(x => { x.active = false })
         }
       }
@@ -373,7 +415,7 @@ export class InfoListPage {
       (res) => {
         if (res.list) {
           this.specificationsList = res.list;
-          // this.specificationsList = this.specificationsList.filter(x => x.code == '2' || x.code == '3' || x.code == '4' || x.code == '5' || x.code == '6' || x.code == '7' || x.code == '8')
+          this.specificationsList = this.specificationsList.filter(x => x.code == '3' || x.code == '4' || x.code == '5' || x.code == '6' || x.code == '7' || x.code == '8' || x.code == '9')
           this.specificationsList.map(x => { x.active = false })
         }
       }

src/pages/mine/person/person.html

@@ -20,10 +20,11 @@
         </ion-item>
         <ion-item>
             <div class="info-item">
-                <span class="info-span">姓名/性别</span>
+                <span class="info-span">姓名</span>
+                <!-- <span class="info-span">姓名/性别</span> -->
                 <div>
                     <span class="info">{{mineInfo?.name}}</span>
-                    <ion-icon name="male" class="contact-sex male"></ion-icon>
+                    <!-- <ion-icon name="male" class="contact-sex male"></ion-icon> -->
                 </div>
             </div>
         </ion-item>
@@ -31,7 +32,7 @@
             <div class="info-item">
                 <span class="info-span">部门</span>
                 <div>
-                    <span class="info">{{mineInfo?.fullName}}</span>
+                    <span class="info">{{mineInfo?.depName}}</span>
                     <!-- <ion-icon name="ios-arrow-forward" class="icon-more"></ion-icon> -->
                 </div>
             </div>
@@ -70,7 +71,7 @@
             <div class="info-item">
                 <span class="info-span">房间号</span>
                 <div class="info-item-content">
-                    <span class="info">{{mineInfo.mobilePhone}}</span>
+                    <span class="info">{{mineInfo.roomNum}}</span>
                 </div>
             </div>
         </ion-item>

src/pages/news/news.html

@@ -55,7 +55,7 @@
                             <span class="right">{{item.zgbm}}</span>
                         </p>
                         <p>
-                            <span class="left">代办类型:</span>
+                            <span class="left">待办类型:</span>
                             <span class="right">{{item.txContent}}</span>
                         </p>
                     </div>