Skip to content

A
apaas-ui
Commit a47b2b59 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

Merge branch 'ldx' into dev

parents af236805 ac0dea78
Hide whitespace changes
Inline Side-by-side
Showing with 257 additions and 124 deletions
src/assets/i18n/language-zh.js
View file @ a47b2b59
......@@ -4,25 +4,33 @@ export const lang = {
// .
// .
// part personal center
personalCenter: "个人中心",
personal_center: "个人中心",
profile: "个人档案",
messageCenter: "消息中心",
message_center: "消息中心",
// unit of purchase duration
byYear: "按年",
byMonth: "按月",
by_year: "按年",
by_month: "按月",
// service shop menu item
serviceShop: "服务超市",
service_shop: "服务超市",
// work bench
workBench: "工作台",
cloudResourcesService: "云资源服务",
cloudResourcesManagement: "云资源管理",
cloudResourcesDetail: "云资源详情",
cloud_resources_service: "云资源服务",
cloud_resources_management: "云资源管理",
cloud_resources_detail: "云资源详情",
// 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/components/order-list/order-list-cell.vue
View file @ a47b2b59
......@@ -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.byMonth') : $t('lang.byYear') }}</div>
>申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.by_month') : $t('lang.by_year') }}</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 @ a47b2b59
......@@ -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.serviceShop') }}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/shop' }">{{ $t('lang.service_shop') }}</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 @ a47b2b59
<template>
<div>
<el-breadcrumb separator="/" class="bread_crumb1">
<el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ $t("lang.dataAnalysis") }}</el-breadcrumb-item>
<el-breadcrumb-item>{{ $t("lang.myApplicationDataAnalysis") }}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ $t("lang.data_analysis") }}</el-breadcrumb-item>
<el-breadcrumb-item>{{ $t("lang.my_application_data_analysis") }}</el-breadcrumb-item>
</el-breadcrumb>
<el-row class="in_analysis">
<!-- 可横向铺满 -->
......
src/pages/data-analysis/my-service.vue
View file @ a47b2b59
......@@ -3,12 +3,12 @@
<el-breadcrumb separator="/" class="bread_crumb1">
<el-breadcrumb-item :to="{ path: '/data_analysis' }">
{{
$t("lang.dataAnalysis")
$t("lang.data_analysis")
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
$t("lang.myServiceDataAnalysis")
$t("lang.my_service_data_analysis")
}}
</el-breadcrumb-item>
</el-breadcrumb>
......
src/pages/message-management/banner/banner-list.vue 0 → 100644
View file @ a47b2b59
<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 @ a47b2b59
<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 @ a47b2b59
<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 @ a47b2b59
<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 @ a47b2b59
<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 @ a47b2b59
<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 @ af236805
<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 @ a47b2b59
......@@ -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 @ a47b2b59
<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 :to="{ path: '/user' }">{{ $t("lang.personal_center") }}</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 @ a47b2b59
......@@ -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.cloudResourcesService') : $t('lang.cloudResourcesManagement') }}</el-breadcrumb-item>
<el-breadcrumb-item>{{ $t('lang.cloudResourcesDetail') }}</el-breadcrumb-item>
>{{ this.$route.params.level == 1 ? $t('lang.cloud_resources_service') : $t('lang.cloud_resources_management') }}</el-breadcrumb-item>
<el-breadcrumb-item>{{ $t('lang.cloud_resources_detail') }}</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 @ a47b2b59
......@@ -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"),
},
],
}, // 消息与推送管理
],
},
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment