Skip to content

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

update

parent 695b0042
Hide whitespace changes
Inline Side-by-side
Showing with 444 additions and 51 deletions
src/app/app.constants.ts
View file @ b7c48a38
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'}, ]
\ No newline at end of file
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'}, ]
\ No newline at end of file
......
src/pages/home/data-report/data-report.html
View file @ b7c48a38
......@@ -63,6 +63,31 @@
</div>
<div class="echart-data">
<div class="echart-title">
<span>事业单位分类信息</span>
<ion-select [(ngModel)]="yearmonth1" cancelText="取消" okText="确定" placeholder="选择"
(ngModelChange)="getPie()">
<ng-container *ngFor="let item of yearList">
<ion-option [value]="item">{{item}}</ion-option>
</ng-container>
</ion-select>
</div>
<ion-segment style="padding: 0 30px" [(ngModel)]="type1" (ngModelChange)="drawPie()">
<ion-segment-button value="单位数(个)">
单位数(个)
</ion-segment-button>
<ion-segment-button value="编制人数(人)">
编制人数(人)
</ion-segment-button>
<ion-segment-button value="实有人数(人)">
实有人数(人)
</ion-segment-button>
</ion-segment>
<div class="echart">
<div #echartPie class="echart-pie"></div>
</div>
</div>
<div class="echart-data">
<div class="echart-title">
<span>实名制上报率</span>
</div>
<div class="echart">
......
src/pages/home/data-report/data-report.ts
View file @ b7c48a38
......@@ -9,14 +9,17 @@ import * as echarts from 'echarts';
templateUrl: 'data-report.html',
})
export class DataReportPage {
@ViewChild('echart1') echart1: ElementRef;//显示图形的容器
@ViewChild('echart2') echart2: ElementRef;//显示图形的容器
@ViewChild('echart1') echart1: ElementRef;
@ViewChild('echart2') echart2: ElementRef;
@ViewChild('echartPie') echartPie: ElementRef;
echartData1;
echartData2;
yearmonth = '2019-11';
yearmonth1 = '2019-11';
areaList;
unitsInfo;
type = "unit";
type1 = '单位数(个)';
yearList = [];
count = {
count1: 0,
......@@ -25,12 +28,15 @@ export class DataReportPage {
countTotal: 0,
};
pieData;
constructor(public navCtrl: NavController, public navParams: NavParams,
private datePipe: DatePipe,
private loadCtrl: LoadingController,
private homeSer: HomeService) {
const yearmonth = new Date().getFullYear() + '-' + new Date().getMonth();
this.yearmonth = this.datePipe.transform(yearmonth, 'yyyy-MM');
this.yearmonth1 = this.datePipe.transform(yearmonth, 'yyyy-MM');
const year = new Date().getFullYear();
const month = new Date().getMonth();
for (let i = 1; i < month + 1; i++) {
......@@ -42,6 +48,7 @@ export class DataReportPage {
ionViewDidLoad() {
this.shangbaolv();
this.getUnits();
this.getPie();
}
//单位信息总览
......@@ -113,7 +120,7 @@ export class DataReportPage {
{
type: 'category',
data: this.unitsInfo.map(e => {
return e.geo;
return e.geoApp;
}),
axisPointer: {
type: 'shadow'
......@@ -211,4 +218,86 @@ export class DataReportPage {
)
}
//
getPie() {
const data = {
yearmonth: this.yearmonth1
}
this.homeSer.statisticUnitcatetory(data).subscribe(
(res) => {
this.pieData = res.data;
this.drawPie();
}
)
}
drawPie() {
let keyword = '';
if (this.type1 == '单位数(个)') {
keyword = 'unitCount';
}
if (this.type1 == '编制人数(人)') {
keyword = 'bzrs';
}
if (this.type1 == '实有人数(人)') {
keyword = 'syrs';
}
let option1 = {
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c} ({d}%)'
},
series: [
{
name: this.type1,
type: 'pie',
radius: '55%',
center: ['50%', '60%'],
data: [
{
name: '行政类',
value: this.sum(this.pieData, `${keyword}1`)
},
{
name: '参照行政类',
value: this.sum(this.pieData, `${keyword}2`)
},
{
name: '公益一类',
value: this.sum(this.pieData, `${keyword}3`)
},
{
name: '公益二类',
value: this.sum(this.pieData, `${keyword}4`)
},
{
name: '经营类',
value: this.sum(this.pieData, `${keyword}5`)
},
{
name: '暂缓分类',
value: this.sum(this.pieData, `${keyword}6`)
}
],
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}
]
};
echarts.init(this.echartPie.nativeElement).setOption(option1, true);
}
sum(arr, key) {
let s = 0;
for (let i = arr.length - 1; i >= 0; i--) {
s += arr[i][key];
}
return s;
}
}
src/pages/home/home.html
View file @ b7c48a38
......@@ -11,7 +11,6 @@
</button>
</ion-buttons>
</ion-navbar>
</ion-header>
<ion-content>
......@@ -112,6 +111,5 @@
<ion-icon tappable name="arrow-up"></ion-icon>
</span>
</p>
</div>
</ion-content>
src/pages/home/home.module.ts
View file @ b7c48a38
......@@ -13,6 +13,7 @@ import {InfoListPage} from "./report-info/info-list/info-list";
import {YearReportPage} from "./report-info/year-report/year-report";
import {PipesModule} from "../../pipes/pipes.module";
import {ContactRolePage} from "./contact-role/contact-role";
import {PersonInfoPage} from "./report-info/person-info/person-info";
@NgModule({
declarations: [
......@@ -27,6 +28,7 @@ import {ContactRolePage} from "./contact-role/contact-role";
InfoListPage,
YearReportPage,
ContactRolePage,
PersonInfoPage
],
imports: [
IonicPageModule.forChild(HomePage),
......@@ -44,6 +46,7 @@ import {ContactRolePage} from "./contact-role/contact-role";
InfoListPage,
ContactRolePage,
YearReportPage,
PersonInfoPage
]
})
export class HomeModule {
......
src/pages/home/home.service.ts
View file @ b7c48a38
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); } }
\ No newline at end of file
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); } }
\ No newline at end of file
......
src/pages/home/home.ts
View file @ b7c48a38
......@@ -168,7 +168,7 @@ export class HomePage {
{
type: 'category',
data: this.unitsInfo.map(e => {
return e.geo;
return e.geoApp;
}),
axisPointer: {
type: 'shadow'
......
src/pages/home/report-info/info-detail/info-detail.html
View file @ b7c48a38
......@@ -10,49 +10,49 @@
<div class="item-box">
<div class="left">统一社会信用代码:</div>
<div class="right">
<span>{{ infoObj.xydm || '-'}}</span>
<span>{{ infoObj.xydm}}</span>
</div>
</div>
<div class="item-box">
<div class="left">单位名称:</div>
<div class="right">
<span>{{ infoObj.mc || '-'}}</span>
<span>{{ infoObj.mc}}</span>
</div>
</div>
<div class="item-box">
<div class="left">宗旨和业务范围:</div>
<div class="right">
<span>{{ infoObj.zzyw || '-'}}</span>
<span>{{ infoObj.zzyw}}</span>
</div>
</div>
<div class="item-box">
<div class="left">住所:</div>
<div class="right">
<span>{{ infoObj.txdz || '-'}}</span>
<span>{{ infoObj.txdz}}</span>
</div>
</div>
<div class="item-box">
<div class="left">法定代表人:</div>
<div class="right">
<span>{{ infoObj.frmc || '-'}}</span>
<span>{{ infoObj.frmc}}</span>
</div>
</div>
<div class="item-box">
<div class="left">经费来源:</div>
<div class="right">
<span>{{ infoObj.jfxsLabel || '-'}}</span>
<span>{{ infoObj.jfxsLabel}}</span>
</div>
</div>
<div class="item-box">
<div class="left">开办资金:</div>
<div class="right">
<span>{{ infoObj.kbzj || '-'}}万元</span>
<span>{{ infoObj.kbzj}}万元</span>
</div>
</div>
<div class="item-box">
<div class="left">举办单位:</div>
<div class="right">
<span>{{ infoObj.zgbm || '-'}}</span>
<span>{{ infoObj.zgbm}}</span>
</div>
</div>
<div class="item-box">
......@@ -64,9 +64,81 @@
<div class="item-box">
<div class="left">原事证号:</div>
<div class="right">
<span>{{ infoObj.zsh || '-'}}</span>
<span>{{ infoObj.zsh}}</span>
</div>
</div>
<div class="item-box">
<div class="left">编制数:</div>
<div class="right">
<span>{{ infoObj.bzrs}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准文号:</div>
<div class="right">
<span>{{ infoObj.pzwh}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构类别:</div>
<div class="right">
<span>{{ infoObj.unitCatetory}}</span>
</div>
</div>
<div class="item-box">
<div class="left">最近上报在编人数({{nowDate}}):</div>
<div class="right">
<span>{{ infoObj.syrs}}现有人数({{ infoObj.syrs_now}})</span>
</div>
</div>
<div class="item-box">
<div class="left">原事证号:</div>
<div class="right">
<span>{{ infoObj.zsh}}</span>
</div>
</div>
<div class="item-box">
<div class="left">领导职数:</div>
<div class="right">
<span>{{ infoObj.leaderCount}}</span>
</div>
</div>
<div class="item-box">
<div class="left">正职领导数:</div>
<div class="right">
<span>{{ infoObj.zzlds}}</span>
</div>
</div>
<div class="item-box">
<div class="left">副职领导数</div>
<div class="right">
<span>{{ infoObj.fzlds}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准内设机构数:</div>
<div class="right">
<span>{{ infoObj.pznsjg}}</span>
</div>
</div>
<div class="item-box">
<div class="left">批准内设机构批文:</div>
<div class="right">
<span>{{ infoObj.pwNo}}</span>
</div>
</div>
<div class="item-box" *ngIf="infoObj.filenumber">
<div class="left">备注:</div>
<div class="right">
<span>根据{{infoObj.filenumber}}文事业单位建制撤销</span>
</div>
</div>
<ion-item>
<ion-label class="item-left">
人员信息情况
</ion-label>
<ion-label (click)="openDetail()" class="choose">详情</ion-label>
</ion-item>
<p>年度报告情况</p>
<div>
<ng-container *ngFor="let year of infoObj?.ndbgUnitList">
......@@ -74,7 +146,7 @@
<div class="left">{{year.year}}</div>
<div class="right year">
<span
[ngClass]="{'select':year.is_public == '0'}">{{ year.is_public == '0' ? '未上报' : '已公开'}}</span>
[ngClass]="{'select':year.is_public == '0'}">{{ year.is_public == '0' ? '未上报' : '已公开'}}</span>
</div>
</div>
</ng-container>
......@@ -88,12 +160,6 @@
</div>
</div>
<div class="item-box">
<div class="left">机构性质:</div>
<div class="right">
<span>{{infoObj?.jgxzStr || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">机构地址:</div>
<div class="right">
<span>{{infoObj?.jgdz || "-"}}</span>
......@@ -118,18 +184,6 @@
</div>
</div>
<div class="item-box">
<div class="left">编制数:</div>
<div class="right">
<span>{{infoObj?.bzrs || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">实有人数:</div>
<div class="right">
<span>{{infoObj?.syrs || "-"}}</span>
</div>
</div>
<div class="item-box">
<div class="left">联系人:</div>
<div class="right">
<span>{{infoObj?.lxr || "-"}}</span>
......
src/pages/home/report-info/info-detail/info-detail.ts
View file @ b7c48a38
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
import {HomeService} from "../../home.service";
import {YearReportPage} from "../year-report/year-report";
import {DatePipe} from "@angular/common";
import {Detail3Page} from "../../../deal/detail3/detail3";
import {PersonInfoPage} from "../person-info/person-info";
@Component({
......@@ -12,14 +15,21 @@ export class InfoDetailPage {
type = 1;
infoObj;
nowDate;
personInfo;
constructor(public navCtrl: NavController, public navParams: NavParams,
private datePipe: DatePipe,
private modalCtrl: ModalController,
private homeSer: HomeService) {
this.infoObj = this.navParams.get('obj');
this.type = this.navParams.get('type');
this.nowDate = this.datePipe.transform(Date.now(), 'yyyy年MM月');
}
ionViewDidLoad() {
this.getPersonInfo();
console.log('ionViewDidLoad InfoDetailPage');
}
......@@ -29,4 +39,23 @@ export class InfoDetailPage {
}
this.navCtrl.push(YearReportPage, {ndbg_id: item.ndbg_id, unit_id: this.infoObj.unit_id});
}
getPersonInfo() {
const data = {
unit_id: this.infoObj.unit_id
}
this.homeSer.statisticPerson(data).subscribe(
(res) => {
this.personInfo = res;
}
)
}
openDetail() {
let modalCtrl = this.modalCtrl.create(PersonInfoPage, {item: this.personInfo}, {
enterAnimation: 'modal-from-right-enter',
leaveAnimation: 'modal-from-right-leave'
});
modalCtrl.present();
}
}
src/pages/home/report-info/person-info/person-info.html 0 → 100644
View file @ b7c48a38
<ion-header>
<ion-navbar>
<ion-title>人员信息情况</ion-title>
</ion-navbar>
</ion-header>
<ion-content>
<div class="data">
<div class="table" #table>
<p>按岗位分布</p>
<table border="1">
<thead>
<tr>
<th>管理岗位(参公)</th>
<th>管理岗位(非参公)</th>
<th>专业技术岗位</th>
<th>工勤技能岗位</th>
<th>其他岗位</th>
</tr>
</thead>
<tbody>
<tr>
<td>岗位等级</td>
</tr>
</tbody>
</table>
</div>
</div>
</ion-content>
src/pages/home/report-info/person-info/person-info.scss 0 → 100644
View file @ b7c48a38
page-person-info {
.toolbar-ios ion-title {
padding: 0;
width: 80%;
}
table {
width: 100%;
td, th {
text-align: center;
height: 30px;
padding: 2px;
}
}
.table {
height: 177px;
overflow: hidden;
transition: all 1s;
}
}
src/pages/home/report-info/person-info/person-info.ts 0 → 100644
View file @ b7c48a38
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams} from 'ionic-angular';
@Component({
selector: 'page-person-info',
templateUrl: 'person-info.html',
})
export class PersonInfoPage {
personInfo;
list = {
age_segment: [
{POSTLEVEL_CN:"博士研究生",NUM:'0'},
{POSTLEVEL_CN:"硕士研究生",NUM:'0'},
{POSTLEVEL_CN:"本科",NUM:'0'},
{POSTLEVEL_CN:"大专",NUM:'0'},
{POSTLEVEL_CN:"中专",NUM:'0'},
{POSTLEVEL_CN:"高中",NUM:'0'},
{POSTLEVEL_CN:"初中",NUM:'0'},
{POSTLEVEL_CN:"其他",NUM:'0'},
],
postLevel: [],
postLevel_Leader: [],
retiredPerson: [],
workage_segment: [],
}
constructor(public navCtrl: NavController, public navParams: NavParams) {
this.personInfo = this.navParams.get('item');
}
ionViewDidLoad() {
console.log('ionViewDidLoad PersonInfoPage');
}
}
src/pages/news/news.html
View file @ b7c48a38
......@@ -8,20 +8,87 @@
<ion-content padding>
<ion-segment style="padding: 0 30px" [(ngModel)]="type" (ngModelChange)="switchType()">
<ion-segment-button value="1">
督办/待办提醒
</ion-segment-button>
<ion-segment-button value="2">
定期消息
</ion-segment-button>
<ion-segment-button value="3">
人工提醒
</ion-segment-button>
</ion-segment>
<div class="notice">
<ng-container *ngFor="let item of newList;">
<div class="notice-card" (click)="goDetail(item)">
<div class="notice-type">
<div class="type-img">
<img src="./assets/imgs/db.png">
<ng-container *ngIf="type == '1'">
<ng-container *ngFor="let item of newList;">
<div class="notice-card" (click)="goDetail(item)">
<div class="notice-type">
<div class="type-img">
<img src="./assets/imgs/db.png">
</div>
<div class="type-info" style="width:50%;">{{item.title}}</div>
<div class="type-time" style="width:30%;">{{item.sendTime | date:'yyyy-MM-dd' }}</div>
</div>
<div class="notice-content">
{{item.content}}
</div>
</div>
</ng-container>
</ng-container>
<ng-container *ngIf="type == '2'">
<ng-container *ngFor="let item of dqtxList;">
<div class="notice-card" (click)="goDetail(item)">
<div class="type-time" style="margin-bottom: 6px">{{item.createdateStr | date:'yyyy-MM-dd' }}</div>
<div class="notice-type2">
<!-- <p>-->
<!-- <span class="left">统一社会信用代码:</span>-->
<!-- <span class="right">{{item.xydm}}</span>-->
<!-- </p>-->
<p>
<span class="left">名称:</span>
<span class="right">{{item.mc}}</span>
</p>
<p>
<span class="left">举办单位:</span>
<span class="right">{{item.zgbm}}</span>
</p>
<p>
<span class="left">代办类型:</span>
<span class="right">{{item.txContent}}</span>
</p>
</div>
<div class="notice-content">
{{item.cause}}
</div>
<div class="type-info" style="width:50%;">{{item.title}}</div>
<div class="type-time" style="width:30%;">{{item.sendTime | date:'yyyy-MM-dd' }}</div>
</div>
<div class="notice-content">
{{item.content}}
</ng-container>
</ng-container>
<ng-container *ngIf="type == '3'">
<ng-container *ngFor="let item of rgtxList;">
<div class="notice-card" (click)="goDetail(item)">
<div class="type-time" style="margin-bottom: 6px">{{item.remindDateStr | date:'yyyy-MM-dd' }}</div>
<div class="notice-type2">
<p>
<span class="left">标题:</span>
<span class="right">{{item.title}}</span>
</p>
<p>
<span class="left">填写人:</span>
<span class="right">{{item.writer}}</span>
</p>
<p>
<span class="left">被提醒人:</span>
<span class="right">{{item.reminder}}</span>
</p>
</div>
<div class="notice-content">
{{item.content}}
</div>
</div>
</div>
</ng-container>
</ng-container>
</div>
</ion-content>
src/pages/news/news.scss
View file @ b7c48a38
......@@ -17,6 +17,25 @@ page-news {
align-items: center;
}
.notice-type2 {
> p {
display: flex;
margin-bottom: 8px;
align-items: center;
.left {
width: 20%;
text-align: right;
color: #666666;
}
.right {
width: 75%;
padding-left: 5px;
}
}
}
.type-img {
text-align: center;
width: 20%;
......
src/pages/news/news.service.ts
View file @ b7c48a38
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {HTTP} from "@ionic-native/http";import {DataFormatService} from "../../core/dataFormat.service";import {Observable} from "rxjs";import {SERVER_API_URL} from "../../app/app.constants"; @Injectable()export class NewsService { constructor(private http: HttpClient, private nativeHttp: HTTP, private dataFormat: DataFormatService) { } noticeSearch(data): Observable<any> { return this.http.post(SERVER_API_URL + '/notice/search.do', data); }}
\ No newline at end of file
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {HTTP} from "@ionic-native/http";import {DataFormatService} from "../../core/dataFormat.service";import {Observable} from "rxjs";import {SERVER_API_URL} from "../../app/app.constants"; @Injectable()export class NewsService { constructor(private http: HttpClient, private nativeHttp: HTTP, private dataFormat: DataFormatService) { } noticeSearch(data): Observable<any> { return this.http.post(SERVER_API_URL + '/notice/search.do', data); } //定时提醒 dqtxList(data): Observable<any> { return this.http.post(SERVER_API_URL + '/schedule/dqtxList.do', data); } //人工提醒 rgtxList(data): Observable<any> { return this.http.post(SERVER_API_URL + '/schedule/rgtxList.do', data); } }
\ No newline at end of file
......
src/pages/news/news.ts
View file @ b7c48a38
......@@ -12,7 +12,10 @@ import {DealDetailPage} from "../deal/deal-detail/deal-detail";
templateUrl: 'news.html',
})
export class NewsPage {
type = "1";
newList = [];
dqtxList = [];
rgtxList = [];
constructor(public navCtrl: NavController, public navParams: NavParams,
private newSer: NewsService) {
......@@ -20,6 +23,20 @@ export class NewsPage {
ionViewDidEnter() {
this.getList();
const data = {
page: 1,
limit: 10
}
this.newSer.dqtxList(data).subscribe(
(res) => {
this.dqtxList = res.dqtxList;
}
)
this.newSer.rgtxList(data).subscribe(
(res) => {
this.rgtxList = res.rgtxList;
}
)
}
getList() {
......@@ -37,6 +54,7 @@ export class NewsPage {
)
}
goDetail(item) {
const data = {
id: item.scheduleid,
......@@ -45,4 +63,8 @@ export class NewsPage {
this.navCtrl.push(DealDetailPage, {"item": data});
}
switchType(){
}
}
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