Skip to content

P
party-build-cloud
Commit c12b2058 authored by wangqinghua's avatar wangqinghua
Browse files
Options

信息日报统计

parent ee4914cf
Hide whitespace changes
Inline Side-by-side
Showing with 398 additions and 88 deletions
src/pages/serve-pages/info-report/info-create/info-create.html
View file @ c12b2058
......@@ -8,95 +8,97 @@
<ion-content>
<div class="requiremen-content">
<p class="module">应到</p>
<div class="item-box">
<div class="left module">应到合计:</div>
<div class="right text-right">
{{(obj.expectPayroll| toNumber) + (obj.expectLoan| toNumber) + (obj.expectStation | toNumber)}}
</div>
</div>
<ion-item>
<ion-label class="item-left">在编人数:</ion-label>
<ion-input [(ngModel)]="obj.expectPayroll" type="number" [disabled]="type == 'look'" maxlength="20"
placeholder="在编人数"></ion-input>
</ion-item>
<div class="item-box">
<div class="left">在编明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.expectPayrollDetail"></ion-textarea>
</div>
</div>
<!-- <div class="item-box">-->
<!-- <div class="left">在编明细:</div>-->
<!-- <div class="right">-->
<!-- <textarea [disabled]="type == 'look'" [(ngModel)]="obj.expectPayrollDetail"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<ion-item>
<ion-label class="item-left">借调人数:</ion-label>
<ion-input [(ngModel)]="obj.expectLoan" type="number" [disabled]="type == 'look'" maxlength="20"
placeholder="借调人数"></ion-input>
</ion-item>
<div class="item-box">
<div class="left">借调明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.expectLoanDetail"></ion-textarea>
</div>
</div>
<!-- <div class="item-box">-->
<!-- <div class="left">借调明细:</div>-->
<!-- <div class="right">-->
<!-- <textarea [disabled]="type == 'look'" [(ngModel)]="obj.expectLoanDetail"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<ion-item>
<ion-label class="item-left">驻场人数:</ion-label>
<ion-input [(ngModel)]="obj.expectStation" type="number" [disabled]="type == 'look'" maxlength="20"
placeholder="驻场人数"></ion-input>
</ion-item>
<div class="item-box">
<div class="left">驻场明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.expectStationDetail"></ion-textarea>
</div>
</div>
<!-- <div class="item-box">-->
<!-- <div class="left">驻场明细:</div>-->
<!-- <div class="right">-->
<!-- <textarea [disabled]="type == 'look'" [(ngModel)]="obj.expectStationDetail"></textarea>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="requiremen-content">
<div class="item-box">
<div class="left">应到人数合计:</div>
<div class="left module">实到合计:</div>
<div class="right text-right">
{{(obj.expectPayroll| toNumber) + (obj.expectLoan| toNumber) + (obj.expectStation | toNumber)}}
{{(obj.actualPayroll | toNumber) + (obj.actualLoan | toNumber) + (obj.actualStation| toNumber)}}
</div>
</div>
</div>
<div class="requiremen-content">
<p class="module">实到</p>
<ion-item>
<ion-label class="item-left">在编人数:</ion-label>
<ion-input [(ngModel)]="obj.actualPayroll" type="number" [disabled]="type == 'look'" maxlength="20"
placeholder="在编人数"></ion-input>
</ion-item>
<div class="item-box">
<div class="left">在编明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.actualPayrollDetail"></ion-textarea>
</div>
</div>
<!-- <div class="item-box">-->
<!-- <div class="left">在编明细:</div>-->
<!-- <div class="right">-->
<!-- <textarea [disabled]="type == 'look'" [(ngModel)]="obj.actualPayrollDetail"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<ion-item>
<ion-label class="item-left">借调人数:</ion-label>
<ion-input [(ngModel)]="obj.actualLoan" type="number" [disabled]="type == 'look'" maxlength="20"
placeholder="借调人数"></ion-input>
</ion-item>
<div class="item-box">
<div class="left">借调明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.actualLoanDeail"></ion-textarea>
</div>
</div>
<!-- <div class="item-box">-->
<!-- <div class="left">借调明细:</div>-->
<!-- <div class="right">-->
<!-- <textarea [disabled]="type == 'look'" [(ngModel)]="obj.actualLoanDeail"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<ion-item>
<ion-label class="item-left">驻场人数:</ion-label>
<ion-input [(ngModel)]="obj.actualStation" type="number" [disabled]="type == 'look'" maxlength="20"
placeholder="驻场人数"></ion-input>
</ion-item>
<div class="item-box">
<div class="left">驻场明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.actualStationDetail"></ion-textarea>
</div>
</div>
<!-- <div class="item-box">-->
<!-- <div class="left">驻场明细:</div>-->
<!-- <div class="right">-->
<!-- <textarea [disabled]="type == 'look'" [(ngModel)]="obj.actualStationDetail"></textarea>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="requiremen-content">
<div class="item-box">
<div class="left">实到人数合计:</div>
<div class="left module">返沪居家观察合计:</div>
<div class="right text-right">
{{(obj.actualPayroll | toNumber) + (obj.actualLoan | toNumber) + (obj.actualStation| toNumber)}}
{{ (obj.homePayroll | toNumber) + (obj.homeLoan | toNumber) + (obj.homeStation | toNumber)}}
</div>
</div>
</div>
<div class="requiremen-content">
<p class="module">返沪居家观察</p>
<ion-item>
<ion-label class="item-left">在编人数:</ion-label>
<ion-input [(ngModel)]="obj.homePayroll" type="number" [disabled]="type == 'look'" maxlength="20"
......@@ -105,7 +107,7 @@
<div class="item-box">
<div class="left">在编明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.homePayrollDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.homePayrollDetail"></textarea>
</div>
</div>
<ion-item>
......@@ -116,7 +118,7 @@
<div class="item-box">
<div class="left">借调明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.homeLoanDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.homeLoanDetail"></textarea>
</div>
</div>
<ion-item>
......@@ -127,20 +129,18 @@
<div class="item-box">
<div class="left">驻场明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.homeStationDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.homeStationDetail"></textarea>
</div>
</div>
</div>
<div class="requiremen-content">
<div class="item-box">
<div class="left">返沪居家观察人数合计:</div>
<div class="left module">身体不适合计:</div>
<div class="right text-right">
{{ (obj.homePayroll | toNumber) + (obj.homeLoan | toNumber) + (obj.homeStation | toNumber)}}
{{(obj.unwellPayroll| toNumber) + (obj.unwellLoan| toNumber) + (obj.unwellStation| toNumber)}}
</div>
</div>
</div>
<div class="requiremen-content">
<p class="module">身体不适</p>
<ion-item>
<ion-label class="item-left">在编人数:</ion-label>
<ion-input [(ngModel)]="obj.unwellPayroll" type="number" [disabled]="type == 'look'" maxlength="20"
......@@ -149,7 +149,7 @@
<div class="item-box">
<div class="left">在编明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.unwellPayrollDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.unwellPayrollDetail"></textarea>
</div>
</div>
<ion-item>
......@@ -160,7 +160,7 @@
<div class="item-box">
<div class="left">借调明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.unwellLoanDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.unwellLoanDetail"></textarea>
</div>
</div>
<ion-item>
......@@ -171,20 +171,18 @@
<div class="item-box">
<div class="left">驻场明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.unwellStationDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.unwellStationDetail"></textarea>
</div>
</div>
</div>
<div class="requiremen-content">
<div class="item-box">
<div class="left">身体不适人数合计:</div>
<div class="left module">其他原因未到岗合计:</div>
<div class="right text-right">
{{(obj.unwellPayroll| toNumber) + (obj.unwellLoan| toNumber) + (obj.unwellStation| toNumber)}}
{{(obj.otherPayroll| toNumber) + (obj.otherLoan| toNumber) + (obj.otherStation| toNumber)}}
</div>
</div>
</div>
<div class="requiremen-content">
<p class="module">其他原因未到岗</p>
<ion-item>
<ion-label class="item-left">在编人数:</ion-label>
<ion-input [(ngModel)]="obj.otherPayroll" type="number" [disabled]="type == 'look'" maxlength="20"
......@@ -193,7 +191,7 @@
<div class="item-box">
<div class="left">在编明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.otherPayrollDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.otherPayrollDetail"></textarea>
</div>
</div>
<ion-item>
......@@ -204,7 +202,7 @@
<div class="item-box">
<div class="left">借调明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.otherLoanDetail"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.otherLoanDetail"></textarea>
</div>
</div>
<ion-item>
......@@ -215,14 +213,7 @@
<div class="item-box">
<div class="left">驻场明细:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.otherStationDetail"></ion-textarea>
</div>
</div>
<div class="item-box">
<div class="left">其他原因未到岗人数合计:</div>
<div class="right text-right">
{{(obj.otherPayroll| toNumber) + (obj.otherLoan| toNumber) + (obj.otherStation| toNumber)}}
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.otherStationDetail"></textarea>
</div>
</div>
</div>
......@@ -230,7 +221,7 @@
<div class="item-box">
<div class="left">备注:</div>
<div class="right">
<ion-textarea [disabled]="type == 'look'" [(ngModel)]="obj.remark"></ion-textarea>
<textarea [disabled]="type == 'look'" [(ngModel)]="obj.remark"></textarea>
</div>
</div>
......
src/pages/serve-pages/info-report/info-create/info-create.scss
View file @ c12b2058
......@@ -66,10 +66,11 @@ page-info-create {
margin: 0;
}
ion-textarea {
textarea {
padding: 6px;
height: 100px;
min-height: 60px;
border: 1px solid #ddd;
width: 100%;
}
.tag {
......@@ -126,8 +127,8 @@ page-info-create {
.module {
color: #666666;
text-align: left !important;
font-size: 16px;
padding: 10px;
}
ion-input input {
......
src/pages/serve-pages/info-report/info-report.html
View file @ c12b2058
......@@ -47,6 +47,13 @@
</div>
</div>
</div>
<div class="total" *ngIf="role.includes(15)">
<p>应到总计：{{Total.expectTotal}}</p>
<p>实到总计：{{Total.actualTotal}}</p>
<p>返沪居家观察合计：{{Total.homeTotal}}</p>
<p>身体不适合计：{{Total.unwellTotal}}</p>
<p>其他原因未到岗合计：{{Total.otherTotal}}</p>
</div>
</div>
</ng-container>
<ng-container *ngIf="changeType == 2">
......
src/pages/serve-pages/info-report/info-report.module.ts
View file @ c12b2058
......@@ -5,12 +5,14 @@ import {InfoCreatePage} from "./info-create/info-create";
import {InfoDetailPage} from "./info-detail/info-detail";
import {CalendarModule} from "ion2-calendar";
import {PipesModule} from "../../../pipes/pipes.module";
import {InfoTotalPage} from "./info-total/info-total";
@NgModule({
declarations: [
InfoReportPage,
InfoCreatePage,
InfoDetailPage
InfoDetailPage,
InfoTotalPage,
],
imports: [
CalendarModule,
......@@ -19,7 +21,8 @@ import {PipesModule} from "../../../pipes/pipes.module";
],
entryComponents: [
InfoCreatePage,
InfoDetailPage
InfoDetailPage,
InfoTotalPage,
]
})
export class InfoReportPageModule {
......
src/pages/serve-pages/info-report/info-report.scss
View file @ c12b2058
......@@ -246,4 +246,181 @@ page-info-report {
font-size: 1rem;
}
}
.loader {
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%);
-mos-transform: translate(-50%, -50%);
-o-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
text-align: center;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
cursor: default
}
.loader .text {
position: absolute;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg);
top: -4px;
left: 10px;
z-index: 5;
font-size: 1em;
font-weight: 900;
text-transform: uppercase;
white-space: nowrap;
color: #333333;
}
.rotation {
width: 50px;
height: 50px;
position: relative;
overflow: hidden;
background: #b9cbda;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-mos-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg)
}
svg {
position: absolute;
top: 0;
left: 0
}
svg line {
stroke-width: 10px;
fill: none;
stroke-dasharray: 200px
}
.rotation svg line.top {
stroke: #db2f00;
-webkit-animation: topline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: topline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: topline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-ms-animation: topline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-o-animation: topline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
animation: topline cubic-bezier(.75, 0, .5, 1) 1.5s infinite
}
.rotation svg line.bottom {
stroke: #db2f00;
-webkit-animation: bottomline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: bottomline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: bottomline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-ms-animation: bottomline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-o-animation: bottomline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
animation: bottomline cubic-bezier(.75, 0, .5, 1) 1.5s infinite
}
.rotation svg line.left {
stroke: #13a3a5;
-webkit-animation: leftline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: leftline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: leftline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-ms-animation: leftline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-o-animation: leftline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
animation: leftline cubic-bezier(.75, 0, .5, 1) 1.5s infinite
}
.rotation svg line.right {
stroke: #13a3a5;
-webkit-animation: rightline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: rightline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-moz-animation: rightline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-ms-animation: rightline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
-o-animation: rightline cubic-bezier(.75, 0, .5, 1) 1.5s infinite;
animation: rightline cubic-bezier(.75, 0, .5, 1) 1.5s infinite
}
@keyframes topline {
0% {
transform: translateX(0px)
}
50% {
transform: translateX(-200px)
}
100% {
transform: translateX(-400px)
}
}
@keyframes bottomline {
0% {
transform: translateX(0px)
}
50% {
transform: translateX(200px)
}
100% {
transform: translateX(400px)
}
}
@keyframes leftline {
0% {
transform: translateY(0px)
}
50% {
transform: translateY(200px)
}
100% {
transform: translateY(400px)
}
}
@keyframes rightline {
0% {
transform: translateY(0px)
}
50% {
transform: translateY(-200px)
}
100% {
transform: translateY(-400px)
}
}
@keyframes text {
0% {
transform: scale(1, 1)
}
40% {
transform: scale(1.4, 1.4)
}
70%, 100% {
transform: scale(1, 1)
}
}
.fab-ios-light {
background-color: transparent;
color: #ffffff;
border: none;
}
.total {
padding: 10px;
border: 1px solid #ddd;
border-radius: 5px;
p {
margin-bottom: 5px;
}
}
}
src/pages/serve-pages/info-report/info-report.ts
View file @ c12b2058
......@@ -8,6 +8,7 @@ import {CommonService} from "../../../provide/common.service";
import {AppMainService} from "../../../app/app.service";
import {CalendarComponent, CalendarComponentOptions} from "ion2-calendar";
import {monthCh, weekDay} from "../../../app/main";
import {InfoTotalPage} from "./info-total/info-total";
/**
* Generated class for the InfoReportPage page.
......@@ -49,6 +50,14 @@ export class InfoReportPage {
isLoad: true
};
Total = {
expectTotal: 0,
actualTotal: 0,
homeTotal: 0,
unwellTotal: 0,
otherTotal: 0
};
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService, public datePipe: DatePipe,
......@@ -116,15 +125,28 @@ export class InfoReportPage {
//获取预定日程
getApply() {
this.Total = {
expectTotal: 0,
actualTotal: 0,
homeTotal: 0,
unwellTotal: 0,
otherTotal: 0
};
const data = {
'reportDate': this.date,
orgid: '',
P_pageNumber: '1',
P_pageSize: '100'
};
this.serveSer.searchCensus(data).subscribe(
(res) => {
this.repair = res.data.list;
this.repair.forEach(e => {
this.Total.expectTotal += e.expectPayroll + e.expectLoan + e.expectStation;
this.Total.actualTotal += e.actualPayroll + e.actualLoan + e.actualStation;
this.Total.homeTotal += e.homePayroll + e.homeLoan + e.homeStation;
this.Total.unwellTotal += e.unwellPayroll + e.unwellLoan + e.unwellStation;
this.Total.otherTotal += e.otherPayroll + e.otherLoan + e.otherStation;
})
}
)
}
......@@ -190,4 +212,9 @@ export class InfoReportPage {
this.navCtrl.push(InfoCreatePage, {date: this.date, type: 'edit'});
}
//统计
total() {
this.navCtrl.push(InfoTotalPage, {date: this.date});
}
}
src/pages/serve-pages/info-report/info-total/info-total.html 0 → 100644
View file @ c12b2058
<ion-header>
<ion-navbar>
<ion-title>信息日报统计</ion-title>
<ion-buttons end>
<button icon-only class="toolbar-signUp">
<ion-datetime (ionChange)="getList()" cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD"
pickerFormat="YYYY MM DD" placeholder="请选择"
[(ngModel)]="date"></ion-datetime>
</button>
</ion-buttons>
</ion-navbar>
</ion-header>
<ion-content>
<div class="content">
<div class="list" *ngFor="let item of list">
<p>
<span>名称:</span>
<span>{{item.orgName || "-"}}</span>
</p>
<p>
<span>应到:</span>
<span>{{(item.expectPayroll| toNumber) + (item.expectLoan| toNumber) + (item.expectStation | toNumber)}}</span>
<span>实到</span>
<span>{{(item.actualPayroll | toNumber) + (item.actualLoan | toNumber) + (item.actualStation| toNumber)}}</span>
</p>
</div>
<ion-list text-center style="margin-top: 10rem;color: #666666"
*ngIf="isLoad && list.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无上报
</p>
</ion-list>
</div>
</ion-content>
src/pages/serve-pages/info-report/info-total/info-total.scss 0 → 100644
View file @ c12b2058
page-info-total {
.list {
padding: 10px;
p {
margin-bottom: 5px;
span:nth-child(2n +1) {
margin-left: 10px;
color: #666666;
}
}
}
.list + .list {
border-top: 5px solid #f2f2f2;
}
.datetime-text {
font-size: 14px;
color: #feffff;
}
ion-buttons button, ion-buttons a, ion-buttons input, ion-buttons textarea, ion-buttons div {
background-color: transparent;
}
}
src/pages/serve-pages/info-report/info-total/info-total.ts 0 → 100644
View file @ c12b2058
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {ServeService} from "../../serve.service";
@Component({
selector: 'page-info-total',
templateUrl: 'info-total.html',
})
export class InfoTotalPage {
list = [];
date;
isLoad = false;
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService) {
this.date = this.navParams.get('date');
}
ionViewDidLoad() {
this.getList();
}
getList() {
const data = {
'reportDate': this.date,
P_pageNumber: '1',
P_pageSize: '100'
};
this.serveSer.searchCensus(data).subscribe(
(res) => {
this.list = res.data.list;
this.isLoad = true;
}
)
}
}
src/service/http.service.ts
View file @ c12b2058
......@@ -15,11 +15,11 @@ export class AppGlobal {
//接口基地址
// static domain = "http://192.168.2.106:8080"; //正式环境
// static domain = "https://bjgdjy.shjcdj.cn"; //政务云
static domain = "http://47.103.33.196:8080"; //阿里云正式地址
// static domain = "http://47.103.33.196:8080"; //阿里云正式地址
// static domain = "http://47.103.35.216:8080"; //阿里云测试地址
// static domain = "http://218.78.19.169:8081"; //天翼云地址
// static domain = "http://218.78.19.169:8082/"; //天翼测试云地址
// static domain = ""; //本地环境
static domain = ""; //本地环境
//图片地址
static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";
......@@ -28,8 +28,8 @@ export class AppGlobal {
static pictureNotice = AppGlobal.domain;
//默认版本
// static defaultVersion = "4.7.0"; //dev
static defaultVersion; //prod
static defaultVersion = "4.7.0"; //dev
// static defaultVersion; //prod
//接口地址
static API: any = {
......
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