Skip to content

R
regManage
Commit 300273c5 authored by wangqinghua's avatar wangqinghua
Browse files
Options

Merge branch 'master' of http://180.168.156.211:2903/qinghua/regManage

Conflicts: doc/交接.txt src/pages/home/data-report/data-report.ts
parents 94622355 c57e7012
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1019 additions and 131 deletions
README.md
View file @ 300273c5
npm install ionic serve ionic build --prod cordova build android --release cordova-hcp build jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore my-release-key.keystore app-release-unsigned.apk shreg shregshreg 显示的菜单代码，1通讯录，2审核审批，3办理督办，4数据报表，5信息查询，6审批，7审核，8事业单位，9机关群团 13321810809 qweasd123 npm install
\ No newline at end of file ionic serve
ionic build --prod
cordova build android --release
cordova-hcp build
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore my-release-key.keystore app-release-unsigned.apk shreg
shregshreg
显示的菜单代码，1通讯录，2审核审批，3办理督办，4数据报表，5信息查询，6审批，7审核(待办)，8事业单位，9机关群团，10行政执法
role： 0管理员， 4办领导， 1处领导， 2工作人员， 3其他人员
13321810809
qweasd123
config.xml
View file @ 300273c5
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
</plugin> </plugin>
<chcp> <chcp>
<native-interface version="1" /> <native-interface version="1" />
<auto-download enabled="true" /> <auto-download enabled="false" />
<auto-install enabled="true" /> <auto-install enabled="false" />
<config-file url="https://www.cesdj.cn/www/chcp.json" /> <config-file url="https://www.cesdj.cn/www/chcp.json" />
</chcp> </chcp>
</widget> </widget>
cordova-hcp.json
View file @ 300273c5
{ {
"antogenerated": true,
"name": "shreg", "name": "shreg",
"min_native_interface": 1,
"ios_identifier": "com.shReg.start.h", "ios_identifier": "com.shReg.start.h",
"android_identifier": "com.shReg.start.h", "android_identifier": "http://d.6short.com/68jc",
"update": "resume", "update": "now",
"content_url": "https://www.cesdj.cn/www/" "content_url": "https://www.cesdj.cn/www/"
} }
doc/交接.txt
View file @ 300273c5
安装依赖 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】，进入调试； 安装依赖
安装依赖 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】，进入调试； 安装依赖
\ No newline at end of file 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签名
13321810809
qweasd123
\ No newline at end of file
package-lock.json
View file @ 300273c5
...@@ -717,8 +717,8 @@ ...@@ -717,8 +717,8 @@
}, },
"android-versions": { "android-versions": {
"version": "1.5.0", "version": "1.5.0",
"resolved": "http://r.cnpmjs.org/android-versions/download/android-versions-1.5.0.tgz", "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.5.0.tgz",
"integrity": "sha1-d5C8dOCBKq/Wn7GtDLTbRHSlJdY=", "integrity": "sha512-/GWUAqa2OJNlDF5VGSe3SR1QMHEPXxx54Ur56r0qQC0H9FlBr7kyBF2SgVEhzFCPbrW4UcYgVuWrq/2Ty3QvXg==",
"requires": { "requires": {
"semver": "^5.4.1" "semver": "^5.4.1"
} }
...@@ -804,7 +804,7 @@ ...@@ -804,7 +804,7 @@
}, },
"array-ify": { "array-ify": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "http://r.cnpmjs.org/array-ify/download/array-ify-1.0.0.tgz", "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
"integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=" "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4="
}, },
"array-union": { "array-union": {
...@@ -1570,7 +1570,7 @@ ...@@ -1570,7 +1570,7 @@
}, },
"compare-func": { "compare-func": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "http://r.cnpmjs.org/compare-func/download/compare-func-1.3.2.tgz", "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
"integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
"requires": { "requires": {
"array-ify": "^1.0.0", "array-ify": "^1.0.0",
...@@ -1763,8 +1763,8 @@ ...@@ -1763,8 +1763,8 @@
}, },
"cordova-android": { "cordova-android": {
"version": "8.1.0", "version": "8.1.0",
"resolved": "http://r.cnpmjs.org/cordova-android/download/cordova-android-8.1.0.tgz", "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.1.0.tgz",
"integrity": "sha1-2a6mK75KTI0i/fIWFoaUOc0claA=", "integrity": "sha512-eAY6g9q3raJ4P03wNdSWC5MOW1EfxoomWNXsPhi7T6Q9yAqmxqn0sLEUjLL1Ib0LCH3nKQWBXdxapQ5LgbHu+g==",
"requires": { "requires": {
"android-versions": "^1.4.0", "android-versions": "^1.4.0",
"compare-func": "^1.3.2", "compare-func": "^1.3.2",
...@@ -1776,9 +1776,9 @@ ...@@ -1776,9 +1776,9 @@
}, },
"dependencies": { "dependencies": {
"nopt": { "nopt": {
"version": "4.0.1", "version": "4.0.3",
"resolved": "http://r.cnpmjs.org/nopt/download/nopt-4.0.1.tgz", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
"requires": { "requires": {
"abbrev": "1", "abbrev": "1",
"osenv": "^0.1.4" "osenv": "^0.1.4"
...@@ -1979,7 +1979,7 @@ ...@@ -1979,7 +1979,7 @@
"integrity": "sha1-1qHVBjKv8qcCJxAvaLxgXpGqvKI=" "integrity": "sha1-1qHVBjKv8qcCJxAvaLxgXpGqvKI="
}, },
"cordova-plugin-network-information": { "cordova-plugin-network-information": {
"version": "git+https://github.com/apache/cordova-plugin-network-information.git#97a4967a2e0f0324db4a6d789477ec5f761f2770", "version": "git+https://github.com/apache/cordova-plugin-network-information.git#88ecf0b427ebd4a79457e6afbc682d1d3ad1b981",
"from": "git+https://github.com/apache/cordova-plugin-network-information.git" "from": "git+https://github.com/apache/cordova-plugin-network-information.git"
}, },
"cordova-plugin-photo-library": { "cordova-plugin-photo-library": {
...@@ -2417,7 +2417,7 @@ ...@@ -2417,7 +2417,7 @@
}, },
"dot-prop": { "dot-prop": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "http://r.cnpmjs.org/dot-prop/download/dot-prop-3.0.0.tgz", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
"integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
"requires": { "requires": {
"is-obj": "^1.0.0" "is-obj": "^1.0.0"
...@@ -4149,7 +4149,7 @@ ...@@ -4149,7 +4149,7 @@
}, },
"is-obj": { "is-obj": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "http://r.cnpmjs.org/is-obj/download/is-obj-1.0.1.tgz", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
}, },
"is-plain-object": { "is-plain-object": {
...@@ -5546,7 +5546,7 @@ ...@@ -5546,7 +5546,7 @@
}, },
"properties-parser": { "properties-parser": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "http://r.cnpmjs.org/properties-parser/download/properties-parser-0.3.1.tgz", "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
"integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=", "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
"requires": { "requires": {
"string.prototype.codepointat": "^0.2.0" "string.prototype.codepointat": "^0.2.0"
...@@ -6835,8 +6835,8 @@ ...@@ -6835,8 +6835,8 @@
}, },
"string.prototype.codepointat": { "string.prototype.codepointat": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "http://r.cnpmjs.org/string.prototype.codepointat/download/string.prototype.codepointat-0.2.1.tgz", "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
"integrity": "sha1-AErUTIr8cnUnsQjNRitNlxzUabw=" "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
}, },
"string.prototype.trim": { "string.prototype.trim": {
"version": "1.1.2", "version": "1.1.2",
......
package.json
View file @ 300273c5
...@@ -108,13 +108,18 @@ ...@@ -108,13 +108,18 @@
"cordova-plugin-screen-orientation": {}, "cordova-plugin-screen-orientation": {},
"phonegap-plugin-mobile-accessibility": {}, "phonegap-plugin-mobile-accessibility": {},
"cordova-plugin-file-transfer": {}, "cordova-plugin-file-transfer": {},
"cordova-plugin-photo-library": {}, "cordova-plugin-photo-library": {
"cordova-plugin-camera": {}, "PHOTO_LIBRARY_USAGE_DESCRIPTION": " "
},
"cordova-plugin-camera": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"cordova-hot-code-push-plugin": {} "cordova-hot-code-push-plugin": {}
}, },
"platforms": [ "platforms": [
"browser", "browser",
"ios" "ios",
"android"
] ]
} }
} }
\ No newline at end of file
src/app/app.constants.ts
View file @ 300273c5
import * as Mock from 'mockjs'; export const SERVER_API_URL = '/shfrdj';// export const SERVER_API_URL = 'http://61.152.117.206/shfrdj'; export const SERVER_API_WEB = '/shfrdjweb'; // export const SERVER_API_WEB = 'http://61.152.117.206/'; // 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'}, ] import * as Mock from 'mockjs';
\ No newline at end of file
let hostname = window.location.hostname
export const SERVER_API_URL = hostname === 'localhost' ? '/shfrdj' : 'http://61.152.117.206/shfrdj';
// export const SERVER_API_URL = 'http://61.152.117.206/shfrdj';
export const SERVER_API_WEB = hostname === 'localhost' ? '/shfrdjweb' : 'http://61.152.117.206/';
// export const SERVER_API_WEB = 'http://61.152.117.206/';
// 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'},
]
src/app/app.module.ts
View file @ 300273c5
...@@ -32,7 +32,7 @@ import {UntilService} from "../core/until.service"; ...@@ -32,7 +32,7 @@ import {UntilService} from "../core/until.service";
import {MineService} from "../pages/mine/mine.service"; import {MineService} from "../pages/mine/mine.service";
import {ModalFromRightEnter, ModalFromRightLeave, ModalScaleEnter, ModalScaleLeave} from "./modal-transitions"; import {ModalFromRightEnter, ModalFromRightLeave, ModalScaleEnter, ModalScaleLeave} from "./modal-transitions";
import {InAppBrowser} from "@ionic-native/in-app-browser"; import {InAppBrowser} from "@ionic-native/in-app-browser";
import {PdfViewerComponent, PdfViewerModule} from "ng2-pdf-viewer"; // import {PdfViewerComponent, PdfViewerModule} from "ng2-pdf-viewer";
import {TabService} from "../core/tab.service"; import {TabService} from "../core/tab.service";
import {AppVersion} from "@ionic-native/app-version"; import {AppVersion} from "@ionic-native/app-version";
import {LogoutService} from "../secret/logout.service"; import {LogoutService} from "../secret/logout.service";
......
src/components/components.module.ts
View file @ 300273c5
...@@ -11,6 +11,7 @@ import {VideojsComponent} from "./videojs/videojs"; ...@@ -11,6 +11,7 @@ import {VideojsComponent} from "./videojs/videojs";
import {SearchPersonComponent} from './search-person/search-person'; import {SearchPersonComponent} from './search-person/search-person';
import {EchartDataComponent} from './echart-data/echart-data'; import {EchartDataComponent} from './echart-data/echart-data';
import {FilterComponent} from './filter/filter'; import {FilterComponent} from './filter/filter';
import {SearchFilterComponent} from './search-filter/search-filter';
@NgModule({ @NgModule({
...@@ -27,6 +28,7 @@ import {FilterComponent} from './filter/filter'; ...@@ -27,6 +28,7 @@ import {FilterComponent} from './filter/filter';
SearchPersonComponent, SearchPersonComponent,
EchartDataComponent, EchartDataComponent,
FilterComponent, FilterComponent,
SearchFilterComponent,
], ],
imports: [ imports: [
IonicPageModule IonicPageModule
...@@ -44,6 +46,7 @@ import {FilterComponent} from './filter/filter'; ...@@ -44,6 +46,7 @@ import {FilterComponent} from './filter/filter';
SearchPersonComponent, SearchPersonComponent,
EchartDataComponent, EchartDataComponent,
FilterComponent, FilterComponent,
SearchFilterComponent,
], ],
providers: [ providers: [
CommentComponent, CommentComponent,
...@@ -59,6 +62,7 @@ import {FilterComponent} from './filter/filter'; ...@@ -59,6 +62,7 @@ import {FilterComponent} from './filter/filter';
VideojsComponent, VideojsComponent,
SearchPersonComponent, SearchPersonComponent,
FilterComponent, FilterComponent,
SearchFilterComponent,
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]
}) })
......
src/components/search-filter/search-filter.html 0 → 100644
View file @ 300273c5
<!-- Generated template for the SearchSidebarComponent component -->
<div class="search-sidebar">
<div class="all-address">
<div>
<p>隶属</p>
<span (click)="selectArea(item)" *ngFor="let item of areaList"
[ngClass]="{'selectItem': item.active}">{{item.name}}</span>
</div>
<div *ngIf="unitType == '1'">
<p>行业</p>
<span (click)="selectIndustry(item)" *ngFor="let item of industryList"
[ngClass]="{'selectItem': item.active}">{{item.name}}</span>
</div>
<div *ngIf="unitType == '0'">
<p>行业</p>
<span (click)="selectLawIndustry(item)" *ngFor="let item of lawIndustryList"
[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>
<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"
[ngClass]="{'selectItem': item.active}">{{item.name}}</span>
</div>
<div *ngIf="unitType == '2'">
<p>类别</p>
<span (click)="selectCategory(item)" *ngFor="let item of categoryList"
[ngClass]="{'selectItem': item.active}">{{item.name}}</span>
</div>
</div>
<div class="footer">
<div tappable (click)="reset()">重置</div>
<div tappable (click)="confirm()">确定</div>
</div>
</div>
src/components/search-filter/search-filter.scss 0 → 100644
View file @ 300273c5
search-filter {
.search-sidebar {
position: relative;
height: 100%;
width: 90%;
background-color: #fff;
padding: 16px 16px 60px 20px;
overflow: scroll;
> p {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(51, 51, 51, 1);
line-height: 22px;
margin: 15px 0;
}
.address, .teacher {
background: rgba(238, 238, 238, 1);
border-radius: 15px;
padding-left: 10px;
}
.footer {
position: fixed;
left: 0;
bottom: 0;
width: 90%;
height: 58px;
background: rgba(255, 255, 255, 1);
display: flex;
align-items: center;
justify-content: center;
div {
width: 100px;
height: 32px;
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #ffffff;
line-height: 32px;
text-align: center;
}
div:first-child {
border-top-left-radius: 16px;
border-bottom-left-radius: 16px;
background: linear-gradient(100deg, #b2cce4 0%, #86aed3 100%);
}
div:last-child {
border-top-right-radius: 16px;
border-bottom-right-radius: 16px;
background-color: #5c92c8;
//background: linear-gradient(100deg, #fed675 0%, rgba(255, 201, 45, 1) 100%);
}
}
}
.time {
display: flex;
align-items: center;
padding: 0;
position: relative;
.heng {
font-size: 40px;
font-weight: 200;
padding: 0 2px;
}
}
ion-datetime.datetime-ios {
background-color: #eee;
border-radius: 15px;
width: 48%;
padding: 11px 3px 11px 11px;
}
ion-datetime + {
margin-left: 5px;
}
.time2 {
.item-cover {
right: 0;
left: auto;
width: 50%;
}
}
.time1 {
.item-cover {
left: 0;
width: 50%;
}
}
.all-address {
p {
font-family: PingFangSC-Regular, PingFang SC;
font-weight: bold;
color: #333;
line-height: 16px;
margin-bottom: 10px;
width: 100%;
}
>div{
margin-bottom: 10px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
>span{
width: 31%;
background-color: #F2F2F2;
border: 1px solid #f2f2f2;
border-radius: 4px;
padding: 5px 0;
text-align: center;
margin-bottom: 10px;
display: inline-block;
vertical-align: text-top;
}
}
>div:after{
content: '';
width: 30%;
}
}
.selectItem {
color: #ffffff;
background: linear-gradient(242deg, #b2cce4 0%, #5c92c8 100%);
}
}
src/components/search-filter/search-filter.ts 0 → 100644
View file @ 300273c5
import {Component} from '@angular/core';
import {NavParams, ViewController} from "ionic-angular";
import {LoginService} from "../../pages/login/login.service";
import {HomeService} from "../../pages/home/home.service";
import {GlobalData} from "../../core/GlobleData";
import {Storage} from "@ionic/storage";
import { shiftInitState } from '@angular/core/src/view';
@Component({
selector: 'search-filter',
templateUrl: 'search-filter.html'
})
export class SearchFilterComponent {
text: string;
areaObj;
industryObj;
fundingObj;
causeObj;
specificationsObj;
natureObj;
categoryObj;
maleObj;
lawIndustryObj;
areaList = [];
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: '民政'}]
unitType = '';
constructor(private viewCtrl: ViewController, private params: NavParams,
private globle: GlobalData,
private storage: Storage,
private loginSer: LoginService,
private HomeSer: HomeService) {
this.areaObj = this.params.get("area");
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.industryList = this.params.get("industryList");
this.fundingList = this.params.get("fundingList");
this.causeList = this.params.get("causeList");
this.specificationsList = this.params.get("specificationsList");
this.natureList = this.params.get("natureList");
this.categoryList = this.params.get("categoryList");
this.unitType = this.params.get("unitType");
console.log(this.areaList, this.industryList, this.fundingList, this.causeList, this.unitType)
}
//区域选择
selectArea(item) {
item.active = !item.active
}
//行业选择
selectIndustry(item) {
item.active = !item.active
}
//经费来源选择
selectFunding(item) {
item.active = !item.active
}
//单位类别选择
selectCause(item) {
item.active = !item.active
}
//单位类别选择 --- 单选
selectMale(item) {
this.maleObj = item
}
//行业选择 --- 单选
selectLawIndustry(item) {
this.lawIndustryObj = item
}
// 规格选择
selectSpecifications(item) {
item.active = !item.active
}
//机构性质选择
selectNature(item) {
item.active = !item.active
}
//机构类别选择
selectCategory(item) {
item.active = !item.active
}
//重置
reset() {
this.maleObj = {code: ''}
this.lawIndustryObj = {code: ''}
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)
}
//确定
confirm() {
this.areaObj = this.areaList.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)
this.specificationsObj = this.specificationsList.filter(x => x.active)
this.natureObj = this.natureList.filter(x => x.active)
this.categoryObj = this.categoryList.filter(x => x.active)
const data = {
area: this.areaObj,
industry: this.industryObj,
funding: this.fundingObj,
cause: this.causeObj,
specifications: this.specificationsObj,
nature: this.natureObj,
category: this.categoryObj,
male: this.maleObj,
lawIndustry: this.lawIndustryObj,
};
console.log(data)
this.viewCtrl.dismiss(data);
}
}
src/core/GlobleData.ts
View file @ 300273c5
import {Injectable} from '@angular/core'; /** * 全局变量 */ @Injectable()export class GlobalData { private _videoNum: number = 1; // 播放器状态 private _token: string; private _userObj: any; private _area: any; private _roles: any; get videoNum(): number { return this._videoNum; } set videoNum(value: number) { this._videoNum = value; } //token get token(): string { return this._token; } set token(value: string) { this._token = value; } //用户信息 get userObj(): any { return this._userObj; } set userObj(value: any) { this._userObj = value; } //区属or市属 get area(): any { return this._area; } set area(value: any) { this._area = value; } //权限 get roles(): any { return this._roles; } set roles(value: any) { this._roles = value; } } import {Injectable} from '@angular/core'; /** * 全局变量 */ @Injectable()export class GlobalData { private _videoNum: number = 1; // 播放器状态 private _token: string; private _userObj: any; private _area: any; private _roles: any; private _history: Array<String>; get videoNum(): number { return this._videoNum; } set videoNum(value: number) { this._videoNum = value; } //token get token(): string { return this._token; } set token(value: string) { this._token = value; } //用户信息 get userObj(): any { return this._userObj; } set userObj(value: any) { this._userObj = value; } //区属or市属 get area(): any { return this._area; } set area(value: any) { this._area = value; } //权限 get roles(): any { return this._roles; } set roles(value: any) { this._roles = value; } //搜索的历史记录 get history(): any { return this._history; } set history(value: any) { this._history = value; } }
\ No newline at end of file \ No newline at end of file
......
src/core/auth.interceptor.ts
View file @ 300273c5
import {AlertController, App, Events} from 'ionic-angular';import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse} from '@angular/common/http';import {Injectable} from '@angular/core';import {Storage} from '@ionic/storage'; import {Observable} from 'rxjs';import {_throw} from 'rxjs/observable/throw';import {CommonService} from "./common.service";import {GlobalData} from "./GlobleData"; /** * http拦截器 增加token信息 */ @Injectable()export class InterceptorProvider implements HttpInterceptor { constructor(private storage: Storage, private alertCtrl: AlertController, private events: Events, private commonSer: CommonService, private app: App, private globle: GlobalData) { } // Intercepts all HTTP requests! intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { const data = this.storage.get(''); return Observable.fromPromise(data) .mergeMap(data => { let clonedReq = this.addToken(request, data); return next.handle(clonedReq).do(res => { if (res instanceof HttpResponse) { this.message(res.body); } }, (error) => { let msg = error.message; this.errorMessage(error); // Pass the error to the caller of the function return _throw(error); }, () => { }) }); } // Adds the token to your headers if it exists private addToken(request: HttpRequest<any>, token: any) { let body; if (request.method == "POST") { body = Object.assign(request.body, {}); if (this.globle.token) { body = Object.assign(body, {"token": this.globle.token}); } if (this.globle.userObj && this.globle.userObj.userid) { body = Object.assign(body, {"userid": this.globle.userObj.userid}); } } if (token) { let clone: HttpRequest<any>; if (request.method == "POST") { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, body: body }); } else { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, }); } return clone; } return request; } //code message message(data) { if (data.code) { let code = data.code; if (code == "401") { this.commonSer.toast("登录已过期"); this.storage.clear(); this.events.publish('toLogin'); } else if (code == "-1") { let alert = this.alertCtrl.create({ title: "提示", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } if (code == 500) { let alert = this.alertCtrl.create({ title: "提示", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } } } //error message errorMessage(data) { if (data.status) { let code = data.status; if (code != 200) { let alert = this.alertCtrl.create({ title: "错误", message: `错误码:${code}。`, buttons: ['确定'] }); alert.present(); } } } } import {AlertController, App, Events} from 'ionic-angular';
\ No newline at end of file import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse} from '@angular/common/http';
import {Injectable} from '@angular/core';
import {Storage} from '@ionic/storage';
import {Observable} from 'rxjs';
import {_throw} from 'rxjs/observable/throw';
import {CommonService} from "./common.service";
import {GlobalData} from "./GlobleData";
/**
* http拦截器 增加token信息
*/
@Injectable()
export class InterceptorProvider implements HttpInterceptor {
constructor(private storage: Storage, private alertCtrl: AlertController, private events: Events,
private commonSer: CommonService, private app: App,
private globle: GlobalData) {
}
// Intercepts all HTTP requests!
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
const data = this.storage.get('');
return Observable.fromPromise(data)
.mergeMap(data => {
let clonedReq = this.addToken(request, data);
return next.handle(clonedReq).do(res => {
if (res instanceof HttpResponse) {
this.message(res.body);
}
}, (error) => {
let msg = error.message;
this.errorMessage(error);
// Pass the error to the caller of the function
return _throw(error);
}, () => {
})
});
}
// Adds the token to your headers if it exists
private addToken(request: HttpRequest<any>, token: any) {
let body;
if (request.method == "POST") {
body = Object.assign(request.body, {});
if (this.globle.token) {
body = Object.assign(body, {"token": this.globle.token});
}
if (this.globle.userObj && this.globle.userObj.userid) {
body = Object.assign(body, {"userid": this.globle.userObj.userid});
}
}
if (token) {
let clone: HttpRequest<any>;
if (request.method == "POST") {
clone = request.clone({
setHeaders: {
// "Accept": `application/json`,
'Content-Type': `application/json;charset=UTF-8`,
},
body: body
});
} else {
clone = request.clone({
setHeaders: {
// "Accept": `application/json`,
'Content-Type': `application/json;charset=UTF-8`,
},
});
}
return clone;
}
return request;
}
//code message
message(data) {
if (data.code) {
let code = data.code;
if (code == "401") {
this.commonSer.toast("登录已过期");
this.storage.clear();
this.events.publish('toLogin');
} else if (code == "-1") {
let alert = this.alertCtrl.create({
title: "提示",
message: `${data.msg}。`,
// message: `网络错误`,
buttons: ['确定']
});
alert.present();
}
if (code == 500) {
let alert = this.alertCtrl.create({
title: "提示",
message: `${data.msg}。`,
buttons: ['确定']
});
alert.present();
}
}
}
//error message
errorMessage(data) {
if (data.status) {
let code = data.status;
if (code != 200) {
let alert = this.alertCtrl.create({
title: "错误",
message: `错误码:${code}。`,
buttons: ['确定']
});
alert.present();
}
}
}
}
src/pages/deal/deal-detail/deal-detail.html
View file @ 300273c5
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
</div> </div>
</div> </div>
</div> </div>
<button class="submit-btn submit" (click)="sureSubmit()">确定</button> <button class="submit-btn submit" (click)="sureSubmit()" *ngIf="roles.indexOf('7') !== -1">确定</button>
</ng-container> </ng-container>
<ng-container *ngIf="!isShow"> <ng-container *ngIf="!isShow">
<p class="tips">提示：请至PC端操作</p> <p class="tips">提示：请至PC端操作</p>
......
src/pages/deal/deal-detail/deal-detail.ts
View file @ 300273c5
...@@ -15,6 +15,7 @@ import {CommonService} from "../../../core/common.service"; ...@@ -15,6 +15,7 @@ import {CommonService} from "../../../core/common.service";
import {AppService} from "../../../app/app.service"; import {AppService} from "../../../app/app.service";
import {institutionalNature} from "../../../app/app.constants"; import {institutionalNature} from "../../../app/app.constants";
import {Detail6Page} from "../detail6/detail6"; import {Detail6Page} from "../detail6/detail6";
import {Storage} from "@ionic/storage";
@Component({ @Component({
selector: 'page-deal-detail', selector: 'page-deal-detail',
...@@ -28,6 +29,7 @@ export class DealDetailPage { ...@@ -28,6 +29,7 @@ export class DealDetailPage {
* flow : String (1-设立，2-变更 ,3-注销，4-补领，0-全部) * flow : String (1-设立，2-变更 ,3-注销，4-补领，0-全部)
*/ */
itemInfo; itemInfo;
roles = [];
obj = { obj = {
opinion: "", opinion: "",
flag: 0, //0-全部 1-督办 2-审核 flag: 0, //0-全部 1-督办 2-审核
...@@ -69,9 +71,10 @@ export class DealDetailPage { ...@@ -69,9 +71,10 @@ export class DealDetailPage {
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
private globle: GlobalData, private globle: GlobalData,
private appSer: AppService, private appSer: AppService,
private commonSer: CommonService, private commonSer: CommonService, private storage: Storage,
private dealSer: DealService, private modalCtrl: ModalController) { private dealSer: DealService, private modalCtrl: ModalController) {
this.itemInfo = this.navParams.get("item"); this.itemInfo = this.navParams.get("item");
this.storage.get('roles').then(value => this.roles = value || [])
this.area = this.globle.area; this.area = this.globle.area;
if (this.itemInfo.status == '4' || this.itemInfo.status == '5') { if (this.itemInfo.status == '4' || this.itemInfo.status == '5') {
this.isShow = false; this.isShow = false;
......
src/pages/home/contact-detail/contact-detail.html
View file @ 300273c5
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</div> </div>
</ion-item> </ion-item>
<ion-item> <ion-item *ngIf="personInfo.role != 4">
<div class="info-item"> <div class="info-item">
<span class="info-span">手机号</span> <span class="info-span">手机号</span>
<div class="info-item-content"> <div class="info-item-content">
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</ion-list> </ion-list>
<button class="call-btn" (click)="call(personInfo?.telPhone)">拨打座机</button> <button class="call-btn" *ngIf="personInfo.role != 4" (click)="call(personInfo?.telPhone)">拨打座机</button>
<button class="call-btn" (click)="call(personInfo?.mobilePhone)">拨打手机</button> <button class="call-btn" *ngIf="personInfo.role != 4" (click)="call(personInfo?.mobilePhone)">拨打手机</button>
</ion-content> </ion-content>
src/pages/home/contact-list/contact-list.html
View file @ 300273c5
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<span class="contact-name">{{person.name}}</span> <span class="contact-name">{{person.name}}</span>
</div> </div>
<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> <span class="contact-telphone">座机：{{person.telPhone || "-"}}</span>
</div> </div>
</div> </div>
......
src/pages/home/contact-list/contact-list.ts
View file @ 300273c5
...@@ -40,9 +40,12 @@ export class ContactListPage { ...@@ -40,9 +40,12 @@ export class ContactListPage {
areacode: this.area.code, areacode: this.area.code,
role: this.role, role: this.role,
}; };
// debugger
console.log(` 查看role： + ${this.role}`)
this.homeSer.getOrgList(data).subscribe( this.homeSer.getOrgList(data).subscribe(
(res) => { (res) => {
this.page.list = res.list.user.filter(e => e.orderNum != "" && e.areacode == this.area.code); this.page.list = res.list.user.filter(e => e.orderNum != "" && e.areacode == this.area.code);
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.noNumList = res.list.user.filter(e => e.orderNum == "" && e.areacode == this.area.code);
this.page.list.sort((a, b) => a.orderNum - b.orderNum); this.page.list.sort((a, b) => a.orderNum - b.orderNum);
console.log(this.page.list); console.log(this.page.list);
......
src/pages/home/contact-role/contact-role.ts
View file @ 300273c5
...@@ -8,17 +8,14 @@ import {ContactListPage} from "../contact-list/contact-list"; ...@@ -8,17 +8,14 @@ import {ContactListPage} from "../contact-list/contact-list";
}) })
export class ContactRolePage { export class ContactRolePage {
roleList = [ roleList = [];
{value: 0, label: '管理员'},
{value: 1, label: '单位领导'},
{value: 2, label: '工作人员'},
{value: 3, label: '其他人员'},
];
area; area;
constructor(public navCtrl: NavController, public navParams: NavParams) { constructor(public navCtrl: NavController, public navParams: NavParams) {
this.area = this.navParams.get('area'); this.area = this.navParams.get('area');
this.roleList = this.area.code == '310000' ? [{value: 0, label: '管理员'},{value: 4, label: '办领导'},{value: 1, label: '处领导'},{value: 2, label: '工作人员'},{value: 3, label: '其他人员'}] : [{value: 4, label: '办领导'},{value: 2, label: '工作人员'},{value: 3, label: '其他人员'}]
console.log('管理role权限：' + JSON.stringify(this.area))
} }
ionViewDidLoad() { ionViewDidLoad() {
......
src/pages/home/contact/contact.ts
View file @ 300273c5
...@@ -32,6 +32,7 @@ export class ContactPage { ...@@ -32,6 +32,7 @@ export class ContactPage {
(res) => { (res) => {
if (res.list) { if (res.list) {
this.areaList = res.list; this.areaList = res.list;
this.areaList.map(x => { if(x.code == '310000') x.role = 4 })
} }
} }
) )
......
src/pages/home/data-report/data-report.html
View file @ 300273c5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ion-content> <ion-content>
<div class="echart-title"> <div class="echart-title">
<span>数据报表分类</span> <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> <ion-option value="事业单位分类信息">事业单位分类信息</ion-option>
<ion-option value="实名制上报率">实名制上报率</ion-option> <ion-option value="实名制上报率">实名制上报率</ion-option>
...@@ -96,6 +96,48 @@ ...@@ -96,6 +96,48 @@
<div class="echart"> <div class="echart">
<div #echartPie class="echart-pie"></div> <div #echartPie class="echart-pie"></div>
</div> </div>
<div class="data">
<div class="table">
<table border="1">
<thead>
<tr>
<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 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>{{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>
</table>
</div>
</div>
</div> </div>
</ng-container> </ng-container>
<ng-container > <ng-container >
......
src/pages/home/data-report/data-report.ts
View file @ 300273c5
...@@ -23,13 +23,12 @@ export class DataReportPage { ...@@ -23,13 +23,12 @@ export class DataReportPage {
yearList = []; yearList = [];
count = { count = {
count1: 0, count1: 0,
qscount1: 0,
count2: 0, count2: 0,
qscount2: 0,
count3: 0, count3: 0,
qscount3: 0, count4: 0,
count5: 0,
count6: 0,
countTotal: 0, countTotal: 0,
qscountTotal: 0,
}; };
pieData; pieData;
...@@ -56,6 +55,13 @@ export class DataReportPage { ...@@ -56,6 +55,13 @@ export class DataReportPage {
this.getPie(); this.getPie();
} }
// 切换主信息
changeType(value) {
if(value == '事业单位分类信息'){
this.drawPie();
}
}
//单位信息总览 //单位信息总览
getUnits() { getUnits() {
const data = { const data = {
...@@ -76,16 +82,10 @@ export class DataReportPage { ...@@ -76,16 +82,10 @@ export class DataReportPage {
} }
countInfo() { countInfo() {
this.count = { this.count.count1 = 0
count1: 0, this.count.count2 = 0
qscount1: 0, this.count.count3 = 0
count2: 0, this.count.countTotal = 0
qscount2: 0,
count3: 0,
qscount3: 0,
countTotal: 0,
qscountTotal: 0,
};
if (this.type == 'unit') { if (this.type == 'unit') {
this.unitsInfo.forEach(e => { this.unitsInfo.forEach(e => {
this.count.count1 += e.unitCount1; this.count.count1 += e.unitCount1;
...@@ -93,10 +93,6 @@ export class DataReportPage { ...@@ -93,10 +93,6 @@ export class DataReportPage {
this.count.count3 += e.unitCount3; this.count.count3 += e.unitCount3;
this.count.countTotal += e.unitTotal; 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') { if (this.type == 'bzrs') {
this.unitsInfo.forEach(e => { this.unitsInfo.forEach(e => {
...@@ -105,10 +101,6 @@ export class DataReportPage { ...@@ -105,10 +101,6 @@ export class DataReportPage {
this.count.count3 += e.bzrs3; this.count.count3 += e.bzrs3;
this.count.countTotal += e.bzrsTotal; 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') { if (this.type == 'syrs') {
this.unitsInfo.forEach(e => { this.unitsInfo.forEach(e => {
...@@ -117,10 +109,6 @@ export class DataReportPage { ...@@ -117,10 +109,6 @@ export class DataReportPage {
this.count.count3 += e.syrs3; this.count.count3 += e.syrs3;
this.count.countTotal += e.syrsTotal; 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;
} }
} }
...@@ -135,10 +123,23 @@ export class DataReportPage { ...@@ -135,10 +123,23 @@ export class DataReportPage {
height: "70%", height: "70%",
containLabel: true containLabel: true
}, },
legend: {
icon: 'rect',
itemWidth: 14,
itemHeight: 5,
itemGap: 13,
data: ['编制人数(人)', '实有人数(人)'],
right: '4%',
textStyle: {
fontSize: 12,
color: '#999'
},
show: this.type !== 'unit'
},
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'cross', type: this.type == 'unit' ? 'cross' : 'linear',
crossStyle: { crossStyle: {
color: '#999' color: '#999'
} }
...@@ -151,11 +152,12 @@ export class DataReportPage { ...@@ -151,11 +152,12 @@ export class DataReportPage {
return e.geoApp; return e.geoApp;
}), }),
axisPointer: { axisPointer: {
type: 'shadow' type: this.type == 'unit' ? 'shadow' : 'line',
snap: true,
}, },
axisLabel: { axisLabel: {
interval: 0, interval: 0,
formatter: function (value) { formatter:function (value) {
return value.split("").join("\n") return value.split("").join("\n")
} }
} }
...@@ -165,10 +167,10 @@ export class DataReportPage { ...@@ -165,10 +167,10 @@ export class DataReportPage {
type: 'value', type: 'value',
min: 0, min: 0,
}, },
series: [ series: this.type == 'unit' ? [
{ {
name: this.type == 'unit' ? '单位数(个)' : this.type == 'syrs' ? '实有人数(人)' : '编制人数(人)', name: this.type == 'unit' ? '单位数(个)' : this.type == 'syrs' ? '实有人数(人)' : '编制人数(人)',
type: 'bar', type: this.type == 'unit' ? 'bar' : 'line',
data: this.unitsInfo.map(e => { data: this.unitsInfo.map(e => {
let d; let d;
if (this.type == 'unit') { if (this.type == 'unit') {
...@@ -182,8 +184,21 @@ export class DataReportPage { ...@@ -182,8 +184,21 @@ export class DataReportPage {
} }
return d; return d;
}), }),
color: ['#feda66'] color: ['#feda66'],
}
] : [
{
name: '编制人数(人)',
type: 'line',
data: this.unitsInfo.map(e => e.bzrsTotal),
color: ['#fad049'],
}, },
{
name: '实有人数(人)',
type: 'line',
data: this.unitsInfo.map(e => e.syrsTotal),
color: ['#0000ff'],
}
] ]
}; };
echarts.init(this.echart1.nativeElement).setOption(this.echartData1, true); echarts.init(this.echart1.nativeElement).setOption(this.echartData1, true);
...@@ -250,7 +265,7 @@ export class DataReportPage { ...@@ -250,7 +265,7 @@ export class DataReportPage {
) )
} }
// // 事业单位分类信息
getPie() { getPie() {
const data = { const data = {
yearmonth: this.yearmonth1 yearmonth: this.yearmonth1
...@@ -258,21 +273,56 @@ export class DataReportPage { ...@@ -258,21 +273,56 @@ export class DataReportPage {
this.homeSer.statisticUnitcatetory(data).subscribe( this.homeSer.statisticUnitcatetory(data).subscribe(
(res) => { (res) => {
this.pieData = res.data; this.pieData = res.data;
this.drawPie();
} }
) )
} }
drawPie() { drawPie() {
this.count = {
count1: 0,
count2: 0,
count3: 0,
count4: 0,
count5: 0,
count6: 0,
countTotal: 0,
}
let keyword = ''; let keyword = '';
if (this.type1 == '单位数(个)') { if (this.type1 == '单位数(个)') {
keyword = 'unitCount'; 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 == '编制人数(人)') { if (this.type1 == '编制人数(人)') {
keyword = 'bzrs'; 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 == '实有人数(人)') { if (this.type1 == '实有人数(人)') {
keyword = 'syrs'; 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 = [ const data = [
{ {
...@@ -323,6 +373,7 @@ export class DataReportPage { ...@@ -323,6 +373,7 @@ export class DataReportPage {
type: 'pie', type: 'pie',
radius: '55%', radius: '55%',
center: ['50%', '60%'], center: ['50%', '60%'],
color: ['#d74e67', '#0092ff', '#21b6b9','#60a900','#01949b','#f17677', '#eba954'],
data: data, data: data,
emphasis: { emphasis: {
itemStyle: { itemStyle: {
......
src/pages/home/home.service.ts
View file @ 300273c5
import {HttpClient} from "@angular/common/http";import {Injectable} from "@angular/core";import {Observable} from "rxjs/Observable";import {SERVER_API_URL, SERVER_API_WEB} from "../../app/app.constants";import {HTTP} from "@ionic-native/http";import {DataFormatService} from "../../core/dataFormat.service"; @Injectable()export class HomeService { constructor(private http: HttpClient, private nativeHttp: HTTP, private dataFormat: DataFormatService) { } //单位信息总揽 units(data): Observable<any> { return this.http.post(SERVER_API_URL + '/statis/units.do', data); } //通讯录 getOrgList(data): Observable<any> { return this.http.post(SERVER_API_URL + '/user/addressinfo.do',data); } //部门人员 getPersonList(data): Observable<any> { return this.http.post(SERVER_API_URL + '/user/getPersonList.do',data); } //事项督办 searchDb(data): Observable<any> { return this.http.post(SERVER_API_URL + '/schedule/search_db.do', data); } //督办操作 dbSuper(data): Observable<any> { return this.http.post(SERVER_API_URL + '/schedule/super.do', data); } //获取附件信息接口 fileAttach(data): Observable<any> { return this.http.post(SERVER_API_URL + '/user/Attach.do', data); } //获取系统中区划信息的接口 getArea(data): Observable<any> { return this.http.post(SERVER_API_URL + '/user/area.do', data); } //实名制上报率排行榜 shangbaolv(data): Observable<any> { return this.http.post(SERVER_API_URL + '/statis/shangbaolv.do', data); } //事业单位信息查询 unitfind(data): Observable<any> { return this.http.post(SERVER_API_WEB + '/infomation/unitfind.do', data); } //机关群团信息查询 creditorgan(data): Observable<any> { return this.http.post(SERVER_API_WEB + '/infomation/creditorgan.do', data); } //年度报告 yearreportdetail(data): Observable<any> { return this.http.post(SERVER_API_WEB + '/infomation/yearreportdetail.do', data); } //事业单位查询 人员信息情况 statisticPerson(data): Observable<any> { return this.http.post(SERVER_API_URL + '/statis/statisticPerson.do', data); } //数据报表 statisticUnitcatetory(data): Observable<any> { return this.http.post(SERVER_API_URL + '/statis/statisticUnitcatetory.do', data); } } import {HttpClient} from "@angular/common/http";
\ No newline at end of file import {Injectable} from "@angular/core";
import {Observable} from "rxjs/Observable";
import {SERVER_API_URL, SERVER_API_WEB} from "../../app/app.constants";
import {HTTP} from "@ionic-native/http";
import {DataFormatService} from "../../core/dataFormat.service";
@Injectable()
export class HomeService {
constructor(private http: HttpClient, private nativeHttp: HTTP,
private dataFormat: DataFormatService) {
}
//单位信息总揽
units(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/statis/units.do', data);
}
//通讯录
getOrgList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/addressinfo.do',data);
}
//部门人员
getPersonList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/getPersonList.do',data);
}
//事项督办
searchDb(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/schedule/search_db.do', data);
}
//督办操作
dbSuper(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/schedule/super.do', data);
}
//获取附件信息接口
fileAttach(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/Attach.do', data);
}
//获取系统中区划信息的接口
getArea(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/area.do', data);
}
//实名制上报率排行榜
shangbaolv(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/statis/shangbaolv.do', data);
}
//事业单位信息查询
unitfind(data): Observable<any> {
return this.http.post(SERVER_API_WEB + '/infomation/unitfind.do', data);
}
//机关群团信息查询
creditorgan(data): Observable<any> {
return this.http.post(SERVER_API_WEB + '/infomation/creditorgan.do', data);
}
//年度报告
yearreportdetail(data): Observable<any> {
return this.http.post(SERVER_API_WEB + '/infomation/yearreportdetail.do', data);
}
//事业单位查询 人员信息情况
statisticPerson(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/statis/statisticPerson.do', data);
}
//数据报表
statisticUnitcatetory(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/statis/statisticUnitcatetory.do', data);
}
//行业分类
getIndustryList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/industry_classification.do', data);
}
//经费形式
getFundingList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/jfxs.do', data);
}
//事业单位
getCauseList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/unit_type.do', data);
}
//规格
getSpecificationsList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/jggg.do', data);
}
//机构性质
getNatureList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/jgxz.do', data);
}
//机构类别
getCategoryList(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/user/jglb.do', data);
}
}
\ No newline at end of file
src/pages/home/home.ts
View file @ 300273c5
...@@ -51,7 +51,8 @@ export class HomePage { ...@@ -51,7 +51,8 @@ export class HomePage {
yearList = []; yearList = [];
isToggle; isToggle;
constructor(public navCtrl: NavController, public homeSer: HomeService, private loadCtrl: LoadingController, constructor(public navCtrl: NavController, public homeSer: HomeService,
private loadCtrl: LoadingController,
private commonSer: CommonService, private storage: Storage, private commonSer: CommonService, private storage: Storage,
private appSer: AppService, public statusBar: StatusBar, private appSer: AppService, public statusBar: StatusBar,
private global: GlobalData, private global: GlobalData,
...@@ -59,9 +60,7 @@ export class HomePage { ...@@ -59,9 +60,7 @@ export class HomePage {
private mineSer: MineService, private tabSer: TabService, private inAppBrowser: InAppBrowser, private mineSer: MineService, private tabSer: TabService, private inAppBrowser: InAppBrowser,
private renderer: Renderer2) { private renderer: Renderer2) {
this.mineInfo = this.global.userObj; this.mineInfo = this.global.userObj;
this.storage.get('roles').then((value) => { this.storage.get('roles').then(value => this.roles = value || []);
this.roles = value || [];
});
const yearmonth = new Date().getFullYear() + '-' + new Date().getMonth(); const yearmonth = new Date().getFullYear() + '-' + new Date().getMonth();
this.yearmonth = this.datePipe.transform(yearmonth, 'yyyy-MM'); this.yearmonth = this.datePipe.transform(yearmonth, 'yyyy-MM');
const year = new Date().getFullYear(); const year = new Date().getFullYear();
...@@ -155,10 +154,23 @@ export class HomePage { ...@@ -155,10 +154,23 @@ export class HomePage {
height: "70%", height: "70%",
containLabel: true containLabel: true
}, },
legend: {
icon: 'rect',
itemWidth: 14,
itemHeight: 5,
itemGap: 13,
data: ['编制人数(人)', '实有人数(人)'],
right: '4%',
textStyle: {
fontSize: 12,
color: '#999'
},
show: this.type !== 'unit'
},
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'cross', type: this.type == 'unit' ? 'cross' : 'linear',
crossStyle: { crossStyle: {
color: '#999' color: '#999'
} }
...@@ -171,7 +183,8 @@ export class HomePage { ...@@ -171,7 +183,8 @@ export class HomePage {
return e.geoApp; return e.geoApp;
}), }),
axisPointer: { axisPointer: {
type: 'shadow' type: this.type == 'unit' ? 'shadow' : 'line',
snap: true,
}, },
axisLabel: { axisLabel: {
interval: 0, interval: 0,
...@@ -185,10 +198,10 @@ export class HomePage { ...@@ -185,10 +198,10 @@ export class HomePage {
type: 'value', type: 'value',
min: 0, min: 0,
}, },
series: [ series: this.type == 'unit' ? [
{ {
name: this.type == 'unit' ? '单位数(个)' : this.type == 'syrs' ? '实有人数(人)' : '编制人数(人)', name: this.type == 'unit' ? '单位数(个)' : this.type == 'syrs' ? '实有人数(人)' : '编制人数(人)',
type: 'bar', type: this.type == 'unit' ? 'bar' : 'line',
data: this.unitsInfo.map(e => { data: this.unitsInfo.map(e => {
let d; let d;
if (this.type == 'unit') { if (this.type == 'unit') {
...@@ -202,8 +215,21 @@ export class HomePage { ...@@ -202,8 +215,21 @@ export class HomePage {
} }
return d; return d;
}), }),
color: ['#feda66'] color: ['#feda66'],
}
] : [
{
name: '编制人数(人)',
type: 'line',
data: this.unitsInfo.map(e => e.bzrsTotal),
color: ['#fad049'],
}, },
{
name: '实有人数(人)',
type: 'line',
data: this.unitsInfo.map(e => e.syrsTotal),
color: ['#0000ff'],
}
] ]
}; };
echarts.init(this.echart.nativeElement).setOption(this.echartData, true); echarts.init(this.echart.nativeElement).setOption(this.echartData, true);
......
src/pages/home/report-info/info-detail/info-detail.html
View file @ 300273c5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<ion-content> <ion-content>
<div class="content"> <div class="content">
<ng-container *ngIf="type == 1"> <ng-container *ngIf="type == 1 || type == 0">
<div class="item-box"> <div class="item-box">
<div class="left">统一社会信用代码:</div> <div class="left">统一社会信用代码:</div>
<div class="right"> <div class="right">
...@@ -32,18 +32,18 @@ ...@@ -32,18 +32,18 @@
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box">
<div class="left">法定代表人:</div> <div class="left">{{type != 0 ? '法定代表人': '负责人'}}:</div>
<div class="right"> <div class="right">
<span>{{ infoObj.frmc}}</span> <span>{{ infoObj.frmc}}</span>
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box" *ngIf="type != 0">
<div class="left">经费来源:</div> <div class="left">经费来源:</div>
<div class="right"> <div class="right">
<span>{{ infoObj.jfxsLabel}}</span> <span>{{ infoObj.jfxsLabel}}</span>
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box" *ngIf="type != 0">
<div class="left">开办资金:</div> <div class="left">开办资金:</div>
<div class="right"> <div class="right">
<span>{{ infoObj.kbzj}}万元</span> <span>{{ infoObj.kbzj}}万元</span>
...@@ -62,18 +62,24 @@ ...@@ -62,18 +62,24 @@
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box">
<div class="left">原事证号:</div> <div class="left">{{type != 0 ? '原事证号' : '归档号'}}:</div>
<div class="right"> <div class="right">
<span>{{ infoObj.zsh}}</span> <span>{{ infoObj.zsh}}</span>
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box">
<div class="left">批准文号:</div> <div class="left">设立文号:</div>
<div class="right"> <div class="right">
<span>{{ infoObj.pzwh}}</span> <span>{{ infoObj.pzwh}}</span>
</div> </div>
</div> </div>
<div class="item-box"> <div class="item-box">
<div class="left">批准文号:</div>
<div class="right">
<span>{{ infoObj.newpw}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构类别:</div> <div class="left">机构类别:</div>
<div class="right"> <div class="right">
<span>{{ infoObj.unitCatetory}}</span> <span>{{ infoObj.unitCatetory}}</span>
...@@ -245,6 +251,12 @@ ...@@ -245,6 +251,12 @@
<span>{{infoObj?.issueDateStr || "-"}}</span> <span>{{infoObj?.issueDateStr || "-"}}</span>
</div> </div>
</div> </div>
<div class="item-box" *ngIf="infoObj?.jgxzStr == '事业单位非法人'">
<div class="left">有效期至:</div>
<div class="right">
<span>{{infoObj?.endDateStr || "-"}}</span>
</div>
</div>
<div class="item-box"> <div class="item-box">
<div class="left">联系人:</div> <div class="left">联系人:</div>
<div class="right"> <div class="right">
......
src/pages/home/report-info/info-detail/info-detail.ts
View file @ 300273c5
...@@ -29,7 +29,7 @@ export class InfoDetailPage { ...@@ -29,7 +29,7 @@ export class InfoDetailPage {
} }
ionViewDidLoad() { ionViewDidLoad() {
if(this.type == 1){ if(this.type == 1 || this.type == 0){
this.getPersonInfo(); this.getPersonInfo();
} }
} }
......
src/pages/home/report-info/info-list/info-list.html
View file @ 300273c5
...@@ -14,31 +14,56 @@ ...@@ -14,31 +14,56 @@
</ion-navbar> </ion-navbar>
<ion-navbar class="input-search"> <ion-navbar class="input-search">
<div class="search-input"> <div class="search-input">
<ion-input type="text" placeholder="请输入统一社会信用代码或者单位名称" [(ngModel)]="info.search"></ion-input> <!--选择-->
<span class="clear" tappable (click)="getList()">搜索</span> <ion-item class="select">
<ion-select [(ngModel)]="info.type" (ngModelChange)="switchType()" interface="popover" placeholder="请选择">
<div *ngFor="let typeData of info.typeDataArr">
<ion-option [value]="typeData?.id">{{typeData?.lable}}</ion-option>
</div>
</ion-select>
</ion-item>
<!--input框-->
<ion-input type="text" placeholder="请输入" [(ngModel)]="info.search"></ion-input>
<span *ngIf="option.type != '3'" class="clear search" [ngStyle]="{'right': option.type != '3' ? '19%' : '7%'}" tappable (click)="getList()">
<img src="./assets/icon/search.png" />
</span>
<span *ngIf="option.type != '3'" class="clear filter" tappable (click)="filterConditions()">筛选</span>
</div> </div>
</ion-navbar> </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-header>
<ion-content> <ion-content>
<ion-refresher (ionRefresh)="getList($event)"> <ul *ngIf="!searchState && option.type != '3'" class="history">
<ion-refresher-content pullingText="下拉刷新" <h6>历史记录</h6>
refreshingSpinner="bubbles"> <li *ngFor="let item of option.history" (click)="historyField(item)">{{item}}</li>
</ion-refresher-content> </ul>
</ion-refresher> <div *ngIf="searchState || info.list && option.type != '3'">
<div class="list"> <ion-refresher (ionRefresh)="getList($event)">
<div *ngFor="let item of info.list" (click)="goToDetail(item)"> <ion-refresher-content pullingText="下拉刷新" refreshingSpinner="bubbles"></ion-refresher-content>
<div class="group"> </ion-refresher>
<div class="inner-group"> <div class="list">
<p *ngIf="option.viewType == '1'" class="person-name">{{item?.mc}}</p> <div *ngFor="let item of info.list" (click)="goToDetail(item)">
<p *ngIf="option.viewType == '2'" class="person-name">{{item?.name}}</p> <div class="group">
<div class="inner-group">
<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>-->
<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>
</div> </div>
</div> </div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content loadingSpinner="bubbles" loadingText="加载中"></ion-infinite-scroll-content>
</ion-infinite-scroll>
</div>
<div *ngIf="option.type == '3'" style="display: flex;width: 100%;height: 100%;align-items: center;justify-content: center;flex-direction: column;">
<img src="./assets/imgs/construction.png" style="width: 100px;height: 100px;"/>
<p style="font-size: 24px;color: #999;">建设中...</p>
</div> </div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
loadingText="加载中"></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content> </ion-content>
src/pages/home/report-info/info-list/info-list.scss
View file @ 300273c5
page-info-list { page-info-list {
.infinite-loading { *{box-sizing: border-box;}
} ul,li{list-style: none;box-sizing: border-box;margin: 0;padding:0;}
.infinite-loading {}
.search-input { .search-input {
display: flex; display: flex;
...@@ -11,18 +13,68 @@ page-info-list { ...@@ -11,18 +13,68 @@ page-info-list {
width: 95%; width: 95%;
margin-left: 10px; margin-left: 10px;
// 下拉select选择
.select{
margin: 0;
padding-left: 5px;
border-radius: 15px 0 0 15px;
font-size: 14px;
width: auto;
height: 40px;
min-height: auto;
.select-text{
overflow: initial;
}
.select-ios .select-placeholder,.select-ios .select-text,.select-ios .select-icon .select-icon-inner {
color: #000;
}
}
// input框
ion-input { ion-input {
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #ffffff;
background-color: #fff; background-color: #fff;
border-radius: 5px; // border-radius: 0 15px 15px 0;
height: 40px;
padding-left: 4px;
// margin-right: 5px;
}
// 搜索按钮
.search{
// width: 20px;
width: 30px;
height: 40px;
background: #fff;
border-radius: 0 15px 15px 0;
display: flex;
align-items: center;
margin-right: 10px;
}
.search img{
width: 20px;
}
// 筛选按钮
.filter{
display: flex;
color: #797979;
height: 40px; height: 40px;
padding-left: 10px; align-items: center;
margin-right: 5px; }
.filter::after{
content: "";
background: url("../assets/icon/filter.png") no-repeat;
background-size: 100%;
width: 15px;
height: 15px;
display: inline-block;
} }
} }
.select-ios .select-icon .select-icon-inner { .select-ios .select-icon .select-icon-inner {
color: #ffffff; color: #fff;
} }
ion-select { ion-select {
...@@ -53,9 +105,25 @@ page-info-list { ...@@ -53,9 +105,25 @@ page-info-list {
} }
} }
.history{
display: flex;
flex-wrap: wrap;
padding: 3px 15px;
>h6{width: 100%;margin: 5px 0 8px;}
>li{
background: #e4e4e4;
color: #999;
padding: 6px 8px;
border-radius:45%;
margin: 3% 3% 0 0;
min-width: 11%;
text-align: center;
}
}
.list { .list {
background-color: #fff; background-color: #fff;
margin-top: 40px;
> div { > div {
padding: 20px 10px; padding: 20px 10px;
} }
...@@ -70,6 +138,22 @@ page-info-list { ...@@ -70,6 +138,22 @@ page-info-list {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
box-sizing: border-box; box-sizing: border-box;
.inner-group{
width: 100%;
display: flex;
justify-content: space-between;
span{
display: flex;
white-space: nowrap;
min-width: 35px;
align-items: center;
font-size: 12px;
padding: 2px 5px;
height: 24px;
border: 1px solid;
border-radius: 4px;
}
}
} }
.toolbar-signUp { .toolbar-signUp {
......
src/pages/home/report-info/person-info/person-info.ts
View file @ 300273c5
...@@ -27,6 +27,7 @@ export class PersonInfoPage { ...@@ -27,6 +27,7 @@ export class PersonInfoPage {
}) })
this.personInfo.age_segment.forEach(e => { this.personInfo.age_segment.forEach(e => {
this.list.age_segment[`${e.EDUCATION_CN}_${e.AGE_SEGMENT_CN}`] = e.NUM; this.list.age_segment[`${e.EDUCATION_CN}_${e.AGE_SEGMENT_CN}`] = e.NUM;
console.log(JSON.stringify(this.list.age_segment))
}) })
this.personInfo.workage_segment.forEach(e => { this.personInfo.workage_segment.forEach(e => {
this.list.workage_segment[`${e.EDUCATION_CN}_${e.WORKAGE_SEGMENT_CN}`] = e.NUM; this.list.workage_segment[`${e.EDUCATION_CN}_${e.WORKAGE_SEGMENT_CN}`] = e.NUM;
......
src/pages/tabs/tabs.ts
View file @ 300273c5
...@@ -12,6 +12,7 @@ import {GlobalData} from "../../core/GlobleData"; ...@@ -12,6 +12,7 @@ import {GlobalData} from "../../core/GlobleData";
import {DealService} from "../deal/deal.service"; import {DealService} from "../deal/deal.service";
import {AppService} from "../../app/app.service"; import {AppService} from "../../app/app.service";
import {NewsService} from "../news/news.service"; import {NewsService} from "../news/news.service";
import {Storage} from "@ionic/storage";
@Component({ @Component({
templateUrl: 'tabs.html' templateUrl: 'tabs.html'
...@@ -22,6 +23,7 @@ export class TabsPage { ...@@ -22,6 +23,7 @@ export class TabsPage {
tabParams = { tabParams = {
test: 'test' test: 'test'
}; };
roles = new Array()
tabRoots = [ tabRoots = [
{ {
...@@ -64,8 +66,9 @@ export class TabsPage { ...@@ -64,8 +66,9 @@ export class TabsPage {
private globle: GlobalData, private globle: GlobalData,
private dealSer: DealService, private dealSer: DealService,
private appSer: AppService, private appSer: AppService,
private newSer: NewsService, private newSer: NewsService, private storage: Storage,
private events: Events, private nav: NavController, private tabSer: TabService) { private events: Events, private nav: NavController, private tabSer: TabService) {
this.storage.get('roles').then(value => this.roles = value || [])
this.searchDeal("1"); this.searchDeal("1");
this.searchNotice(); this.searchNotice();
this.platform.ready().then(() => { this.platform.ready().then(() => {
...@@ -103,9 +106,7 @@ export class TabsPage { ...@@ -103,9 +106,7 @@ export class TabsPage {
}; };
this.dealSer.searchSchedule(data).subscribe( this.dealSer.searchSchedule(data).subscribe(
(res) => { (res) => {
if (res.page.list) { if (res.page) if (res.page.list) this.tabRoots[1].badge = this.roles.indexOf('7') !== -1 ? res.page.totalCount : "";
this.tabRoots[1].badge = res.page.totalCount;
}
} }
) )
} }
...@@ -118,7 +119,7 @@ export class TabsPage { ...@@ -118,7 +119,7 @@ export class TabsPage {
}; };
this.newSer.noticeSearch(data).subscribe( this.newSer.noticeSearch(data).subscribe(
(res) => { (res) => {
if (res.page.list.notice && res.page.list.notice.length > 0) { if (res.page.list) if (res.page.list.notice && res.page.list.notice.length > 0) {
this.tabRoots[2].badge = res.page.list.notice.length; this.tabRoots[2].badge = res.page.list.notice.length;
} }
} }
......
src/theme/style.scss
View file @ 300273c5
//tab切换头 .scroll-tab { overflow: hidden; position: relative; } .news-content { overflow-y: hidden; overflow-x: scroll; width: 100%; .tabs-parent { position: relative; font-size: 1.4rem; white-space: nowrap; padding: .5rem 0; transition: all 500ms; } .tabs-parent::-webkit-scrollbar { display: none; } .selectTab { color: #e42417; padding: 6px 2px; -webkit-transition: background-color 500ms; -moz-transition: background-color 500ms; -ms-transition: background-color 500ms; -o-transition: background-color 500ms; transition: background-color 500ms; } .tabs-children { text-align: center; cursor: pointer; height: 3rem; padding: .5rem 1.2rem; display: inline-block; color: #747378; } #tips, .tips { position: absolute; bottom: 1px; height: 4px; width: 3rem; background-image: linear-gradient(to right, #fece50, #fff4d9); -webkit-transition: left 500ms; -moz-transition: left 500ms; -ms-transition: left 500ms; -o-transition: left 500ms; transition: left 500ms; } } .news-content::-webkit-scrollbar { display: none; } .color-fff { color: #ffffff; } .color-red { color: red; } .focus { float: right; font-size: 1.3rem; width: 6rem; height: 2.5rem; border-radius: 3rem; text-align: center; line-height: 2.5rem; font-weight: normal; } .focus-blue { background: #addae9; border: 0.08rem solid #addae9; } span.noFocus-blue { background-color: #cccccc; border: 0.08rem solid #cccccc; color: #fff; } .focus-yellow { background: linear-gradient(241deg, rgba(255, 247, 203, 1) 0%, rgba(255, 201, 45, 1) 100%); } //勋章 .badge { display: flex; > span.badgeSpan { display: flex; align-items: center; position: relative; height: 28px; > span { display: inline-block; font-size: 12px; transform: scale(0.9); font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; color: rgba(0, 0, 0, .7); background: rgba(250, 216, 114, 1); border-radius: 9px; line-height: 18px; padding: 2px 10px 2px 25px; margin-left: 2px; } img { position: absolute; top: 0; left: 0; z-index: 9; width: 28px; height: 28px; } } } .item-left { text-align: right; width: 20%; font-weight: bold; font-size: 1.4rem; flex: none; } .item-ios.item-block .item-inner { border-bottom: 0.55px solid #eeeeee; } .choose { text-align: right; margin-right: 20px; font-size: 1.5rem; color: #999; } .flowDetail .choose, .handle .choose { color: #5991CA; } .flowDetail .item-left { text-align: left; width: 80%; } ion-label { overflow: auto; white-space: normal; } .item-box { display: flex; border-bottom: 0.55px solid #eeeeee; background-color: #fff; .left { text-align: right; width: 30%; font-weight: bold; font-size: 1.4rem; margin: 11px 8px 11px 2px; } .right { width: 80%; padding: 11px 8px 11px 16px; .div-tag { padding: 10px 0; span { display: inline-block; margin-right: 10px; white-space: initial; border: 1px solid #eee; font-size: 1rem; margin-bottom: 5px; border-radius: 4px; width: 60px; height: 25px; text-align: center; line-height: 25px; ion-icon { margin-left: 3px; color: #666666; font-size: 1rem; } } } button { margin: 0; } ion-textarea { padding: 6px; height: 100px; border: 1px solid #ddd; } .tag { border: 1px solid #ccc; margin: 0 5px 10px 0; display: inline-block; border-radius: 4px; font-size: 1.2rem; width: 60px; height: 25px; text-align: center; line-height: 25px; } span.selectLead { background-color: #fdf8f2; border: 1px solid #e42417; color: #e42417; } } } page-detail1.ion-page > ion-content, page-detail2.ion-page > ion-content, page-detail3.ion-page > ion-content, page-detail4.ion-page > ion-content, page-file-list.ion-page > ion-content, page-history.ion-page > ion-content, page-approvals.ion-page > ion-content, page-detail5.ion-page > ion-content { background-color: #fff; } //tab切换头 .scroll-tab { overflow: hidden; position: relative; } .news-content { overflow-y: hidden; overflow-x: scroll; width: 100%; .tabs-parent { position: relative; font-size: 1.4rem; white-space: nowrap; padding: .5rem 0; transition: all 500ms; } .tabs-parent::-webkit-scrollbar { display: none; } .selectTab { color: #e42417; padding: 6px 2px; -webkit-transition: background-color 500ms; -moz-transition: background-color 500ms; -ms-transition: background-color 500ms; -o-transition: background-color 500ms; transition: background-color 500ms; } .tabs-children { text-align: center; cursor: pointer; height: 3rem; padding: .5rem 1.2rem; display: inline-block; color: #747378; } #tips, .tips { position: absolute; bottom: 1px; height: 4px; width: 3rem; background-image: linear-gradient(to right, #fece50, #fff4d9); -webkit-transition: left 500ms; -moz-transition: left 500ms; -ms-transition: left 500ms; -o-transition: left 500ms; transition: left 500ms; } } .news-content::-webkit-scrollbar { display: none; } .color-fff { color: #ffffff; } .color-red { color: red; } .focus { float: right; font-size: 1.3rem; width: 6rem; height: 2.5rem; border-radius: 3rem; text-align: center; line-height: 2.5rem; font-weight: normal; } .focus-blue { background: #addae9; border: 0.08rem solid #addae9; } span.noFocus-blue { background-color: #cccccc; border: 0.08rem solid #cccccc; color: #fff; } .focus-yellow { background: linear-gradient(241deg, rgba(255, 247, 203, 1) 0%, rgba(255, 201, 45, 1) 100%); } //勋章 .badge { display: flex; > span.badgeSpan { display: flex; align-items: center; position: relative; height: 28px; > span { display: inline-block; font-size: 12px; transform: scale(0.9); font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; color: rgba(0, 0, 0, .7); background: rgba(250, 216, 114, 1); border-radius: 9px; line-height: 18px; padding: 2px 10px 2px 25px; margin-left: 2px; } img { position: absolute; top: 0; left: 0; z-index: 9; width: 28px; height: 28px; } } } .item-left { text-align: right; width: 20%; font-weight: bold; font-size: 1.4rem; flex: none; } .item-ios.item-block .item-inner { border-bottom: 0.55px solid #eeeeee; } .choose { text-align: right; margin-right: 20px; font-size: 1.5rem; color: #999; } .flowDetail .choose, .handle .choose { color: #5991CA; } .flowDetail .item-left { text-align: left; width: 80%; } ion-label { overflow: auto; white-space: normal; } .item-box { display: flex; border-bottom: 0.55px solid #eeeeee; background-color: #fff; .left { text-align: right; width: 30%; font-weight: bold; font-size: 1.4rem; margin: 11px 8px 11px 2px; } .right { width: 80%; padding: 11px 8px 11px 16px; .div-tag { padding: 10px 0; span { display: inline-block; margin-right: 10px; white-space: initial; border: 1px solid #eee; font-size: 1rem; margin-bottom: 5px; border-radius: 4px; width: 60px; height: 25px; text-align: center; line-height: 25px; ion-icon { margin-left: 3px; color: #666666; font-size: 1rem; } } } button { margin: 0; } ion-textarea { padding: 6px; height: 100px; border: 1px solid #ddd; } .tag { border: 1px solid #ccc; margin: 0 5px 10px 0; display: inline-block; border-radius: 4px; font-size: 1.2rem; width: 60px; height: 25px; text-align: center; line-height: 25px; } span.selectLead { background-color: #fdf8f2; border: 1px solid #e42417; color: #e42417; } } } page-detail1.ion-page > ion-content, page-detail2.ion-page > ion-content, page-detail3.ion-page > ion-content, page-detail4.ion-page > ion-content, page-file-list.ion-page > ion-content, page-history.ion-page > ion-content, page-approvals.ion-page > ion-content, page-detail5.ion-page > ion-content { background-color: #fff; } // 搜索页-popover ion-popover { .radio-ios .radio-icon{opacity: 0;width: 0} .input-wrapper{font-size: 14px;} }
\ No newline at end of file \ No newline at end of file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment