Skip to content

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

初始化参数

parent fa77a0b2
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 28 deletions
src/app/app.scss
View file @ 9e56dfb0
...@@ -195,7 +195,7 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios { ...@@ -195,7 +195,7 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
span.more{ span.more{
position: absolute; position: absolute;
padding: 0 5px; padding: 0 5px;
top: 0; top: -2px;
right: 0; right: 0;
font-size: 3.5rem; font-size: 3.5rem;
color: #333; color: #333;
......
src/pages/home/dutyAll/duty/duty.html
View file @ 9e56dfb0
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
<ion-navbar> <ion-navbar>
<ion-title>值班情况</ion-title> <ion-title>值班情况</ion-title>
<ion-buttons end> <ion-buttons end>
<button ion-button (click)="sigUp()"> <button ion-button (click)="sigUp()">
<span style="font-size: 1.4rem" ion-text class=" color-fff margin-right-10" >值班签到</span> <span style="font-size: 1.4rem" ion-text class=" color-fff margin-right-10">值班签到</span>
</button> </button>
</ion-buttons> </ion-buttons>
</ion-navbar> </ion-navbar>
<div class="duty"> <div class="duty">
<div class="dutyItem" (click)="change(1)"> <div class="dutyItem" (click)="change(1)">
<span class="{{changeType == 1?'duty-title':''}}">值班安排</span> <span class="{{changeType == 1?'duty-title':''}}">值班安排</span>
</div> </div>
<div class="dutyItem" (click)="change(2)"> <div class="dutyItem" (click)="change(2)">
<span class="{{changeType == 2?'duty-title':''}}">我的值班</span> <span class="{{changeType == 2?'duty-title':''}}">我的值班</span>
</div> </div>
</div> </div>
...@@ -32,29 +32,36 @@ ...@@ -32,29 +32,36 @@
<div class="margin-top-10 duty-Obj"> <div class="margin-top-10 duty-Obj">
<ion-item class=""> <ion-item class="">
<div> <div>
<p> <span class="daySpan">白班</span></p> <p><span class="daySpan">白班</span></p>
<p class="padding-left-15"> <p class="padding-left-15">
<span *ngIf="dayObj.name" >{{dayObj.name}}</span> <span *ngIf="dayObj.name">{{dayObj.name}}</span>
<span *ngIf="!dayObj.name" >暂无</span> <span *ngIf="!dayObj.name">暂无</span>
<span>{{dayObj?.phone}}</span> <span>{{dayObj?.phone}}</span>
</p> </p>
<p class="padding-left-15">{{dayObj?.orgName}}</p> <p class="padding-left-15">
<span>
{{dayObj?.orgName}}
</span>
</p>
</div> </div>
</ion-item> </ion-item>
<ion-item class=" margin-top-10"> <ion-item class=" margin-top-10">
<div> <div>
<p><span class="nightSpan">夜班</span></p> <p><span class="nightSpan">夜班</span></p>
<p class="padding-left-15"> <p class="padding-left-15">
<span *ngIf="nightObj.name" >{{nightObj.name}}</span> <span *ngIf="nightObj.name">{{nightObj.name}}</span>
<span *ngIf="!nightObj.name" >暂无</span> <span *ngIf="!nightObj.name">暂无</span>
<span>{{nightObj?.phone}}</span> <span>{{nightObj?.phone}}</span>
</p> </p>
<p class="padding-left-15">{{nightObj?.orgName}}</p> <p class="padding-left-15">
<span>
{{nightObj?.orgName}}
</span></p>
</div> </div>
</ion-item> </ion-item>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="changeType == 2"> <ng-container *ngIf="changeType == 2">
<div class="duty-content"> <div class="duty-content">
<ion-list *ngIf="nowDuty.length > 0"> <ion-list *ngIf="nowDuty.length > 0">
<ion-item class="dutyItem" class="margin-top-10" *ngFor="let item of nowDuty"> <ion-item class="dutyItem" class="margin-top-10" *ngFor="let item of nowDuty">
...@@ -73,8 +80,10 @@ ...@@ -73,8 +80,10 @@
<span *ngIf="item.dayType == 5">周末</span> <span *ngIf="item.dayType == 5">周末</span>
</span> </span>
<span class="span-btn" float-right (click)="dutyDetail(item)" *ngIf="item.applyId">查看详情</span> <span class="span-btn" float-right (click)="dutyDetail(item)"
<span class="span-btn" float-right (click)="dutyApply(item)" *ngIf="!item.applyId">申请换班</span> *ngIf="item.applyId">查看详情</span>
<span class="span-btn" float-right (click)="dutyApply(item)"
*ngIf="!item.applyId">申请换班</span>
</div> </div>
</ion-item> </ion-item>
</ion-list> </ion-list>
...@@ -85,7 +94,7 @@ ...@@ -85,7 +94,7 @@
</p> </p>
</ion-list> </ion-list>
</div> </div>
</ng-container> </ng-container>
</ion-content> </ion-content>
</ion-content> </ion-content>
src/pages/home/dutyAll/duty/duty.scss
View file @ 9e56dfb0
...@@ -24,14 +24,14 @@ page-duty { ...@@ -24,14 +24,14 @@ page-duty {
} }
.duty-title{ .duty-title{
position: relative; position: relative;
color: #24bafc; color: #e42417;
} }
.duty-title::after{ .duty-title::after{
content: ''; content: '';
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 2px; height: 2px;
background-color: #24bafc; background-color: #e42417;
bottom: -10px; bottom: -10px;
left: 0px; left: 0px;
} }
......
src/pages/serve-pages/meet-room/meet-room.html
View file @ 9e56dfb0
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
<ion-navbar> <ion-navbar>
<ion-title>会议室预定</ion-title> <ion-title>会议室预定</ion-title>
<ion-buttons end *ngIf="role.includes(7) || role.includes(1)">
<button ion-button (click)="goApply(null)">
<ion-icon class="top-right-icon icon-fabu iconfont"></ion-icon>
</button>
</ion-buttons>
<ion-buttons end *ngIf="role.includes(7)"> <ion-buttons end *ngIf="role.includes(7)">
<button ion-button icon-only (click)="goDeal()" class="toolbar-icon"> <button ion-button icon-only (click)="goDeal()" class="toolbar-icon">
<span style="font-size: 2.5rem" class="top-right-icon icon iconfont icon-shenhe"></span> <span style="font-size: 2.5rem" class="top-right-icon icon iconfont icon-shenhe"></span>
......
src/pages/serve-pages/meet-room/room-apply/room-apply.html
View file @ 9e56dfb0
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<ion-label style="max-width: 100%" *ngIf="check.participantAmount" class="check-tips">参会人数不可大于会议室可容纳数({{roomMax}})</ion-label> <ion-label style="max-width: 100%" *ngIf="check.participantAmount" class="check-tips">参会人数不可大于会议室可容纳数({{roomMax}})</ion-label>
</ion-item> </ion-item>
<div class="item-box"> <div class="item-box">
<div class="left"><span class="color-red">*</span>参会人员: <div class="left">参会人员:
</div> </div>
<div class="right"> <div class="right">
<button color="danger" ion-button small (click)="choose()">选择</button> <button color="danger" ion-button small (click)="choose()">选择</button>
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
</span> </span>
</div> </div>
</div> </div>
<ion-label *ngIf="check.personList" class="check-tips">请选择参会人员</ion-label>
</div> </div>
<div class="item-box"> <div class="item-box">
<div class="left">设备:</div> <div class="left">设备:</div>
......
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ 9e56dfb0
...@@ -285,7 +285,7 @@ export class RoomApplyPage { ...@@ -285,7 +285,7 @@ export class RoomApplyPage {
//校验 //校验
let checkBool = false; let checkBool = false;
for (let i in this.check) { for (let i in this.check) {
if (!this.obj[i] || this.personList.length == 0) { if (!this.obj[i]) {
checkBool = true; checkBool = true;
this.check[i] = true; this.check[i] = true;
} else { } else {
......
src/pages/serve-pages/use-car/use-car.html
View file @ 9e56dfb0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ion-icon class="top-right-icon icon-fabu iconfont"></ion-icon> <ion-icon class="top-right-icon icon-fabu iconfont"></ion-icon>
</button> </button>
</ion-buttons> </ion-buttons>
<ion-buttons end *ngIf="role.includes(8) || role.includes(3)"> <ion-buttons end *ngIf="role.includes(8)">
<button ion-button icon-only (click)="goDeal()" class="toolbar-icon"> <button ion-button icon-only (click)="goDeal()" class="toolbar-icon">
<span style="font-size: 2.5rem" class="top-right-icon icon iconfont icon-shenhe"></span> <span style="font-size: 2.5rem" class="top-right-icon icon iconfont icon-shenhe"></span>
</button> </button>
......
src/pages/tabs/key/key.html
View file @ 9e56dfb0
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div (click)="call()"> <div (click)="call()">
<div class="card"> <div class="card">
<img src="./assets/imgs/home/icon-yjbx.png"> <img src="./assets/imgs/home/icon-yjbx.png">
<label class="label2-2 more2-2">一键保修</label> <label class="label2-2 more2-2">一键报修</label>
</div> </div>
</div> </div>
......
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