Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
E
ec-report-refactor
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
lihuizhen
ec-report-refactor
Commits
baaa07e4
Commit
baaa07e4
authored
Jul 17, 2023
by
leon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:fix some bug
parent
9e7f2148
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
LineMixBar.vue
components/LineMixBar/LineMixBar.vue
+5
-3
echartElementData.js
mixins/echartElementData.js
+5
-1
index.vue
pages/index/index.vue
+1
-1
No files found.
components/LineMixBar/LineMixBar.vue
View file @
baaa07e4
...
...
@@ -130,10 +130,12 @@
}
if
(
chart
)
{
const
option
=
chart
.
getOption
()
if
(
option
)
{
option
.
series
=
dealSeries
// 重新setOption,使得设置的formatter生效
chart
.
setOption
(
option
)
}
}
})
},
...
...
mixins/echartElementData.js
View file @
baaa07e4
...
...
@@ -33,6 +33,10 @@ export default {
async
handleDynamicData
(
value
)
{
const
that
=
this
let
{
dataUrl
,
dataMethod
,
dataFormatter
,
dataProcessing
,
dataConfig
}
=
{
...
value
}
if
(
!
dataUrl
.
length
)
{
return
}
if
(
value
.
queryFormatter
)
dataFormatter
=
{...
dataFormatter
,
...
value
.
queryFormatter
}
dataUrl
=
dataUrl
.
replace
(
/^
(\/(
dashboardCharts|dashboardAPI
))?
/
,
''
)
dataFormatter
=
that
.
$u
.
common
.
filterRequestParams
({...
dataFormatter
})
...
...
@@ -214,7 +218,7 @@ export default {
},
'elementData.dataList'
:
{
handler
(
newVal
,
oldVal
)
{
if
(
JSON
.
stringify
(
newVal
)
!==
JSON
.
stringify
(
oldVal
)
)
{
if
(
JSON
.
stringify
(
newVal
)
!==
'{}'
&&
JSON
.
stringify
(
newVal
)
!==
JSON
.
stringify
(
oldVal
)
)
{
this
.
setStorageData
()
this
.
initChart
()
}
...
...
pages/index/index.vue
View file @
baaa07e4
...
...
@@ -247,7 +247,7 @@
if
(
Status
===
'true'
)
{
if
(
info
.
dataUrl
)
{
that
.
getGlobalData
(
info
,
list
)
if
(
info
.
dataPolling
Interval
)
{
if
(
info
.
dataPolling
&&
info
.
dataPollingInterval
>
0
)
{
that
.
timename
=
setInterval
(()
=>
{
that
.
getGlobalData
(
info
,
list
)
},
parseInt
(
info
.
dataPollingInterval
)
*
1000
)
...
...
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