Skip to content

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

homepage 用了ion-list

parent 9e18fb11
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 24 deletions
src/app/home/home.page.html
View file @ c6c5549e
...@@ -30,27 +30,51 @@ ...@@ -30,27 +30,51 @@
<i class="vo v-no-signal"></i> <i class="vo v-no-signal"></i>
<div class="in">网络连接失败</div> <div class="in">网络连接失败</div>
</div> </div>
<div class="item" *ngFor="let item of items" (click)="toControl(item)"> <!-- The list directive is great, but be sure to also checkout the collection repeat directive when scrolling through large lists -->
<div> <ion-list mode="ios">
<div class="top">{{item.name}} <ion-item *ngFor="let item of items" (click)="toControl(item)">
<div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div> <div class="item">
</div> <div class="top">{{item.name}}
<div class="content"> <div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>
<div class="left"> </div>
<img [src]="'../../assets/img/' + item.img"> <div class="content">
<div class="left">
<img [src]="'../../assets/img/' + item.img">
</div>
<div class="rightCon">
<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>
<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>
<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div>
</div>
</div>
<div class="bottom">
<div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp;
<span style="font-size: 13px">{{item.online ? '在线' : '离线'}}</span>
</div>
</div> </div>
<div class="rightCon"> </ion-item>
<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div> </ion-list>
<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div> <!--<div class="item" *ngFor="let item of items" (click)="toControl(item)">-->
<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div> <!--<div>-->
</div> <!--<div class="top">{{item.name}}-->
</div> <!--<div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>-->
<div class="bottom"> <!--</div>-->
<div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp; <!--<div class="content">-->
<span style="font-size: 13px">{{item.online ? '在线' : '离线'}}</span> <!--<div class="left">-->
</div> <!--<img [src]="'../../assets/img/' + item.img">-->
</div> <!--</div>-->
</div> <!--<div class="rightCon">-->
<!--<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>-->
<!--<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>-->
<!--<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="bottom">-->
<!--<div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp;-->
<!--<span style="font-size: 13px">{{item.online ? '在线' : '离线'}}</span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div> </div>
</div> </div>
</div> </div>
......
src/app/home/home.page.scss
View file @ c6c5549e
...@@ -25,9 +25,10 @@ ...@@ -25,9 +25,10 @@
.item { .item {
margin-bottom: 10px; margin-bottom: 10px;
padding: 3px 10px 0px; padding: 3px 3px 0px;
background-color: #ffffff; background-color: #ffffff;
display:block; display:block;
width: calc(100%);
} }
.top { .top {
...@@ -51,7 +52,7 @@ ...@@ -51,7 +52,7 @@
} }
.rightCon { .rightCon {
width: calc(100% - 110px); width: calc(50%);
line-height: 25px; line-height: 25px;
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
......
src/environments/environment.ts
View file @ c6c5549e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
export const environment = { export const environment = {
// production: false, // production: false,
// url: 'http://pasture.witium.com.cn/api', // 对外访问测试网地址 url: 'http://pasture.witium.com.cn/api', // 对外访问测试网地址
// url: 'http://cloud-test.witium.com:8096', // 测试 // url: 'http://cloud-test.witium.com:8096', // 测试
// url: 'http://172.16.1.53:8097', // cy // url: 'http://172.16.1.53:8097', // cy
// url: 'http://172.16.1.52:8096', // zz // url: 'http://172.16.1.52:8096', // zz
...@@ -12,7 +12,7 @@ export const environment = { ...@@ -12,7 +12,7 @@ export const environment = {
// mqttUrl: '172.16.1.24', // mqttUrl: '172.16.1.24',
// mqttUrl: '120.27.235.39' // mqttUrl: '120.27.235.39'
production: true, production: true,
url: 'http://pasture.witium.com/api', // 对外访问测试网地址 // url: 'http://pasture.witium.com/api', // 对外访问测试网地址
// url: 'http://172.16.1.13:8096', // 测试 // url: 'http://172.16.1.13:8096', // 测试
mqttUrl: '120.27.235.39' mqttUrl: '120.27.235.39'
}; };
......
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