From 44e258acff991838ad7f10276556b596b6b0b25b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 05 Jul 2018 16:03:34 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
index e6f6a46..5a10e19 100644
--- a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
+++ b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.html
@@ -70,10 +70,10 @@
<div nz-col [nzSm]="8" [nzXs]="24">
<label>{{item.name}}</label>
</div>
- <div nz-col [nzSm]="8" [nzXs]="24">
- <label>{{item.rules.replace('{0}','������')}}</label>
+ <div nz-col [nzSm]="12" [nzXs]="24">
+ <label>{{ rulesToShow(item.rules) }}</label>
</div>
- <div nz-col [nzSm]="8" [nzXs]="24">
+ <div nz-col [nzSm]="4" [nzXs]="24">
<a (click)="toEdit(item)">������</a>
<span> | </span>
<nz-popconfirm [nzTitle]="'���������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(item.id)" >
--
Gitblit v1.8.0