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
4be9e4f0
Commit
4be9e4f0
authored
Sep 11, 2019
by
yating.lin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
牛舍配置 90%
parent
6817aec5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
343 additions
and
303 deletions
+343
-303
env-cfg.page.html
src/app/envCtrl/env-cfg/env-cfg.page.html
+162
-206
env-cfg.page.ts
src/app/envCtrl/env-cfg/env-cfg.page.ts
+181
-97
No files found.
src/app/envCtrl/env-cfg/env-cfg.page.html
View file @
4be9e4f0
This diff is collapsed.
Click to expand it.
src/app/envCtrl/env-cfg/env-cfg.page.ts
View file @
4be9e4f0
...
@@ -70,44 +70,26 @@ export class EnvCfgPage implements OnInit {
...
@@ -70,44 +70,26 @@ export class EnvCfgPage implements OnInit {
}
}
isError
=
false
;
isError
=
false
;
cowshedList
=
[];
cowshedList
:
any
=
[];
curFieldRegionNo
=
''
;
curFieldRegionNo
=
''
;
// 当前牛舍信息
// 当前牛舍信息
curCowshed
=
{
curCowshed
:
any
=
{
factoryNo
:
''
,
factoryNo
:
''
,
factoryName
:
''
,
factoryName
:
''
,
fieldRegionNo
:
''
,
fieldRegionNo
:
''
,
fieldRegionName
:
''
,
fieldRegionName
:
''
,
isWisdomModel
:
0
,
isWisdomModel
:
0
,
propertyConfig
:
{
toft
:
''
,
hoft
:
''
},
propertyConfig
:
{
toft
:
''
,
hoft
:
''
},
config
:
[{
config
:
[],
fieldDeviceType
:
''
,
controlModel
:
0
,
controlConfig
:
[{
TU
:
0
,
TL
:
0
,
id
:
''
,
name
:
''
,
T
:
0
,
A
:
0
,
B
:
0
,
intverval
:
0
,
startDate
:
''
,
stopDate
:
''
,
on
:
''
,
off
:
''
,
power
:
0
}
]
}],
leave
:
[],
leave
:
[],
back
:
[],
back
:
[],
environmentConfigJson
:
{
TU
:
''
,
TL
:
''
,
HU
:
''
,
HL
:
''
},
environmentConfigJson
:
{
TU
:
0
,
TL
:
0
,
HU
:
0
,
HL
:
0
},
heatStressList
:
[]
heatStressList
:
[]
};
};
// 各设备配置信息
// 各设备配置信息
fengJi
=
{};
fengJi
:
any
=
{};
penLin
=
{};
penLin
:
any
=
{};
zhaoMing
=
{};
zhaoMing
:
any
=
{};
shuiCao
=
{};
shuiCao
:
any
=
{};
async
openPicker
(
numColumns
=
1
,
numOptions
=
5
,
columnOptions
=
this
.
defaultColumnOptions
)
{
async
openPicker
(
numColumns
=
1
,
numOptions
=
5
,
columnOptions
=
this
.
defaultColumnOptions
)
{
const
picker
=
await
this
.
pickerController
.
create
({
const
picker
=
await
this
.
pickerController
.
create
({
...
@@ -191,9 +173,76 @@ export class EnvCfgPage implements OnInit {
...
@@ -191,9 +173,76 @@ export class EnvCfgPage implements OnInit {
}
}
this
.
load
.
offLoad
();
this
.
load
.
offLoad
();
}]);
}]);
// ----------------------------------------------------
// TODO 测试用准备数据
this
.
cowshedList
=
[
{
// 0-无热应激 离线 无报警
fieldRegionNo
:
'FRN136641006052720640'
,
fieldRegionName
:
'1号牛舍'
,
temp
:
'23.5'
,
humi
:
'82'
,
heatStressLevel
:
'0'
,
online
:
0
,
// 0-离线,1-在线
alarm
:
0
,
ts
:
'2019-08-05 23:44'
,
},
{
// 1-轻度热应激 在线 现控 无报警
fieldRegionNo
:
'FN108050436279648256'
,
fieldRegionName
:
'2号牛舍'
,
temp
:
'23.5'
,
humi
:
'82'
,
heatStressLevel
:
'1'
,
online
:
1
,
// 0-离线,1-在线
operationModel
:
0
,
// 0-现控,1-平控
alarm
:
0
,
ts
:
'2019-08-05 23:44'
,
},
{
// 2-中度热应激 在线 平控 非智控(手控) 有报警
fieldRegionNo
:
'FN108050436279648256'
,
fieldRegionName
:
'3号牛舍'
,
temp
:
'23.5'
,
humi
:
'82'
,
heatStressLevel
:
'2'
,
online
:
1
,
// 0-离线,1-在线
operationModel
:
1
,
// 0-现控,1-平控
isWisdomModel
:
0
,
// 0-非智控(手控),1-智控
alarm
:
1
,
ts
:
'2019-08-05 23:44'
,
},
{
// 3-重度热应激 在线 平控 非智控(自控) 有报警
fieldRegionNo
:
'FN108050436279648256'
,
fieldRegionName
:
'4号牛舍'
,
temp
:
'23.5'
,
humi
:
'82'
,
heatStressLevel
:
'3'
,
online
:
1
,
// 0-离线,1-在线
operationModel
:
1
,
// 0-现控,1-平控
isWisdomModel
:
0
,
// 0-非智控(自控),1-智控
alarm
:
1
,
ts
:
'2019-08-05 23:44'
,
},
{
// 4-II重度热应激 在线 平控 智控 有报警
fieldRegionNo
:
'FN108050436279648256'
,
fieldRegionName
:
'测试用5号牛舍'
,
temp
:
'23.5'
,
humi
:
'82'
,
heatStressLevel
:
'4'
,
online
:
1
,
// 0-离线,1-在线
operationModel
:
1
,
// 0-现控,1-平控
isWisdomModel
:
1
,
// 0-非智控(自控),1-智控
alarm
:
1
,
ts
:
'2019-08-05 23:44'
,
},
];
}
}
workModeEvent
()
{
workModeEvent
(
item
)
{
// if ( this.workModeSetting.workModeOld === this.workModeSetting.workMode ) {
// if ( this.workModeSetting.workModeOld === this.workModeSetting.workMode ) {
// return;
// return;
// }
// }
...
@@ -258,12 +307,10 @@ export class EnvCfgPage implements OnInit {
...
@@ -258,12 +307,10 @@ export class EnvCfgPage implements OnInit {
// 获取当前牛舍配置信息
// 获取当前牛舍配置信息
selectCowshed
()
{
selectCowshed
()
{
this
.
api
.
config
.
getAll
([{
'fieldRegionNo'
:
this
.
curFieldRegionNo
},
(
data
)
=>
{
this
.
api
.
config
.
getAll
([{
'fieldRegionNo'
:
this
.
curFieldRegionNo
},
(
data
)
=>
{
if
(
data
)
{
this
.
curCowshed
=
data
;
// ----------------------------------------------------
// ----------------------------------------------------
// TODO 测试用准备数据
// TODO 测试用准备数据
this
.
curCowshed
=
{
data
=
{
factoryNo
:
'FN108050436279648256'
,
factoryNo
:
'FN108050436279648256'
,
factoryName
:
'一厂'
,
factoryName
:
'一厂'
,
fieldRegionNo
:
'FRN136641006052720640'
,
fieldRegionNo
:
'FRN136641006052720640'
,
...
@@ -272,20 +319,22 @@ export class EnvCfgPage implements OnInit {
...
@@ -272,20 +319,22 @@ export class EnvCfgPage implements OnInit {
propertyConfig
:
{
toft
:
'1.5'
,
hoft
:
'2'
},
propertyConfig
:
{
toft
:
'1.5'
,
hoft
:
'2'
},
config
:
[
config
:
[
{
fieldDeviceType
:
'风机'
,
{
fieldDeviceType
:
'风机'
,
controlModel
:
0
,
controlModel
:
'0'
,
controlConfig
:
[{
TU
:
28
,
TL
:
20
}]
,
controlConfig
:
{
TU
:
28
,
TL
:
20
}
,
},
},
{
fieldDeviceType
:
'喷淋'
,
{
fieldDeviceType
:
'喷淋'
,
controlModel
:
1
,
controlModel
:
'1'
,
controlConfig
:
[{
id
:
'111'
,
name
:
'模式一'
,
T
:
21
,
A
:
35
,
B
:
45
,
intverval
:
55
},
{
id
:
'222'
,
name
:
'模式二'
,
T
:
21
,
A
:
35
,
B
:
45
,
intverval
:
55
}]
controlConfig
:
[{
id
:
'111'
,
name
:
'模式一'
,
T
:
21
,
A
:
35
,
B
:
45
,
intverval
:
55
},
{
id
:
'222'
,
name
:
'模式二'
,
T
:
21
,
A
:
35
,
B
:
45
,
intverval
:
55
}]
},
},
{
fieldDeviceType
:
'照明'
,
{
fieldDeviceType
:
'照明'
,
controlModel
:
1
,
controlModel
:
'1'
,
controlConfig
:
[{
id
:
'111'
,
name
:
'模式A'
,
startDate
:
'10-01'
,
stopDate
:
'11-02'
,
on
:
'19:00'
,
off
:
'05:00'
},
{
id
:
'111'
,
name
:
'模式B'
,
startDate
:
'10-01'
,
stopDate
:
'11-02'
,
on
:
'19:00'
,
off
:
'05:00'
}]
controlConfig
:
[{
id
:
'111'
,
name
:
'模式A'
,
startDate
:
'10-01'
,
stopDate
:
'11-02'
,
on
:
'19:00'
,
off
:
'05:00'
},
{
id
:
'111'
,
name
:
'模式B'
,
startDate
:
'10-01'
,
stopDate
:
'11-02'
,
on
:
'19:00'
,
off
:
'05:00'
}]
},
},
{
fieldDeviceType
:
'水槽'
,
{
fieldDeviceType
:
'水槽'
,
controlModel
:
0
,
controlModel
:
'0'
,
controlConfig
:
[{
power
:
100
,
startDate
:
'10-01'
,
stopDate
:
'11-02'
}]
,
controlConfig
:
{
power
:
100
,
startDate
:
'10-01'
,
stopDate
:
'11-02'
}
,
}
}
],
],
leave
:
[
'风机'
,
'喷淋'
,
'水槽'
],
leave
:
[
'风机'
,
'喷淋'
,
'水槽'
],
...
@@ -321,6 +370,8 @@ export class EnvCfgPage implements OnInit {
...
@@ -321,6 +370,8 @@ export class EnvCfgPage implements OnInit {
};
};
// ----------------------------------------------------
// ----------------------------------------------------
if
(
data
)
{
this
.
curCowshed
=
data
;
this
.
initConfig
();
this
.
initConfig
();
}
else
{
}
else
{
this
.
api
.
presentMsgToast
(
'获取数据失败'
);
this
.
api
.
presentMsgToast
(
'获取数据失败'
);
...
@@ -333,18 +384,51 @@ export class EnvCfgPage implements OnInit {
...
@@ -333,18 +384,51 @@ export class EnvCfgPage implements OnInit {
// 显示牛舍配置信息
// 显示牛舍配置信息
initConfig
()
{
initConfig
()
{
const
configInfo
=
this
.
curCowshed
.
config
;
const
configInfo
=
this
.
curCowshed
.
config
;
const
heatStressListInfo
=
this
.
curCowshed
.
heatStressList
;
// 各设备配置情报
if
(
configInfo
&&
configInfo
.
constructor
===
Array
)
{
if
(
configInfo
&&
configInfo
.
constructor
===
Array
)
{
configInfo
.
map
((
value
,
index
)
=>
{
configInfo
.
map
((
value
,
index
)
=>
{
if
(
'风机'
===
value
.
fieldDeviceType
)
{
switch
(
value
.
fieldDeviceType
)
{
case
'风机'
:
this
.
fengJi
=
value
;
this
.
fengJi
=
value
;
}
else
if
(
'喷淋'
===
value
.
fieldDeviceType
)
{
break
;
case
'喷淋'
:
this
.
penLin
=
value
;
this
.
penLin
=
value
;
}
else
if
(
'照明'
===
value
.
fieldDeviceType
)
{
break
;
case
'照明'
:
this
.
zhaoMing
=
value
;
this
.
zhaoMing
=
value
;
}
else
if
(
'水槽'
===
value
.
fieldDeviceType
)
{
break
;
case
'水槽'
:
this
.
shuiCao
=
value
;
this
.
shuiCao
=
value
;
break
;
default
:
break
;
}
}
});
});
}
}
// if (heatStressListInfo && heatStressListInfo.constructor === Array) {
// heatStressListInfo.map((value, index) => {
// switch (value.heatStressLevel) {
// case '无应激':
// this.heatStressLevel_0 = value;
// break;
// case '轻度应激' :
// this.heatStressLevel_1 = value;
// break;
// case '中度应激' :
// this.heatStressLevel_2 = value;
// break;
// case '重度应激' :
// this.heatStressLevel_3 = value;
// break;
// case 'II重度应激' :
// this.heatStressLevel_4 = value;
// break;
// default:
// break;
// }
//
// });
// }
}
}
}
}
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