Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
muChangApp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WitCloud
muChangApp
Commits
4d785599
Commit
4d785599
authored
Dec 02, 2019
by
yating.lin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
热应激等级List 追加Sort后显示
parent
ba96b544
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
env-cfg.page.html
src/app/envCtrl/env-cfg/env-cfg.page.html
+7
-7
env-cfg.page.ts
src/app/envCtrl/env-cfg/env-cfg.page.ts
+4
-0
No files found.
src/app/envCtrl/env-cfg/env-cfg.page.html
View file @
4d785599
...
@@ -375,24 +375,24 @@
...
@@ -375,24 +375,24 @@
<ion-icon
name=
"arrow-down"
color=
"secondary"
mode=
"ios"
slot=
"end"
class=
"iconOpen"
*
ngIf=
"isOpenHeatStress"
(
click
)="
openItem
('
heatStressCfg
')"
></ion-icon>
<ion-icon
name=
"arrow-down"
color=
"secondary"
mode=
"ios"
slot=
"end"
class=
"iconOpen"
*
ngIf=
"isOpenHeatStress"
(
click
)="
openItem
('
heatStressCfg
')"
></ion-icon>
</div>
</div>
</div>
</div>
<div
class=
"item-content-div font-content"
style=
"height: auto"
*
ngIf=
"isOpenHeatStress"
@
shrink
@
stretch
>
<div
class=
"item-content-div font-content"
style=
"height: auto
; padding-right:0px;
"
*
ngIf=
"isOpenHeatStress"
@
shrink
@
stretch
>
<ion-item
class=
"fanItem"
lines=
"none"
>
<ion-item
class=
"fanItem"
lines=
"none"
style=
"--inner-padding-end: 0px;"
>
<ion-grid
class=
"sliding-grid"
>
<ion-grid
class=
"sliding-grid"
>
<ion-row>
<ion-row>
<ion-item
lines=
"none"
class=
"thiItem font-smaller"
>
计算公式
0.81* 温度 +(0.99*温度-14.3)*
湿度+46.3
</ion-item>
<ion-item
lines=
"none"
class=
"thiItem font-smaller"
>
计算公式
THI=0.81*温度+(0.99*温度-14.3)*
湿度+46.3
</ion-item>
</ion-row>
</ion-row>
<ion-row>
<ion-row>
<ion-item
lines=
"none"
class=
"thiItem font-content"
>
等级临界值
</ion-item>
<ion-item
lines=
"none"
class=
"thiItem font-content"
>
等级临界值
</ion-item>
</ion-row>
</ion-row>
<ion-row>
<ion-row>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width: 30%; margin-bottom:5px;"
>
应激等级
</ion-col>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width: 30%; margin-bottom:5px;"
>
应激等级
</ion-col>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width:
18
%; margin-bottom:5px;"
>
THI值(
<
)</
ion-col
>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width:
30
%; margin-bottom:5px;"
>
THI值(
<
)</
ion-col
>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width: 4
5%; margin-bottom:5px; text-align:left; padding-left:15px
;"
>
预警方式
</ion-col>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width: 4
0%; margin-bottom:5px; text-align:left
;"
>
预警方式
</ion-col>
</ion-row>
</ion-row>
<ion-row
*
ngFor=
"let heatStress of curCowshed.heatStressList"
>
<ion-row
*
ngFor=
"let heatStress of curCowshed.heatStressList"
>
<ion-col
class=
"thiItem sliding-col font-content "
style=
"width: 30%; margin-bottom:5px;"
>
{{heatStress.heatStressLevel}}
</ion-col>
<ion-col
class=
"thiItem sliding-col font-content "
style=
"width: 30%; margin-bottom:5px;"
>
{{heatStress.heatStressLevel}}
</ion-col>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width:
18
%; margin-bottom:5px;"
>
{{heatStress.thi}}
</ion-col>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width:
30
%; margin-bottom:5px;"
>
{{heatStress.thi}}
</ion-col>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width: 4
5
%; margin-bottom:5px;"
>
<ion-col
class=
"thiItem sliding-col font-content"
style=
"width: 4
0
%; margin-bottom:5px;"
>
<ion-select
class=
"heatSelect font-input input-tb-text"
multiple=
"false"
cancelText=
"取消"
okText=
"确认"
[(
ngModel
)]="
heatStress
.
alarmLevel
"
>
<ion-select
class=
"heatSelect font-input input-tb-text"
multiple=
"false"
cancelText=
"取消"
okText=
"确认"
[(
ngModel
)]="
heatStress
.
alarmLevel
"
>
<ion-select-option
*
ngFor=
"let alarmWay of alarmWays"
[
value
]="
alarmWay
.
alarmId
"
>
{{alarmWay.alarmValue}}
</ion-select-option>
<ion-select-option
*
ngFor=
"let alarmWay of alarmWays"
[
value
]="
alarmWay
.
alarmId
"
>
{{alarmWay.alarmValue}}
</ion-select-option>
</ion-select>
</ion-select>
...
...
src/app/envCtrl/env-cfg/env-cfg.page.ts
View file @
4d785599
...
@@ -186,6 +186,10 @@ export class EnvCfgPage implements OnInit {
...
@@ -186,6 +186,10 @@ export class EnvCfgPage implements OnInit {
this
.
api
.
config
.
getByFieldRegionNo
([{
fieldRegionNo
:
this
.
curFieldRegionNo
},
(
data
)
=>
{
this
.
api
.
config
.
getByFieldRegionNo
([{
fieldRegionNo
:
this
.
curFieldRegionNo
},
(
data
)
=>
{
if
(
data
)
{
if
(
data
)
{
data
.
environmentConfigJson
=
JSON
.
parse
(
data
.
environmentConfigJson
.
toString
());
data
.
environmentConfigJson
=
JSON
.
parse
(
data
.
environmentConfigJson
.
toString
());
debugger
;
data
.
heatStressList
.
sort
(
(
a
,
b
)
=>
{
return
a
[
'thi'
]
>
b
[
'thi'
]
?
1
:
a
[
'thi'
]
===
b
[
'thi'
]
?
0
:
-
1
;
});
this
.
curCowshed
=
data
;
this
.
curCowshed
=
data
;
this
.
curCowshed
.
isWisdomModelChecked
=
this
.
curCowshed
.
isWisdomModel
?
true
:
false
;
this
.
curCowshed
.
isWisdomModelChecked
=
this
.
curCowshed
.
isWisdomModel
?
true
:
false
;
this
.
initConfig
();
this
.
initConfig
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment