Skip to content

M
muChangApp
Commit a882d143 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

修改header部[返回]按钮

parent c9ae7410
Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 307 deletions
src/app/alarm/alarm.page.html
View file @ a882d143
<div class="mainCon" style="overflow-y: hidden">
<Navbar [leftContent]="icon"
(onLeftClick)="onLeftClick()"
style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
>报警信息
</Navbar>
<ion-header>
<ion-toolbar color="secondary">
<ion-buttons slot="start">
<ion-back-button text="" defaultHref="/index"></ion-back-button>
</ion-buttons>
<ion-title class="ion-tittle">报警信息</ion-title>
</ion-toolbar>
</ion-header>
<SegmentedControl class="nav-title" [values]="['今日报警信息', '近一周报警信息']"
(onChange)="choose($event)"
></SegmentedControl>
<ion-content>
<div class="mainCon" style="overflow-y: hidden">
<SegmentedControl class="nav-title" [values]="['今日报警信息', '近一周报警信息']"
(onChange)="choose($event)"
></SegmentedControl>
<div class="alarmCon" style="overflow-y: hidden">
<v-refresh [list]="data" *ngIf="itemExit;else other_content"></v-refresh>
<div class="alarmCon" style="overflow-y: hidden">
<v-refresh [list]="data" *ngIf="itemExit;else other_content"></v-refresh>
</div>
</div>
</div>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
<ng-template #other_content>
<div class="empty-content">
<i class="vo v-shebeiguanli1"></i><br><br>
<span class="empty">没有报警信息</span>
</div>
</ng-template>
<ng-template #other_content>
<div class="empty-content">
<i class="vo v-shebeiguanli1"></i><br><br>
<span class="empty">没有报警信息</span>
</div>
</ng-template>
</ion-content>
src/app/alarm/alarm.page.scss
View file @ a882d143
......@@ -47,3 +47,10 @@
height: 100%;
overflow-y: auto;
}
.ion-tittle {
text-align: center;
padding-left: 0px;
font-weight: lighter;
font-size: large
}
src/app/alarm/alarm.page.ts
View file @ a882d143
......@@ -98,8 +98,4 @@ export class AlarmPage implements OnInit {
}
}
onLeftClick() {
this.tf.transfer({url: '/index'});
}
}
src/app/east/east.page.html
View file @ a882d143
<div class="mainCon" style="" [@EnterLeave]>
<Navbar [leftContent]="icon"
(onLeftClick)="onLeftClick()"
[rightContent]="r"
style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
>
{{fieldRegionName}}控制
</Navbar>
<ng-template #r>
<span (click)="pullToRefresh()">刷新</span>
</ng-template>
<ion-content style="padding-top: 45px ;margin-bottom:45px ;position:relative;overflow-y:auto;">
<div class="topPart">
<ListItem multipleLine *ngIf="yewei || yewei === 0">
当前液位:
<div class="process">
<div [class]="'inlineProcess ' + color" [ngStyle]="{width: proc + '%'}">
<ion-header mode="ios" translucent="false">
<ion-toolbar color="secondary">
<ion-buttons slot="start">
<ion-back-button text="" defaultHref="/index"></ion-back-button>
</ion-buttons>
<ion-title class="ion-tittle">{{fieldRegionName}}控制</ion-title>
<ion-buttons slot="end">
<ion-button style="font-size: medium">刷新</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content>
<div class="mainCon" style="" [@EnterLeave]>
<ion-content style="padding-top: 45px ;margin-bottom:45px ;position:relative;overflow-y:auto;">
<div class="topPart">
<ListItem multipleLine *ngIf="yewei || yewei === 0">
当前液位:
<div class="process">
<div [class]="'inlineProcess ' + color" [ngStyle]="{width: proc + '%'}">
</div>
</div>
</div>
{{yewei.toFixed(2)}}m
</ListItem>
<ListItem multipleLine *ngIf="temp || temp === 0">
当前温度:
<div style="display: inline-block;margin-left: calc(100% - 145px);vertical-align: middle">
{{temp.toFixed(2)}}℃
</div>
</ListItem>
<div *ngFor="let a of nb;let i = index">
<ListItem multipleLine [extra]="a.fieldDeviceName === '南水' ? s1 : s2">
{{a.fieldDeviceName}}
{{yewei.toFixed(2)}}m
</ListItem>
<ListItem multipleLine *ngIf="a.fieldDeviceName === '南水' ? nanClicked : beiClicked">
选择开启时间
<Stepper class="stepClass" [(ngModel)]="duration" [min]="1" [showNumber]="true"></Stepper>
分钟
<div style="text-align: right;padding-top: 10px">
<div Button style="margin-right: 10px" class="btn" (click)="cancel()" [inline]="true"
[size]="'small'" [type]="'default'">取消
</div>
<div Button (click)="confirm(a)" class="btn" [inline]="true" [size]="'small'" [type]="'primary'">
确认
</div>
<ListItem multipleLine *ngIf="temp || temp === 0">
当前温度:
<div style="display: inline-block;margin-left: calc(100% - 145px);vertical-align: middle">
{{temp.toFixed(2)}}℃
</div>
</ListItem>
<div *ngFor="let a of nb;let i = index">
<ListItem multipleLine [extra]="a.fieldDeviceName === '南水' ? s1 : s2">
{{a.fieldDeviceName}}
</ListItem>
<ListItem multipleLine *ngIf="a.fieldDeviceName === '南水' ? nanClicked : beiClicked">
选择开启时间
<Stepper class="stepClass" [(ngModel)]="duration" [min]="1" [showNumber]="true"></Stepper>
分钟
<div style="text-align: right;padding-top: 10px">
<div Button style="margin-right: 10px" class="btn" (click)="cancel()" [inline]="true"
[size]="'small'" [type]="'default'">取消
</div>
<div Button (click)="confirm(a)" class="btn" [inline]="true" [size]="'small'" [type]="'primary'">
确认
</div>
</div>
</ListItem>
</div>
</div>
</div>
<div class="middlePart">
<ion-item lines="full">
<ion-label>运行模式</ion-label>
<ion-select multiple="false" cancelText="取消" okText="确认" [(ngModel)]="workModeSetting.workMode" [(value)]="workModeSetting.workMode" (ionChange)="workModeEvent()">
<ion-select-option value="0">现场控制</ion-select-option>
<ion-select-option value="1">远程手控</ion-select-option>
<ion-select-option value="2">全自动</ion-select-option>
</ion-select>
</ion-item>
<div class="middlePart">
<ion-item lines="full">
<ion-label>运行模式</ion-label>
<ion-select multiple="false" cancelText="取消" okText="确认" [(ngModel)]="workModeSetting.workMode" [(value)]="workModeSetting.workMode" (ionChange)="workModeEvent()">
<ion-select-option value="0">现场控制</ion-select-option>
<ion-select-option value="1">远程手控</ion-select-option>
<ion-select-option value="2">全自动</ion-select-option>
</ion-select>
</ion-item>
<!--<ion-label>发现设备运行时间过长</ion-label>-->
<!--<ion-label>发现设备运行时间过长</ion-label>-->
</div>
<div class="bottomPart">
<ion-list>
<ion-item *ngFor="let a of devices;let i = index" lines = "full">
<ion-label>{{a.fieldDeviceName}}</ion-label>
<v-switch (click)="toggle(a)" [value]="a.value" [disabled]="opDisable" [loading]="a.loading" ></v-switch>
</ion-item>
</ion-list>
<!--<ListItem multipleLine *ngFor="let a of devices;let i = index">-->
<!---->
<!---->
<!--</ListItem>-->
</div>
<ion-button color="danger" expand="full" (click)="unlock()" *ngIf="alarmMsg.locked">现设备运行时间过长点击解锁</ion-button>
</ion-content>
</div>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
<ng-template #s1>
<v-switch [value]="value[0]" [disabled]="beiLoading || value[1]" (click)="toggleNb(0)"
[loading]="nanLoading"></v-switch>
</ng-template>
<ng-template #s2>
<v-switch [value]="value[1]" [disabled]="nanLoading || value[0]" (click)="toggleNb(1)"
[loading]="beiLoading"></v-switch>
</ng-template>
<v-loading-bump style="z-index: 9999; color: red" [remain]="comm.remain" *ngIf="comm.isLoading"></v-loading-bump>
</div>
<div class="bottomPart">
<ion-list>
<ion-item *ngFor="let a of devices;let i = index" lines = "full">
<ion-label>{{a.fieldDeviceName}}</ion-label>
<v-switch (click)="toggle(a)" [value]="a.value" [disabled]="opDisable" [loading]="a.loading" ></v-switch>
</ion-item>
</ion-list>
<!--<ListItem multipleLine *ngFor="let a of devices;let i = index">-->
<!---->
<!---->
<!--</ListItem>-->
</div>
<ion-button color="danger" expand="full" (click)="unlock()" *ngIf="alarmMsg.locked">现设备运行时间过长点击解锁</ion-button>
</ion-content>
</div>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
<ng-template #s1>
<v-switch [value]="value[0]" [disabled]="beiLoading || value[1]" (click)="toggleNb(0)"
[loading]="nanLoading"></v-switch>
</ng-template>
<ng-template #s2>
<v-switch [value]="value[1]" [disabled]="nanLoading || value[0]" (click)="toggleNb(1)"
[loading]="beiLoading"></v-switch>
</ng-template>
<v-loading-bump style="z-index: 9999; color: red" [remain]="comm.remain" *ngIf="comm.isLoading"></v-loading-bump>
</ion-content>
src/app/east/east.page.scss
View file @ a882d143
......@@ -43,4 +43,11 @@
.topPart{
padding-top: 45px;
}
\ No newline at end of file
}
.ion-tittle {
text-align: center;
padding-left: 0px;
font-weight: lighter;
font-size: large
}
src/app/east/east.page.ts
View file @ a882d143
......@@ -281,11 +281,6 @@ export class EastPage implements OnInit {
}]);
}
onLeftClick() {
// this.tf.transfer({url: '/home'});
this.nav.navigateBack('/home');
}
getData(time) {
if (time) {
this.load.toLoad('加载中...', false);
......
src/app/envCtrl/env-detail/env-detail.page.html
View file @ a882d143
<ion-header mode="ios" color="light" translucent="false" style="background-color: #F0F0F0">
<ion-toolbar>
<ion-header mode="ios" translucent="false" style="background-color: #F0F0F0">
<ion-toolbar color="secondary">
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
<ion-back-button text="" ></ion-back-button>
</ion-buttons>
<ion-title mode="ios" class="title">{{fieldRegionName}}详情页</ion-title>
</ion-toolbar>
......@@ -20,7 +20,7 @@
</div>
</ion-header>
<ion-content style="background-color: #F3F4F4;">
<ion-content style="background-color: #F3F4F4;">
<ion-toolbar>
<!--<ion-buttons slot="start">-->
<!--<ion-back-button></ion-back-button>-->
......
src/app/envCtrl/env-detail/env-detail.page.scss
View file @ a882d143
......@@ -5,7 +5,9 @@
.title{
text-align: center;
padding-left: 0px
padding-left: 0px;
font-weight: lighter;
font-size: large
}
.home-bar{
......@@ -33,4 +35,4 @@
box-shadow: #ccc 0.5px 0.5px 3px;
padding: 1px 1px 1px 1px;
color: white;
}
\ No newline at end of file
}
src/app/envCtrl/env-home/env-home.page.html
View file @ a882d143
<ion-header style="background-color: #F3F4F4;">
<!--<div class="topIcon" (click)="toIndex()">-->
<!--<i class="vo v-back"></i>-->
<!--</div>-->
<!--<div class="topSearch">-->
<!--<SearchBar [placeholder]="'点击此处进行搜索'" [(ngModel)]="searchText"-->
<!--(onCancel)="searchText ='';toggleFocus(false);"-->
<!--[setFocus]="false" (onFocus)="toggleFocus(true)" (onBlur)="toggleFocus(false)"-->
<!--(onClear)="searchText ='';toggleFocus(false);"></SearchBar>-->
<!--</div>-->
<ion-header mode="ios">
<ion-toolbar>
<ion-button slot="start" size ="small" color="light" (click)="goTo()">Home</ion-button>
<ion-buttons slot="start">
<ion-back-button color="secondary" defaultHref="/index" text=""></ion-back-button>
</ion-buttons>
<ion-searchbar></ion-searchbar>
</ion-toolbar>
<!--<ion-slides mode="ios"-->
<!--[options]="lunbo" (ionSlideTouchEnd)="slideDidChange()">-->
<!--<ion-slide class="slideCon" *ngFor="let one of imgs">-->
<!--<img [src]="'../../../assets/lunbo/' + one">-->
<!--</ion-slide>-->
<!--</ion-slides>-->
</ion-header>
<ion-content color='light'>
<h1 style="
font-size: 16px;
......
src/app/envCtrl/env-home/env-home.page.ts
View file @ a882d143
......@@ -190,8 +190,7 @@ export class EnvHomePage implements OnInit {
//this.nav.navigateRoot(one.url + query);
}
getData()
{
getData() {
}
......@@ -203,12 +202,4 @@ export class EnvHomePage implements OnInit {
toggleFocus(a){
}
goTo(){
// console.log('+goTo');
const query = '/index';
this.nav.navigateRoot(query);
// console.log('-goTo');
}
}
src/app/envCtrl/tabs/tabs.page.html
View file @ a882d143
<router-outlet name='tabs' (activate)='onActivate($event)'></router-outlet>
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-content>
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-tab-button tab="tab-home" selected="true">
<ion-label>首页</ion-label>
<ion-icon name="home"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="tab-home" selected="true">
<ion-label>首页</ion-label>
<ion-icon name="home"></ion-icon>
</ion-tab-button>
<!--<ion-tab-button tab="tab-detail">-->
<!--<ion-label>详情</ion-label>-->
<!--<ion-icon name="settings"></ion-icon>-->
<!--</ion-tab-button>-->
<!--<ion-tab-button tab="tab-detail">-->
<!--<ion-label>详情</ion-label>-->
<!--<ion-icon name="settings"></ion-icon>-->
<!--</ion-tab-button>-->
<ion-tab-button tab="tab-anal">
<ion-label>分析</ion-label>
<ion-icon name="stats"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="tab-anal">
<ion-label>分析</ion-label>
<ion-icon name="stats"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="tab-alarm">
<ion-label>告警</ion-label>
<ion-icon name="hammer"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="tab-alarm">
<ion-label>告警</ion-label>
<ion-icon name="hammer"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="tab-cfg">
<ion-label>配置</ion-label>
<ion-icon name="construct"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="tab-cfg">
<ion-label>配置</ion-label>
<ion-icon name="construct"></ion-icon>
</ion-tab-button>
</ion-tab-bar>
</ion-tabs>
</ion-tab-bar>
</ion-tabs>
</ion-content>
src/app/home/home.page.html
View file @ a882d143
<!--<div class="mainCon">-->
<ion-header>
<div class="topIcon" (click)="toIndex()">
<i class="vo v-back"></i>
</div>
<div class="topSearch">
<SearchBar [placeholder]="'点击此处进行搜索'" [(ngModel)]="searchText"
(onCancel)="searchText ='';toggleFocus(false);"
[setFocus]="false" (onFocus)="toggleFocus(true)" (onBlur)="toggleFocus(false)"
(onClear)="searchText ='';toggleFocus(false);"></SearchBar>
</div>
<ion-toolbar color="gray">
<ion-buttons slot="start">
<ion-back-button text="" defaultHref="/index" color="secondary"></ion-back-button>
</ion-buttons>
<div class="topSearch">
<SearchBar [placeholder]="'点击此处进行搜索'" [(ngModel)]="searchText"
(onCancel)="searchText ='';toggleFocus(false);"
[setFocus]="false" (onFocus)="toggleFocus(true)" (onBlur)="toggleFocus(false)"
(onClear)="searchText ='';toggleFocus(false);"></SearchBar>
</div>
</ion-toolbar>
<v-search *ngIf="ifFocus" [(value)]="searchText"></v-search>
<ion-slides style="width: 100%;height: 125px;" mode="ios"
[options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">
<ion-slide class="slideCon" *ngFor="let one of imgs">
<div class="inBox">
<img [src]="'../../../assets/lunbo/' + one">
</div>
</ion-slide>
</ion-slides>
<ion-slides style="width: 100%;height: 125px;" mode="ios"
[options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">
<ion-slide class="slideCon" *ngFor="let one of imgs">
<div class="inBox">
<img [src]="'../../../assets/lunbo/' + one">
</div>
</ion-slide>
</ion-slides>
<!--<v-alarm-bar></v-alarm-bar>-->
<!--<v-sub-title title="监测信息" style="background-color: #ffffff"></v-sub-title>-->
<h1 style="
......@@ -93,4 +96,4 @@
<!--<span style="font-size: 13px">{{item.online ? '在线' : '离线'}}</span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
\ No newline at end of file
<!--</div>-->
src/app/home/home.page.scss
View file @ a882d143
......@@ -109,8 +109,8 @@
display: inline-block;
width: calc(100% - 30px);
vertical-align: top;
background-color: #28c9bd
// background-color: #28c9bd;
padding-left: 5px;
}
.listview{
......@@ -122,4 +122,4 @@
.ino-item{
padding: 0px 0px 0px 0px !important;
margin: 0px 0px 0px 0px !important;
}
\ No newline at end of file
}
src/app/home/home.page.ts
View file @ a882d143
......@@ -114,15 +114,7 @@ export class HomePage implements OnInit, OnDestroy {
// });
console.log(one.url + query);
this.nav.navigateForward(one.url + query);
//this.nav.navigateRoot(one.url + query);
}
toIndex() {
if (this.ifFocus) {
this.ifFocus = false;
} else {
this.tf.transfer({url: '/index'});
}
// this.nav.navigateRoot(one.url + query);
}
pullToRefresh(event) {
......
src/app/mine/mine.page.html
View file @ a882d143
<div class="mainContent" style="padding-top: 45px">
<Navbar [leftContent]="icon"
(onLeftClick)="onLeftClick()"
style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
>
个人中心
</Navbar>
<div class="topBar">
<div class="top">
<div class="imgPart">
<img style="height: 100%;border-radius: 100%" src="../../../assets/img/none.png">
</div>
<div class="topRight">
<div class="rightTop">{{user.userName}}</div>
<div class="rightBottom">{{user.companyName}}</div>
<ion-header>
<ion-toolbar color="secondary">
<ion-buttons slot="start">
<ion-back-button text="" defaultHref="/index"></ion-back-button>
</ion-buttons>
<ion-title class="ion-tittle">个人中心</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<div class="mainContent">
<div class="topBar">
<div class="top">
<div class="imgPart">
<img style="height: 100%;border-radius: 100%" src="../../../assets/img/none.png">
</div>
<div class="topRight">
<div class="rightTop">{{user.userName}}</div>
<div class="rightBottom">{{user.companyName}}</div>
</div>
</div>
</div>
</div>
<div class="middleCon">
<div class="line">
<div class="label">昵称</div>
<div class="text">{{user.nickName}}</div>
<div class="middleCon">
<div class="line">
<div class="label">昵称</div>
<div class="text">{{user.nickName}}</div>
</div>
<div class="line">
<div class="label">邮箱</div>
<div class="text">{{user.email}}</div>
</div>
<div class="line">
<div class="label">手机号</div>
<div class="text">{{user.phone}}</div>
</div>
</div>
<div class="line">
<div class="label">邮箱</div>
<div class="text">{{user.email}}</div>
<div class="bottomBtn">
<div Button class="button" (click)="loginOut()" [type]="'primary'" style="letter-spacing: 2px">退出登录</div>
</div>
<div class="line">
<div class="label">手机号</div>
<div class="text">{{user.phone}}</div>
<div style="position: fixed;bottom: 20px;display: inline-block;width: 100%;text-align: center;color: #666666;font-size: 14px;">
版本信息: v2.9.1
</div>
</div>
<div class="bottomBtn">
<div Button class="button" (click)="loginOut()" [type]="'primary'" style="letter-spacing: 2px">退出登录</div>
</div>
<div style="position: fixed;bottom: 20px;display: inline-block;width: 100%;text-align: center;color: #666666;font-size: 14px;">
版本信息: v2.9.1
</div>
</div>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
</ion-content>
src/app/mine/mine.page.scss
View file @ a882d143
......@@ -82,3 +82,11 @@
}
}
}
.ion-tittle {
text-align: center;
padding-left: 0px;
font-weight: lighter;
font-size: large
}
src/app/mine/mine.page.ts
View file @ a882d143
......@@ -41,7 +41,4 @@ export class MinePage implements OnInit {
}]);
}
onLeftClick() {
this.tf.transfer({url: '/index'});
}
}
src/app/other/other.page.html
View file @ a882d143
<div class="mainCon" style="padding-top: 45px;" [@EnterLeave]>
<Navbar [leftContent]="icon"
(onLeftClick)="onLeftClick()"
[rightContent]="r"
style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
>
{{fieldRegionName}}控制
</Navbar>
<ng-template #r>
<span (click)="pullToRefresh()">刷新</span>
</ng-template>
<div class="topPart">
<ListItem multipleLine *ngIf="yewei || yewei === 0">
当前液位:
<div class="process">
<div [class]="'inlineProcess ' + color" [ngStyle]="{width: proc + '%'}">
<ion-header mode="ios" translucent="false">
<ion-toolbar color="secondary">
<ion-buttons slot="start">
<ion-back-button text="" defaultHref="/home"></ion-back-button>
</ion-buttons>
<ion-title calss="ion-tittle">{{fieldRegionName}}控制</ion-title>
<ion-buttons slot="end">
<ion-button style="font-size: medium" (click)="pullToRefresh()">刷新</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content>
<div class="mainCon" style="padding-top: 45px;" [@EnterLeave]>
<div class="topPart">
<ListItem multipleLine *ngIf="yewei || yewei === 0">
当前液位:
<div class="process">
<div [class]="'inlineProcess ' + color" [ngStyle]="{width: proc + '%'}">
</div>
</div>
</div>
{{yewei.toFixed(2)}}m
</ListItem>
<ListItem multipleLine *ngIf="temp || temp === 0">
当前温度:
<div style="display: inline-block;margin-left: calc(100% - 145px);vertical-align: middle">
{{temp.toFixed(2)}}℃
</div>
</ListItem>
</div>
<div class="middlePart">
<ion-list>
<ion-item lines = "full" >
<ion-label>运行模式</ion-label>
<ion-select multiple="false" cancelText="取消" okText="确认" [(ngModel)]="workModeSetting.workMode" [(value)]="workModeSetting.workMode" (ionChange)="workModeEvent()">
<ion-select-option value="0">现场控制</ion-select-option>
<ion-select-option value="1">远程手控</ion-select-option>
<ion-select-option value="2">全自动</ion-select-option>
</ion-select>
</ion-item>
<!--一键控制{{a.l}}-->
<!--<v-switch [value]="a.v" (click)="allCheck(a)" [loading]="a.d"></v-switch>-->
<ion-item *ngFor="let a of allBtns" lines="full" insert="false" >
{{yewei.toFixed(2)}}m
</ListItem>
<ListItem multipleLine *ngIf="temp || temp === 0">
当前温度:
<div style="display: inline-block;margin-left: calc(100% - 145px);vertical-align: middle">
{{temp.toFixed(2)}}℃
</div>
</ListItem>
</div>
<div class="middlePart">
<ion-list>
<ion-item lines = "full" >
<ion-label>运行模式</ion-label>
<ion-select multiple="false" cancelText="取消" okText="确认" [(ngModel)]="workModeSetting.workMode" [(value)]="workModeSetting.workMode" (ionChange)="workModeEvent()">
<ion-select-option value="0">现场控制</ion-select-option>
<ion-select-option value="1">远程手控</ion-select-option>
<ion-select-option value="2">全自动</ion-select-option>
</ion-select>
</ion-item>
<!--一键控制{{a.l}}-->
<!--<v-switch [value]="a.v" (click)="allCheck(a)" [loading]="a.d"></v-switch>-->
<ion-item *ngFor="let a of allBtns" lines="full" insert="false" >
<!--<v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>-->
<ion-label>一键控制{{a.l}}</ion-label>
<v-switch [value]="a.v" (click)="allCheck(a)" [loading]="a.d"></v-switch>
</ion-item>
</ion-list>
</div>
<div class="bottomPart">
<ion-list>
<!--{{a.fieldDeviceName}}-->
<ion-item *ngFor="let a of devices;let i = index" lines="full">
<!--<v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>-->
<ion-label>一键控制{{a.l}}</ion-label>
<v-switch [value]="a.v" (click)="allCheck(a)" [loading]="a.d"></v-switch>
</ion-item>
</ion-list>
</div>
<div class="bottomPart">
<ion-list>
<!--{{a.fieldDeviceName}}-->
<ion-item *ngFor="let a of devices;let i = index" lines="full">
<!--<v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>-->
<ion-label>{{a.fieldDeviceName}}</ion-label>
<v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>
</ion-item>
</ion-list>
<ion-label>{{a.fieldDeviceName}}</ion-label>
<v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>
</ion-item>
</ion-list>
</div>
</div>
</div>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
<ng-template #icon>
<span class="vo v-back"></span>
</ng-template>
<!--<div class="popBox123" style="z-index: 9999;-->
<!--position: absolute;-->
<!--top: 40%;-->
<!--width: 500px;-->
<!--background-color: #ffffff;">-->
<!--<div class="popBox123" style="z-index: 9999;-->
<!--position: absolute;-->
<!--top: 40%;-->
<!--width: 500px;-->
<!--background-color: #ffffff;">-->
<!--<div class="content-frank">正在向设备发起指令,预计还有 15 秒</div>-->
<!--</div>-->
<!--<div class="content-frank">正在向设备发起指令,预计还有 15 秒</div>-->
<!--</div>-->
<v-loading-bump style="z-index: 9999; color: red" [remain]="comm.remain" *ngIf="comm.isLoading"></v-loading-bump>
<v-loading-bump style="z-index: 9999; color: red" [remain]="comm.remain" *ngIf="comm.isLoading"></v-loading-bump>
</ion-content>
src/app/other/other.page.scss
View file @ a882d143
......@@ -37,3 +37,10 @@
height: 100%;
background-color: white;
}
.ion-tittle {
text-align: center;
padding-left: 0px;
font-weight: lighter;
font-size: large
}
src/app/other/other.page.ts
View file @ a882d143
......@@ -177,10 +177,6 @@ export class OtherPage implements OnInit {
}
onLeftClick() {
this.tf.transfer({url: '/home'});
}
initAllBtn() {
if (this.fieldRegionGroup === '发酵池控制组') {
this.allBtns = [];
......
src/theme/variables.scss
View file @ a882d143
......@@ -12,7 +12,8 @@
--ion-color-primary-tint: #4c8dff;
/** secondary **/
--ion-color-secondary: #0cd1e8;
// --ion-color-secondary: #0cd1e8;
--ion-color-secondary: #28c9bd;
--ion-color-secondary-rgb: 12, 209, 232;
--ion-color-secondary-contrast: #ffffff;
--ion-color-secondary-contrast-rgb: 255, 255, 255;
......@@ -82,6 +83,14 @@
--ion-color-white-contrast-rgb: 0,0,0;
--ion-color-white-shade: #e0e0e0;
--ion-color-white-tint: #ffffff;
/** light gray **/
--ion-color-gray: #efeff4;
--ion-color-gray-rgb: 239,239,244;
--ion-color-gray-contrast: #000000;
--ion-color-gray-contrast-rgb: 0,0,0;
--ion-color-gray-shade: #e0e0e0;
--ion-color-gray-tint: #ffffff;
}
.ion-color-white {
......@@ -92,3 +101,12 @@
--ion-color-shade: var(--ion-color-white-shade);
--ion-color-tint: var(--ion-color-white-tint);
}
.ion-color-gray {
--ion-color-base: var(--ion-color-gray);
--ion-color-base-rgb: var(--ion-color-gray-rgb);
--ion-color-contrast: var(--ion-color-gray-contrast);
--ion-color-contrast-rgb: var(--ion-color-gray-contrast-rgb);
--ion-color-shade: var(--ion-color-gray-shade);
--ion-color-tint: var(--ion-color-gray-tint);
}
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