Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
ac0dea78
Commit
ac0dea78
authored
Jul 17, 2020
by
刘殿昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息管理+i18n
parent
eeb91a4f
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
257 additions
and
124 deletions
+257
-124
src/assets/i18n/language-zh.js
src/assets/i18n/language-zh.js
+19
-11
src/assets/imgs/tool_ic_tuisong.png
src/assets/imgs/tool_ic_tuisong.png
+0
-0
src/components/order-list/order-list-cell.vue
src/components/order-list/order-list-cell.vue
+1
-1
src/components/service-list/service_list.vue
src/components/service-list/service_list.vue
+1
-1
src/pages/data-analysis/my-application.vue
src/pages/data-analysis/my-application.vue
+2
-2
src/pages/data-analysis/my-service.vue
src/pages/data-analysis/my-service.vue
+2
-2
src/pages/message-management/banner/banner-list.vue
src/pages/message-management/banner/banner-list.vue
+19
-0
src/pages/message-management/directed-push/directed-push-list.vue
...s/message-management/directed-push/directed-push-list.vue
+19
-0
src/pages/message-management/message-alert/message-alert-list.vue
...s/message-management/message-alert/message-alert-list.vue
+19
-0
src/pages/message-management/message-template/message-template-list.vue
...age-management/message-template/message-template-list.vue
+19
-0
src/pages/message-management/message.vue
src/pages/message-management/message.vue
+94
-0
src/pages/message-management/recommended/recommended-list.vue
...pages/message-management/recommended/recommended-list.vue
+19
-0
src/pages/user/message.vue
src/pages/user/message.vue
+0
-81
src/pages/user/user.vue
src/pages/user/user.vue
+0
-14
src/pages/user/user_info.vue
src/pages/user/user_info.vue
+1
-1
src/pages/workbench/fwgl/cloud-detail.vue
src/pages/workbench/fwgl/cloud-detail.vue
+9
-6
src/router/index.js
src/router/index.js
+33
-5
No files found.
src/assets/i18n/language-zh.js
View file @
ac0dea78
...
...
@@ -4,25 +4,33 @@ export const lang = {
// .
// .
// part personal center
personal
C
enter
:
"
个人中心
"
,
personal
_c
enter
:
"
个人中心
"
,
profile
:
"
个人档案
"
,
message
C
enter
:
"
消息中心
"
,
message
_c
enter
:
"
消息中心
"
,
// unit of purchase duration
by
Y
ear
:
"
按年
"
,
by
M
onth
:
"
按月
"
,
by
_y
ear
:
"
按年
"
,
by
_m
onth
:
"
按月
"
,
// service shop menu item
service
S
hop
:
"
服务超市
"
,
service
_s
hop
:
"
服务超市
"
,
// work bench
workBench
:
"
工作台
"
,
cloud
ResourcesS
ervice
:
"
云资源服务
"
,
cloud
ResourcesM
anagement
:
"
云资源管理
"
,
cloud
ResourcesD
etail
:
"
云资源详情
"
,
cloud
_resources_s
ervice
:
"
云资源服务
"
,
cloud
_resources_m
anagement
:
"
云资源管理
"
,
cloud
_resources_d
etail
:
"
云资源详情
"
,
// data analysis
dataAnalysis
:
"
数据分析中心
"
,
myServiceDataAnalysis
:
"
我的服务数据分析
"
,
myApplicationDataAnalysis
:
"
我的应用数据分析
"
data_analysis
:
"
数据分析中心
"
,
my_service_data_analysis
:
"
我的服务数据分析
"
,
my_application_data_analysis
:
"
我的应用数据分析
"
,
// message
message
:
"
消息与推送管理
"
,
recommended
:
"
推荐位管理
"
,
directed_push
:
"
定向推送管理
"
,
message_alert
:
"
消息提醒管理
"
,
banner
:
"
banner管理
"
,
message_template
:
"
消息模板管理
"
,
}
\ No newline at end of file
src/assets/imgs/tool_ic_tuisong.png
0 → 100644
View file @
ac0dea78
1.11 KB
src/components/order-list/order-list-cell.vue
View file @
ac0dea78
...
...
@@ -40,7 +40,7 @@
<div>
规格:日访问次数:
{{
cellItem
.
spec_svc_count
}}
次,日访问量:
{{
cellItem
.
spec_svc_pv
}}
</div>
<div
class=
"cell_specification_type"
>
申请方式:
{{
cellItem
.
duration_unit
==
1
?
$t
(
'
lang.by
Month
'
)
:
$t
(
'
lang.byY
ear
'
)
}}
</div>
>
申请方式:
{{
cellItem
.
duration_unit
==
1
?
$t
(
'
lang.by
_month
'
)
:
$t
(
'
lang.by_y
ear
'
)
}}
</div>
</div>
<div
v-else-if=
"cellItem.order_type == 2"
>
<div>
规格:
{{
cellItem
.
spec_app
==
0
?
"
申请获取应用镜像部署权限
"
:
"
申请获取应用镜像开发权限
"
}}
</div>
...
...
src/components/service-list/service_list.vue
View file @
ac0dea78
...
...
@@ -9,7 +9,7 @@
<div>
<div
class=
"head_flex"
>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/shop' }">
{{
$t
(
'
lang.service
S
hop
'
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/shop' }">
{{
$t
(
'
lang.service
_s
hop
'
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
name
}}
</el-breadcrumb-item>
</el-breadcrumb>
<div
class=
"input_right"
>
...
...
src/pages/data-analysis/my-application.vue
View file @
ac0dea78
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1"
>
<el-breadcrumb-item
:to=
"
{ path: '/data_analysis' }">
{{
$t
(
"
lang.data
A
nalysis
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.my
ApplicationDataA
nalysis
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/data_analysis' }">
{{
$t
(
"
lang.data
_a
nalysis
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.my
_application_data_a
nalysis
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
<el-row
class=
"in_analysis"
>
<!-- 可横向铺满 -->
...
...
src/pages/data-analysis/my-service.vue
View file @
ac0dea78
...
...
@@ -3,12 +3,12 @@
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1"
>
<el-breadcrumb-item
:to=
"
{ path: '/data_analysis' }">
{{
$t
(
"
lang.data
A
nalysis
"
)
$t
(
"
lang.data
_a
nalysis
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.my
ServiceDataA
nalysis
"
)
$t
(
"
lang.my
_service_data_a
nalysis
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
...
...
src/pages/message-management/banner/banner-list.vue
0 → 100644
View file @
ac0dea78
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/message' }">
{{
$t
(
"
lang.message
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.banner
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
</
template
>
<
script
>
export
default
{
components
:
{},
data
:
()
=>
({}),
mounted
()
{},
methods
:
{}
};
</
script
>
<
style
scoped
>
</
style
>
\ No newline at end of file
src/pages/message-management/directed-push/directed-push-list.vue
0 → 100644
View file @
ac0dea78
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/message' }">
{{
$t
(
"
lang.message
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.directed_push
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
</
template
>
<
script
>
export
default
{
components
:
{},
data
:
()
=>
({}),
mounted
()
{},
methods
:
{}
};
</
script
>
<
style
scoped
>
</
style
>
\ No newline at end of file
src/pages/message-management/message-alert/message-alert-list.vue
0 → 100644
View file @
ac0dea78
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/message' }">
{{
$t
(
"
lang.message
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.message_alert
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
</
template
>
<
script
>
export
default
{
components
:
{},
data
:
()
=>
({}),
mounted
()
{},
methods
:
{}
};
</
script
>
<
style
scoped
>
</
style
>
\ No newline at end of file
src/pages/message-management/message-template/message-template-list.vue
0 → 100644
View file @
ac0dea78
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/message' }">
{{
$t
(
"
lang.message
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.message_template
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
</
template
>
<
script
>
export
default
{
components
:
{},
data
:
()
=>
({}),
mounted
()
{},
methods
:
{}
};
</
script
>
<
style
scoped
>
</
style
>
\ No newline at end of file
src/pages/message-management/message.vue
0 → 100644
View file @
ac0dea78
<
template
>
<div
class=
"fwgl_container"
>
<side-nav-bar
title=
"消息与推送管理"
imgSrc=
"tool_ic_tuisong"
:nav-list=
"navList"
:title-path=
"navList[0] && navList[0].path"
></side-nav-bar>
<div
class=
"main_container"
>
<router-view
:key=
"'type_' + $route.params.type"
></router-view>
</div>
</div>
</
template
>
<
script
>
import
sideNavBar
from
"
@/components/side-nav-bar
"
;
export
default
{
components
:
{
sideNavBar
},
data
:
()
=>
({
userNav
:
[
{
name
:
"
推荐位管理
"
,
path
:
`/message/recommended`
},
{
name
:
"
定向推送管理
"
,
path
:
`/message/directed_push`
},
{
name
:
"
消息提醒管理
"
,
path
:
`/message/message_alert`
},
{
name
:
"
benner管理
"
,
path
:
`/message/banner`
},
{
name
:
"
消息模板管理
"
,
path
:
`/message/message_template`
}
],
navList
:
[]
}),
watch
:
{
"
$route.fullPath
"
(
path
)
{
this
.
initNavList
();
}
},
methods
:
{
initNavList
()
{
// this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
// if (response.data.success == 1) {
// let arr = response.data.data[0].Child;
// let user_index = arr.findIndex(item => item.visit_url == "/message");
// if (user_index != -1) {
// this.navList = arr[user_index].Child;
// this.navList.forEach(item => {
// item.name = item.menu_name;
// item.path = item.visit_url;
// });
// }
// }
// });
this
.
navList
=
this
.
userNav
;
}
},
mounted
()
{
this
.
initNavList
();
}
};
</
script
>
<
style
scoped
>
.fwgl_container
{
height
:
calc
(
100vh
-
84px
);
display
:
flex
;
justify-content
:
flex-start
;
align-items
:
stretch
;
}
.side_nav_bar
{
width
:
180px
;
flex-shrink
:
0
;
}
.main_container
{
width
:
calc
(
100%
-
180px
);
flex-grow
:
1
;
flex-shrink
:
1
;
background-color
:
#f6f7fb
;
overflow
:
auto
;
}
</
style
>
src/pages/message-management/recommended/recommended-list.vue
0 → 100644
View file @
ac0dea78
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/message' }">
{{
$t
(
"
lang.message
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.recommended
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
</
template
>
<
script
>
export
default
{
components
:
{},
data
:
()
=>
({}),
mounted
()
{},
methods
:
{}
};
</
script
>
<
style
scoped
>
</
style
>
\ No newline at end of file
src/pages/user/message.vue
deleted
100644 → 0
View file @
eeb91a4f
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/user' }">
{{
$t
(
"
lang.personalCenter
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.messageCenter
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
<block-radius
class=
"message_block"
>
<ces-table
size=
"mini"
url=
"tableData"
:detailsUrl=
"detailsUrl"
:border=
"false"
:headers=
"headers"
:searchShow=
"false"
:autoAdd=
"false"
emptyText=
"没有消息哦"
:stripe=
"true"
:paginationShow=
"true"
:pageSizeShow=
"true"
:isIndex=
"false"
></ces-table>
</block-radius>
</div>
</
template
>
<
script
>
import
CesTable
from
"
@/components/table/table-um
"
;
import
BlockRadius
from
"
@/components/general/block-radius
"
;
export
default
{
components
:
{
CesTable
,
BlockRadius
},
data
:
()
=>
({
headers
:
[
{
label
:
"
服务url
"
,
prop
:
"
date
"
,
type
:
"
href
"
,
align
:
"
left
"
},
{
label
:
"
服务名称
"
,
prop
:
"
name
"
,
type
:
"
href
"
,
align
:
"
center
"
},
{
label
:
"
中文名
"
,
prop
:
"
address
"
,
type
:
"
href
"
,
align
:
"
right
"
},
{
label
:
"
操作
"
,
type
:
"
Button
"
,
align
:
"
center
"
,
btnList
:
[
{
type
:
"
primary-edit
"
,
label
:
"
编辑
"
,
line
:
"
|
"
},
{
type
:
"
primary-del
"
,
label
:
"
删除
"
}
]
}
],
detailsUrl
:
"
details
"
}),
mounted
()
{},
methods
:
{}
};
</
script
>
<
style
scoped
>
.message_block
{
margin
:
0
20px
;
}
</
style
>
\ No newline at end of file
src/pages/user/user.vue
View file @
ac0dea78
...
...
@@ -20,20 +20,6 @@ export default {
sideNavBar
},
data
:
()
=>
({
userNav
:
[
{
name
:
"
个人档案
"
,
path
:
`/user/user_info`
},
{
name
:
"
消息管理
"
,
path
:
`/user/message`
},
{
name
:
"
订单管理
"
,
path
:
`/user/order_list`
}
],
navList
:
[]
}),
watch
:
{
...
...
src/pages/user/user_info.vue
View file @
ac0dea78
<
template
>
<div>
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: '/user' }">
{{
$t
(
"
lang.personal
C
enter
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/user' }">
{{
$t
(
"
lang.personal
_c
enter
"
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
"
lang.profile
"
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
<block-radius
class=
"info_block"
>
...
...
src/pages/workbench/fwgl/cloud-detail.vue
View file @
ac0dea78
...
...
@@ -10,8 +10,8 @@
<el-breadcrumb
separator=
"/"
class=
"bread_crumb1 bread_left"
>
<el-breadcrumb-item
:to=
"
{ path: getUrl() }"
>
{{
this
.
$route
.
params
.
level
==
1
?
$t
(
'
lang.cloud
ResourcesService
'
)
:
$t
(
'
lang.cloudResourcesM
anagement
'
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
'
lang.cloud
ResourcesD
etail
'
)
}}
</el-breadcrumb-item>
>
{{
this
.
$route
.
params
.
level
==
1
?
$t
(
'
lang.cloud
_resources_service
'
)
:
$t
(
'
lang.cloud_resources_m
anagement
'
)
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t
(
'
lang.cloud
_resources_d
etail
'
)
}}
</el-breadcrumb-item>
</el-breadcrumb>
<BlockRadius
class=
"in_cloud_block"
>
<div
class=
"cloud_block_head"
>
...
...
@@ -653,7 +653,7 @@ export default {
let
count
=
data
.
cloud_resource_count
;
// resource usage
if
(
count
)
{
this
.
data1
.
total
=
count
.
cpu_total
;
this
.
data1
.
remaining
=
count
.
cpu_total
-
count
.
cpu_use
;
this
.
data1
.
remaining
=
(
count
.
cpu_total
-
count
.
cpu_use
).
toFixed
(
2
)
;
if
(
count
.
cpu_total
!=
0
&&
count
.
cpu_use
!=
0
)
{
this
.
data1
.
data
=
Math
.
round
(
(
count
.
cpu_use
/
count
.
cpu_total
)
*
100
...
...
@@ -662,7 +662,9 @@ export default {
this
.
data1
.
data
=
0
;
}
this
.
data2
.
total
=
count
.
memory_total
;
this
.
data2
.
remaining
=
count
.
memory_total
-
count
.
memory_use
;
this
.
data2
.
remaining
=
(
count
.
memory_total
-
count
.
memory_use
).
toFixed
(
2
);
if
(
count
.
memory_total
!=
0
&&
count
.
memory_use
!=
0
)
{
this
.
data2
.
data
=
Math
.
round
(
(
count
.
memory_use
/
count
.
memory_total
)
*
100
...
...
@@ -671,8 +673,9 @@ export default {
this
.
data2
.
data
=
0
;
}
this
.
data3
.
total
=
count
.
containers_total
;
this
.
data3
.
remaining
=
count
.
containers_total
-
count
.
containers_use
;
this
.
data3
.
remaining
=
(
count
.
containers_total
-
count
.
containers_use
).
toFixed
(
2
);
if
(
count
.
containers_total
!=
0
&&
count
.
containers_use
!=
0
)
{
this
.
data3
.
data
=
Math
.
round
(
(
count
.
containers_use
/
count
.
containers_total
)
*
100
...
...
src/router/index.js
View file @
ac0dea78
...
...
@@ -248,11 +248,6 @@ export default new Router({
name
:
"
userInfo
"
,
component
:
()
=>
import
(
"
@/pages/user/user_info
"
),
},
{
path
:
"
/user/message
"
,
// 消息管理页
name
:
"
message
"
,
component
:
()
=>
import
(
"
@/pages/user/message
"
),
},
{
path
:
"
/user/order_list
"
,
// 订单管理页
name
:
"
orderList
"
,
...
...
@@ -373,6 +368,39 @@ export default new Router({
},
],
},
{
path
:
"
/message
"
,
// 消息与推送管理
name
:
"
message
"
,
redirect
:
"
/message/recommended
"
,
component
:
()
=>
import
(
"
@/pages/message-management/message
"
),
children
:
[
{
path
:
"
/message/recommended
"
,
// 推荐位管理列表
name
:
"
recommended
"
,
component
:
()
=>
import
(
"
@/pages/message-management/recommended/recommended-list
"
),
},
{
path
:
"
/message/directed_push
"
,
// 定向推送列表
name
:
"
directed_push
"
,
component
:
()
=>
import
(
"
@/pages/message-management/directed-push/directed-push-list
"
),
},
{
path
:
"
/message/message_alert
"
,
// 消息提醒列表
name
:
"
message_alert
"
,
component
:
()
=>
import
(
"
@/pages/message-management/message-alert/message-alert-list
"
),
},
{
path
:
"
/message/banner
"
,
// benner列表
name
:
"
banner
"
,
component
:
()
=>
import
(
"
@/pages/message-management/banner/banner-list
"
),
},
{
path
:
"
/message/message_template
"
,
// 消息模板列表
name
:
"
message_template
"
,
component
:
()
=>
import
(
"
@/pages/message-management/message-template/message-template-list
"
),
},
],
},
// 消息与推送管理
],
},
{
...
...
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