初始化参数

src/app/app.scss

@@ -195,7 +195,7 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
   span.more{
     position: absolute;
     padding: 0 5px;
-    top: 0;
+    top: -2px;
     right: 0;
     font-size: 3.5rem;
     color: #333;

src/pages/home/dutyAll/duty/duty.html

@@ -4,7 +4,7 @@
         <ion-title>值班情况</ion-title>
         <ion-buttons end>
             <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>
         </ion-buttons>
 
@@ -32,24 +32,31 @@
             <div class="margin-top-10 duty-Obj">
                 <ion-item class="">
                     <div>
-                        <p> <span class="daySpan">白班</span></p>
+                        <p><span class="daySpan">白班</span></p>
                         <p class="padding-left-15">
-                            <span *ngIf="dayObj.name" >{{dayObj.name}}</span>
-                            <span *ngIf="!dayObj.name" >暂无</span>
+                            <span *ngIf="dayObj.name">{{dayObj.name}}</span>
+                            <span *ngIf="!dayObj.name">暂无</span>
                             <span>{{dayObj?.phone}}</span>
                         </p>
-                        <p class="padding-left-15">{{dayObj?.orgName}}</p>
+                        <p class="padding-left-15">
+                            <span>
+                                {{dayObj?.orgName}}
+                            </span>
+                        </p>
                     </div>
                 </ion-item>
                 <ion-item class=" margin-top-10">
                     <div>
                         <p><span class="nightSpan">夜班</span></p>
                         <p class="padding-left-15">
-                            <span *ngIf="nightObj.name" >{{nightObj.name}}</span>
-                            <span *ngIf="!nightObj.name" >暂无</span>
+                            <span *ngIf="nightObj.name">{{nightObj.name}}</span>
+                            <span *ngIf="!nightObj.name">暂无</span>
                             <span>{{nightObj?.phone}}</span>
                         </p>
-                        <p class="padding-left-15">{{nightObj?.orgName}}</p>
+                        <p class="padding-left-15">
+                            <span>
+                                {{nightObj?.orgName}}
+                            </span></p>
                     </div>
                 </ion-item>
             </div>
@@ -73,8 +80,10 @@
                                 <span *ngIf="item.dayType == 5">周末</span>
                             </span>
 
-                            <span class="span-btn" float-right (click)="dutyDetail(item)" *ngIf="item.applyId">查看详情</span>
-                            <span class="span-btn" float-right (click)="dutyApply(item)" *ngIf="!item.applyId">申请换班</span>
+                            <span class="span-btn" float-right (click)="dutyDetail(item)"
+                                  *ngIf="item.applyId">查看详情</span>
+                            <span class="span-btn" float-right (click)="dutyApply(item)"
+                                  *ngIf="!item.applyId">申请换班</span>
                         </div>
                     </ion-item>
                 </ion-list>

src/pages/home/dutyAll/duty/duty.scss

@@ -24,14 +24,14 @@ page-duty {
   }
   .duty-title{
     position: relative;
-    color: #24bafc;
+    color: #e42417;
   }
   .duty-title::after{
     content: '';
     position: absolute;
     width: 100%;
     height: 2px;
-    background-color: #24bafc;
+    background-color: #e42417;
     bottom: -10px;
     left: 0px;
   }

src/pages/serve-pages/meet-room/meet-room.html

@@ -2,11 +2,6 @@
 
     <ion-navbar>
         <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)">
             <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>

src/pages/serve-pages/meet-room/room-apply/room-apply.html

@@ -76,7 +76,7 @@
             <ion-label style="max-width: 100%" *ngIf="check.participantAmount" class="check-tips">参会人数不可大于会议室可容纳数({{roomMax}})</ion-label>
         </ion-item>
         <div class="item-box">
-            <div class="left"><span class="color-red">*</span>参会人员:
+            <div class="left">参会人员:
             </div>
             <div class="right">
                 <button color="danger" ion-button small (click)="choose()">选择</button>
@@ -87,7 +87,6 @@
                     </span>
                 </div>
             </div>
-            <ion-label *ngIf="check.personList" class="check-tips">请选择参会人员</ion-label>
         </div>
         <div class="item-box">
             <div class="left">设备:</div>

src/pages/serve-pages/meet-room/room-apply/room-apply.ts

@@ -285,7 +285,7 @@ export class RoomApplyPage {
         //校验
         let checkBool = false;
         for (let i in this.check) {
-            if (!this.obj[i] || this.personList.length == 0) {
+            if (!this.obj[i]) {
                 checkBool = true;
                 this.check[i] = true;
             } else {

src/pages/serve-pages/use-car/use-car.html

@@ -7,7 +7,7 @@
                 <ion-icon class="top-right-icon icon-fabu iconfont"></ion-icon>
             </button>
         </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">
                 <span style="font-size: 2.5rem" class="top-right-icon icon iconfont icon-shenhe"></span>
             </button>

src/pages/tabs/key/key.html

@@ -40,7 +40,7 @@
             <div (click)="call()">
                 <div class="card">
                     <img src="./assets/imgs/home/icon-yjbx.png">
-                    <label class="label2-2 more2-2">一键保修</label>
+                    <label class="label2-2 more2-2">一键报修</label>
                 </div>
 
             </div>