Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wisdom-components
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
ReactWeb5
wisdom-components
Commits
2da3831b
Commit
2da3831b
authored
Feb 27, 2023
by
崔佳豪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(EC_HistoryView): 修复标记点显示
parent
3fe62135
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
SingleChart.js
packages/extend-components/EC_HistoryView/src/SingleChart.js
+2
-0
utils.js
packages/extend-components/EC_HistoryView/src/utils.js
+4
-2
No files found.
packages/extend-components/EC_HistoryView/src/SingleChart.js
View file @
2da3831b
...
...
@@ -22,6 +22,8 @@ const SimgleChart = memo((props) => {
curveCenter
,
showGridLine
,
deviceAlarmSchemes
,
showMarkLine
:
true
,
showPoint
:
true
,
};
return
optionGenerator
(
dataSource
,
null
,
contrast
,
contrastOption
,
smooth
,
config
);
},
[
dataSource
,
smooth
,
curveCenter
]);
...
...
packages/extend-components/EC_HistoryView/src/utils.js
View file @
2da3831b
...
...
@@ -184,6 +184,8 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth
const
curveCenter
=
_
.
get
(
config
,
'curveCenter'
,
false
);
const
nameWithSensor
=
_
.
get
(
config
,
'nameWithSensor'
,
true
);
const
showGridLine
=
_
.
get
(
config
,
'showGridLine'
,
false
);
const
showMarkLine
=
_
.
get
(
config
,
'showMarkLine'
,
false
);
const
showPoint
=
_
.
get
(
config
,
'showPoint'
,
false
);
const
deviceAlarmSchemes
=
_
.
get
(
config
,
'deviceAlarmSchemes'
,
[]);
// 自定义属性
...
...
@@ -264,8 +266,8 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth
const
type
=
'line'
;
const
areaStyle
=
areaStyleFormatter
(
item
);
const
yAxisIndex
=
yAxisInterator
.
get
(
sensorName
);
const
markLine
=
alarmMarkLine
(
item
,
index
,
dataSource
,
deviceAlarmSchemes
)
;
const
markPoint
=
minMaxMarkPoint
(
item
,
index
,
dataSource
)
;
const
markLine
=
showMarkLine
?
alarmMarkLine
(
item
,
index
,
dataSource
,
deviceAlarmSchemes
)
:
{}
;
const
markPoint
=
showPoint
?
minMaxMarkPoint
(
item
,
index
,
dataSource
)
:
{}
;
return
{
notMerge
:
true
,
name
,
...
...
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