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
5897d2f2
Commit
5897d2f2
authored
Oct 31, 2022
by
leon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:fix when not set maxCount
parent
06f09782
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
10 deletions
+11
-10
http.api.js
common/http.api.js
+2
-1
HorizontalBar.vue
components/HorizontalBar/HorizontalBar.vue
+3
-3
LineMixBar.vue
components/LineMixBar/LineMixBar.vue
+1
-1
NormalBar.vue
components/NormalBar/NormalBar.vue
+1
-1
NormalLine.vue
components/NormalLine/NormalLine.vue
+1
-1
index.vue
pages/index/index.vue
+3
-3
No files found.
common/http.api.js
View file @
5897d2f2
// 请求的本域名
const
baseUrl
=
'https://api.charleskeith.cn/api'
// 正式环境
// const reportUrl = 'http://192.168.138.55:8081/api' // 测试环境
const
reportUrl
=
'http://47.101.191.49:8083/api'
// 外网测试环境
// const reportUrl = 'http://47.101.191.49:8083/api' // 外网测试环境
const
reportUrl
=
'https://api.charleskeith.cn/api'
// 正式环境
const
install
=
(
Vue
,
vm
)
=>
{
let
getHttp
=
(
url
,
params
,
config
)
=>
vm
.
$http
.
get
(
url
,
{
params
},
config
)
let
postHttp
=
(
url
,
params
,
config
)
=>
vm
.
$http
.
post
(
url
,
params
,
config
)
...
...
components/HorizontalBar/HorizontalBar.vue
View file @
5897d2f2
...
...
@@ -112,7 +112,7 @@
if
(
this
.
elementInfo
.
dataZoom
&&
this
.
elementInfo
.
dataZoom
.
show
)
{
count
=
count
*
(
this
.
elementInfo
.
dataZoom
.
end
-
this
.
elementInfo
.
dataZoom
.
start
)
/
100
}
if
(
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
if
(
this
.
elementInfo
.
option
.
dataset
.
maxCount
!=
null
&&
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
this
.
elementInfo
.
option
.
dataset
.
show
=
false
}
lastCount
=
count
...
...
@@ -181,7 +181,7 @@
...
that
.
elementInfo
.
option
.
bar
,
label
:
{
...
that
.
elementInfo
.
option
.
dataset
,
formatter
:
val
=>
{
formatter
:
val
=>
{
return
that
.
$u
.
common
.
converFunction
(
that
.
elementInfo
.
option
.
dataset
.
formatter
,
val
)
}
...
...
@@ -191,7 +191,7 @@
...
item
,
...
config
}
})
})
return
newData
},
/**
...
...
components/LineMixBar/LineMixBar.vue
View file @
5897d2f2
...
...
@@ -105,7 +105,7 @@
if
(
this
.
elementInfo
.
dataZoom
&&
this
.
elementInfo
.
dataZoom
.
show
)
{
count
=
count
*
(
this
.
elementInfo
.
dataZoom
.
end
-
this
.
elementInfo
.
dataZoom
.
start
)
/
100
}
if
(
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
if
(
this
.
elementInfo
.
option
.
dataset
.
maxCount
!=
null
&&
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
this
.
elementInfo
.
option
.
dataset
.
show
=
false
}
lastCount
=
count
...
...
components/NormalBar/NormalBar.vue
View file @
5897d2f2
...
...
@@ -91,7 +91,7 @@
if
(
this
.
elementInfo
.
dataZoom
&&
this
.
elementInfo
.
dataZoom
.
show
)
{
count
=
count
*
(
this
.
elementInfo
.
dataZoom
.
end
-
this
.
elementInfo
.
dataZoom
.
start
)
/
100
}
if
(
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
if
(
this
.
elementInfo
.
option
.
dataset
.
maxCount
!=
null
&&
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
this
.
elementInfo
.
option
.
dataset
.
show
=
false
}
lastCount
=
count
...
...
components/NormalLine/NormalLine.vue
View file @
5897d2f2
...
...
@@ -93,7 +93,7 @@
if
(
this
.
elementInfo
.
dataZoom
&&
this
.
elementInfo
.
dataZoom
.
show
)
{
count
=
count
*
(
this
.
elementInfo
.
dataZoom
.
end
-
this
.
elementInfo
.
dataZoom
.
start
)
/
100
}
if
(
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
if
(
this
.
elementInfo
.
option
.
dataset
.
maxCount
!=
null
&&
count
>
this
.
elementInfo
.
option
.
dataset
.
maxCount
)
{
this
.
elementInfo
.
option
.
dataset
.
show
=
false
}
lastCount
=
count
...
...
pages/index/index.vue
View file @
5897d2f2
...
...
@@ -104,9 +104,9 @@
// detail页面也会监听这两个事件,所有index页面需要在onShow里面增加监听,在onHide里面移除监听
onShow
()
{
const
that
=
this
if
(
uni
.
getStorageSync
(
'reportInfo'
))
{
this
.
reportInfo
=
JSON
.
parse
(
uni
.
getStorageSync
(
'reportInfo'
))
}
//
if(uni.getStorageSync('reportInfo')) {
//
this.reportInfo = JSON.parse(uni.getStorageSync('reportInfo'))
//
}
/**
* 组件交互 - 参数
*/
...
...
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