Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
W
witiumCloud2
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
witiumCloud2
Commits
43edf30e
Commit
43edf30e
authored
Oct 11, 2022
by
胥静
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加选择数据类型(STRING和BOOL)
parent
7082c995
Pipeline
#1636
passed with stage
in 0 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
module-detail.component.html
src/app/main/module-detail/module-detail.component.html
+1
-1
module-detail.component.ts
src/app/main/module-detail/module-detail.component.ts
+5
-0
topic-module-way.component.html
...app/main/topic-module-way/topic-module-way.component.html
+1
-1
topic-module-way.component.ts
src/app/main/topic-module-way/topic-module-way.component.ts
+4
-0
No files found.
src/app/main/module-detail/module-detail.component.html
View file @
43edf30e
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
<app-search-item
nz-tooltip
nzTitle=
"此处输入为英文或数字"
isMust=
"true"
inModal=
"true"
[
label
]="'
wayName
'
|
translate
"
<app-search-item
nz-tooltip
nzTitle=
"此处输入为英文或数字"
isMust=
"true"
inModal=
"true"
[
label
]="'
wayName
'
|
translate
"
[(
value
)]="
req
.
name
"
></app-search-item>
[(
value
)]="
req
.
name
"
></app-search-item>
<app-search-select
isMust=
"true"
inModal=
"true"
[
label
]="'
wayType
'
|
translate
"
[(
value
)]="
req
.
type
"
<app-search-select
isMust=
"true"
inModal=
"true"
[
label
]="'
wayType
'
|
translate
"
[(
value
)]="
req
.
type
"
[
data
]="[{
a:
'
AI
'},
{
a:
'
AO
'},
{
a:
'
DI
'},
{
a:
'
DO
'}]"
optL=
"a"
optV=
"a"
></app-search-select>
[
data
]="[{
a:
'
AI
'},
{
a:
'
AO
'},
{
a:
'
DI
'},
{
a:
'
DO
'}
,
{
a:
'
STRING
'},
{
a:
'
BOOL
'}
]"
optL=
"a"
optV=
"a"
></app-search-select>
<div
class=
"searchItem inModal"
>
<div
class=
"searchItem inModal"
>
<div
class=
"item-label"
><span
class=
"deleteFontColor"
>
*
</span>
{{'isId' | translate}}
<div
class=
"item-label"
><span
class=
"deleteFontColor"
>
*
</span>
{{'isId' | translate}}
...
...
src/app/main/module-detail/module-detail.component.ts
View file @
43edf30e
...
@@ -77,6 +77,10 @@ export class ModuleDetailComponent implements OnInit {
...
@@ -77,6 +77,10 @@ export class ModuleDetailComponent implements OnInit {
add
()
{
add
()
{
this
.
req
=
{
unit
:
'-'
,
isTag
:
0
,
isAlarm
:
0
};
this
.
req
=
{
unit
:
'-'
,
isTag
:
0
,
isAlarm
:
0
};
// 新增时通道类型初期表示默认值'AI'
if
(
this
.
req
.
type
===
undefined
)
{
this
.
req
.
type
=
'AI'
;
}
this
.
isUpdate
=
false
;
this
.
isUpdate
=
false
;
this
.
isV
=
true
;
this
.
isV
=
true
;
this
.
try
=
{
this
.
try
=
{
...
@@ -88,6 +92,7 @@ export class ModuleDetailComponent implements OnInit {
...
@@ -88,6 +92,7 @@ export class ModuleDetailComponent implements OnInit {
num
:
[
'alarmInterval'
],
num
:
[
'alarmInterval'
],
eng
:
[
'name'
,
'alias'
]
eng
:
[
'name'
,
'alias'
]
};
};
}
}
update
(
one
)
{
update
(
one
)
{
...
...
src/app/main/topic-module-way/topic-module-way.component.html
View file @
43edf30e
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
<app-search-item
nz-tooltip
nzTitle=
"此处输入为英文或数字"
isMust=
"true"
inModal=
"true"
[
label
]="'
wayName
'
|
translate
"
<app-search-item
nz-tooltip
nzTitle=
"此处输入为英文或数字"
isMust=
"true"
inModal=
"true"
[
label
]="'
wayName
'
|
translate
"
[(
value
)]="
req
.
name
"
></app-search-item>
[(
value
)]="
req
.
name
"
></app-search-item>
<app-search-select
isMust=
"true"
inModal=
"true"
[
label
]="'
wayType
'
|
translate
"
[(
value
)]="
req
.
type
"
<app-search-select
isMust=
"true"
inModal=
"true"
[
label
]="'
wayType
'
|
translate
"
[(
value
)]="
req
.
type
"
[
data
]="[{
a:
'
AI
'},
{
a:
'
AO
'},
{
a:
'
DI
'},
{
a:
'
DO
'}]"
optL=
"a"
optV=
"a"
></app-search-select>
[
data
]="[{
a:
'
AI
'},
{
a:
'
AO
'},
{
a:
'
DI
'},
{
a:
'
DO
'}
,
{
a:
'
STRING
'},
{
a:
'
BOOL
'}
]"
optL=
"a"
optV=
"a"
></app-search-select>
<div
class=
"searchItem inModal"
>
<div
class=
"searchItem inModal"
>
<div
class=
"item-label"
><span
class=
"deleteFontColor"
>
*
</span>
{{'isId' | translate}}
<div
class=
"item-label"
><span
class=
"deleteFontColor"
>
*
</span>
{{'isId' | translate}}
...
...
src/app/main/topic-module-way/topic-module-way.component.ts
View file @
43edf30e
...
@@ -77,6 +77,10 @@ export class TopicModuleWayComponent implements OnInit {
...
@@ -77,6 +77,10 @@ export class TopicModuleWayComponent implements OnInit {
add
()
{
add
()
{
this
.
req
=
{
unit
:
'-'
,
isTag
:
0
,
isAlarm
:
0
};
this
.
req
=
{
unit
:
'-'
,
isTag
:
0
,
isAlarm
:
0
};
// 新增时通道类型初期表示默认值'AI'
if
(
this
.
req
.
type
===
undefined
)
{
this
.
req
.
type
=
'AI'
;
}
this
.
isUpdate
=
false
;
this
.
isUpdate
=
false
;
this
.
isV
=
true
;
this
.
isV
=
true
;
this
.
try
=
{
this
.
try
=
{
...
...
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