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
86237de4
Commit
86237de4
authored
Jul 07, 2023
by
leon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:add dropdown tabs
parent
0f267f5e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
8 deletions
+37
-8
http.api.js
common/http.api.js
+3
-3
http.interceptor.js
common/http.interceptor.js
+2
-2
NormalTabs.vue
components/NormalTabs/NormalTabs.vue
+31
-2
index.vue
pages/index/index.vue
+1
-1
No files found.
common/http.api.js
View file @
86237de4
// 请求的本域名
// 请求的本域名
const
baseUrl
=
'http
s://api.charleskeith.cn
/api'
// 正式环境
const
baseUrl
=
'http
://192.168.138.55:8081
/api'
// 正式环境
//
const reportUrl = 'http://192.168.138.55:8081/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 reportUrl = 'https://api.charleskeith.cn/api' // 正式环境
const
install
=
(
Vue
,
vm
)
=>
{
const
install
=
(
Vue
,
vm
)
=>
{
let
getHttp
=
(
url
,
params
,
config
)
=>
vm
.
$http
.
get
(
url
,
{
params
},
config
)
let
getHttp
=
(
url
,
params
,
config
)
=>
vm
.
$http
.
get
(
url
,
{
params
},
config
)
let
postHttp
=
(
url
,
params
,
config
)
=>
vm
.
$http
.
post
(
url
,
params
,
config
)
let
postHttp
=
(
url
,
params
,
config
)
=>
vm
.
$http
.
post
(
url
,
params
,
config
)
...
...
common/http.interceptor.js
View file @
86237de4
...
@@ -3,9 +3,9 @@ const http = new Request();
...
@@ -3,9 +3,9 @@ const http = new Request();
const
install
=
(
Vue
,
vm
)
=>
{
const
install
=
(
Vue
,
vm
)
=>
{
http
.
setConfig
(
config
=>
{
http
.
setConfig
(
config
=>
{
config
.
baseURL
=
'https://api.charleskeith.cn'
// 正式环境
//
config.baseURL = 'https://api.charleskeith.cn' // 正式环境
// config.baseURL = 'http://47.101.191.49:8083' // 外网测试环境
// config.baseURL = 'http://47.101.191.49:8083' // 外网测试环境
//
config.baseURL = 'http://192.168.138.55:8081' // 测试环境
config
.
baseURL
=
'http://192.168.138.55:8081'
// 测试环境
config
.
custom
=
{
config
.
custom
=
{
loading
:
false
loading
:
false
},
},
...
...
components/NormalTabs/NormalTabs.vue
View file @
86237de4
...
@@ -33,6 +33,11 @@
...
@@ -33,6 +33,11 @@
{{
elementData
.
dataList
.
series
[
currentTabs
].
name
}}
{{
elementData
.
dataList
.
series
[
currentTabs
].
name
}}
</view>
</view>
</
template
>
</
template
>
<u-dropdown
v-if=
"elementInfo.option.tabs.type === 'dropdown'"
:title-size=
"getFontSize()"
:active-color=
"elementInfo.option.tabs.activeColor"
:inactive-color=
"elementInfo.option.tabs.color"
>
<u-dropdown-item
v-model=
"tabsValue"
:title=
"getSelectLabel(tabsValue)"
:options=
"tabsMenu"
></u-dropdown-item>
</u-dropdown>
</view>
</view>
</template>
</template>
...
@@ -76,6 +81,17 @@
...
@@ -76,6 +81,17 @@
}
}
return
[]
return
[]
},
},
tabsMenu
()
{
const
{
type
}
=
this
.
elementInfo
.
option
.
tabs
if
(
type
===
'dropdown'
)
{
this
.
elementData
.
dataList
.
series
.
forEach
(
item
=>
{
item
.
label
=
item
.
name
})
}
return
this
.
elementData
.
dataList
.
series
},
tabsStyle
()
{
tabsStyle
()
{
const
{
const
{
fontSize
,
fontSize
,
...
@@ -278,4 +294,17 @@
...
@@ -278,4 +294,17 @@
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
}
}
// 需要根据配置下拉的字体大小,字体颜色和高亮颜色,不要右边的icon
::v-deep
{
.u-dropdown__menu__item
{
background-color
:
#fff
!
important
;
}
.u-cell-item-box
{
background-color
:
aquamarine
!
important
;
}
.u-cell_title
{
font-size
:
var
(
--
font-size
)
!
important
;
}
}
</
style
>
</
style
>
pages/index/index.vue
View file @
86237de4
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
async
getReportCharts
()
{
async
getReportCharts
()
{
clearInterval
(
this
.
timename
)
clearInterval
(
this
.
timename
)
const
that
=
this
const
that
=
this
let
res
=
await
that
.
$u
.
api
.
getReportCharts
({
id
:
'6
27a16644606332538b4633c
'
})
let
res
=
await
that
.
$u
.
api
.
getReportCharts
({
id
:
'6
3647c3932f1997dd2ed53bf
'
})
uni
.
stopPullDownRefresh
()
uni
.
stopPullDownRefresh
()
uni
.
$emit
(
'handlePullDownRefresh'
)
uni
.
$emit
(
'handlePullDownRefresh'
)
const
{
Status
,
Result
:
{
info
,
list
}
}
=
res
.
data
const
{
Status
,
Result
:
{
info
,
list
}
}
=
res
.
data
...
...
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