Skip to content

A
apaas-ui
Commit 2b4f077d authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

parents 914e86b8 15a254da
Show whitespace changes
Inline Side-by-side
Showing with 349 additions and 20 deletions
src/components/order-list/order-list-cell.vue
View file @ 2b4f077d
......@@ -10,7 +10,7 @@
>删除</div>
</div>
<el-row class="cell_row">
<el-col :span="10" class="cell_msg">
<el-col :span="8" class="cell_msg">
<img v-if="cellItem.order_type != 3" :src="cellItem.cover" class="cell_msg_img" />
<img v-else :src="require('@/assets/imgs/img_yunziyuan.png')" class="cell_msg_img" />
<div class="cell_msg_right">
......@@ -39,7 +39,7 @@
</div>
</div>
</el-col>
<el-col :span="6" class="cell_specification">
<el-col :span="5" class="cell_specification">
<div v-if="cellItem.order_type == 1">
<el-tooltip class="item" effect="dark" placement="right">
<div slot="content" class="gg">
......@@ -100,7 +100,129 @@
>单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB；</div>
</div>
</el-col>
<el-col :span="4" class="approval_status">
<el-col :span="3" class="cell_specification">
<div v-if="cellItem.order_type == 1">
<el-tooltip class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
日访问次数：{{cellItem.spec_svc_count}}次，日访问量：{{cellItem.spec_svc_pv }}
</div>
<div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
</el-tooltip>
<div
class="cell_specification_type"
>申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.by_month') : $t('lang.by_year') }}</div>
</div>
<div v-else-if="cellItem.order_type == 2">
<el-tooltip class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
{{ cellItem.spec_app == 0 ? '申请获取应用镜像部署权限' : '申请获取应用镜像开发权限' }}
</div>
<div>规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</div>
</el-tooltip>
</div>
<div v-else-if="cellItem.order_type == 3">
<el-tooltip v-if="cellItem.apply_type == 0" class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<br />
数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；
</div>
<div class="specification_item">
规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<span
v-if="cellItem.disk_num != 0"
>数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；</span>
</div>
</el-tooltip>
<el-tooltip v-else class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<span
class="gg_span"
v-for="(item, index) in cellItem.adjust_disk"
:key="'sjj' + index"
>数据盘 {{item.disk_num}}块，每块数据盘容量 {{item.disk_cap}}GB；</span>
</div>
<div class="specification_item">
规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<span>{{ thisDisks }}</span>
</div>
</el-tooltip>
<div
class="cell_specification_type"
>单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB；</div>
</div>
</el-col>
<el-col :span="3" class="cell_specification">
<div v-if="cellItem.order_type == 1">
<el-tooltip class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
日访问次数：{{cellItem.spec_svc_count}}次，日访问量：{{cellItem.spec_svc_pv }}
</div>
<div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
</el-tooltip>
<div
class="cell_specification_type"
>申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.by_month') : $t('lang.by_year') }}</div>
</div>
<div v-else-if="cellItem.order_type == 2">
<el-tooltip class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
{{ cellItem.spec_app == 0 ? '申请获取应用镜像部署权限' : '申请获取应用镜像开发权限' }}
</div>
<div>规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</div>
</el-tooltip>
</div>
<div v-else-if="cellItem.order_type == 3">
<el-tooltip v-if="cellItem.apply_type == 0" class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<br />
数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；
</div>
<div class="specification_item">
规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<span
v-if="cellItem.disk_num != 0"
>数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；</span>
</div>
</el-tooltip>
<el-tooltip v-else class="item" effect="dark" placement="right">
<div slot="content" class="gg">
规格：
<br />
CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<span
class="gg_span"
v-for="(item, index) in cellItem.adjust_disk"
:key="'sjj' + index"
>数据盘 {{item.disk_num}}块，每块数据盘容量 {{item.disk_cap}}GB；</span>
</div>
<div class="specification_item">
规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<span>{{ thisDisks }}</span>
</div>
</el-tooltip>
<div
class="cell_specification_type"
>单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB；</div>
</div>
</el-col>
<el-col :span="2" class="approval_status">
<div>
<div v-if="cellItem.approval_first_level == 0 && cellItem.pay_status != -1">待审核</div>
<div
......@@ -153,7 +275,7 @@
>收起评价</div>
</div>
</el-col>
<el-col :span="4" class="cell_option">
<el-col :span="3" class="cell_option">
<div>
<el-button
size="madium"
......
src/components/order-list/order-list-com.vue
View file @ 2b4f077d
......@@ -13,9 +13,10 @@
<span
v-for="(item, index) in buttonList"
:key="'btn' + index"
:class="item.state ? 'btn_default btn_actice':'btn_default'"
:class="item.state ? 'btn_default btn_actice' : 'btn_default'"
@click="btnClick(index)"
>{{ item.name }}</span>
>{{ item.name }}</span
>
</div>
<div class="input_right">
<el-input
......@@ -58,7 +59,10 @@
:disabled="pagination.page == 1"
></el-button>
&nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
Math.ceil(
(pagination.total == 0 ? 1 : pagination.total) /
pagination.rowsPerPage
)
}}页
<el-button
icon="el-icon-arrow-right"
......@@ -67,7 +71,10 @@
@click="handleCurrentChange(1)"
:disabled="
pagination.page >=
Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
Math.ceil(
(pagination.total == 0 ? 1 : pagination.total) /
pagination.rowsPerPage
)
"
></el-button>
</div>
......@@ -304,11 +311,12 @@ export default {
border-right-color: #dcdfe6;
border-left-color: #dcdfe6;
border-top: 4px solid #e56600;
height: 48px;
height: 50px !important;
}
.order_block .el-tabs--border-card > .el-tabs__header .el-tabs__item {
border-top: 4px solid transparent;
height: 48px;
height: 50px !important;
line-height: 46px !important;
}
.order_block .el-tabs--border-card > .el-tabs__header .el-tabs__item:hover {
color: #e56600;
......
src/components/order-list/order-list-list.vue
View file @ 2b4f077d
......@@ -2,10 +2,12 @@
<div class="order_list">
<div class="order_th_pad">
<el-row class="order_th">
<el-col :span="10">服务信息</el-col>
<el-col :span="6">规格</el-col>
<el-col :span="4">申请状态</el-col>
<el-col :span="4">操作</el-col>
<el-col :span="8">服务信息</el-col>
<el-col :span="5">规格</el-col>
<el-col :span="3">购买时长</el-col>
<el-col :span="3">总价</el-col>
<el-col :span="2">申请状态</el-col>
<el-col :span="3">操作</el-col>
</el-row>
</div>
<order-cell v-for="item in datas" :key="item.id" :cellItem="item" @updateList="updateList"></order-cell>
......
src/pages/technical-support/sdk-manage/example/index.vue 0 → 100644
View file @ 2b4f077d
<template>
<div class="doc_manage_container">
<apass-list
ref="list"
search-placeholder="请输入关键字"
:list-padding-left="paddingLeft"
:hide-search="true"
:list-total="listTotal"
:list-header="listHeader"
:list-data="listData"
@list-action="init"
>
<el-breadcrumb separator="/" slot="breadcrumb">
<el-breadcrumb-item to="/technical_support">
技术支持
</el-breadcrumb-item>
<el-breadcrumb-item to="/technical_support/doc_manage">
SDK管理
</el-breadcrumb-item>
<el-breadcrumb-item>
SDK示例管理
</el-breadcrumb-item>
</el-breadcrumb>
<template slot="top">
<div class="top_fliter">
<show-more-filter class="filter_list">
<div class="filter_item">
<span class="filter_title">SDK类型：</span>
<el-select v-model="topFilter.type" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in types"
:key="'top_type_' + index"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
<div class="filter_item">
<span class="filter_title">最后更新时间：</span>
<el-date-picker
v-model="topFilter.time"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</div>
</show-more-filter>
<div class="filter_action apaas_button">
<el-button type="primary" @click="topFilterAction">
查询
</el-button>
<el-button type="defalut" @click="topFilterClear">
重置
</el-button>
</div>
</div>
</template>
<div class="main_top" slot="main-top">
xxx
</div>
</apass-list>
</div>
</template>
<script>
import helper from "@/services/helper.js";
import apassList from "@/components/apass-list";
import apassDialog from "@/components/apass-dialog";
import showMoreFilter from "@/components/show-more-filter";
export default {
components: {
apassList,
apassDialog,
showMoreFilter,
},
data() {
return {
paddingLeft: 25,
listTotal: 0,
listHeader: [{}],
listData: [],
topFilter: {
type: "",
time: "",
},
types: [],
tempFilter: {},
};
},
methods: {
init(filter) {
let fullFilter = {
...filter,
...this.topFilter,
};
this.tempFilter = filter;
console.log(fullFilter);
},
topFilterClear() {
this.topFilter = {
name: "",
type: "",
time: "",
};
this.refreshPage();
},
topFilterAction() {
this.refreshPage();
},
refreshPage() {
this.$refs.list.resetCurrentPage();
},
},
};
</script>
src/pages/technical-support/sdk-manage/type/index.vue
View file @ 2b4f077d
......@@ -61,6 +61,21 @@
</div>
</div>
</template>
<div class="main_top_action apaas_button" slot="main-top">
<el-button class="delete_btn" type="danger" @click="deleteSlectedItem">
批量删除
</el-button>
<span class="selected_text">
已选择
<span>3</span>
项
</span>
<a class="clean_btn" @click.prevent="cleanSlectedItem">清空</a>
<el-button class="add_btn" type="primary" @click="addNewSdk">
新增SDK类型
</el-button>
</div>
</apass-list>
</div>
</template>
......@@ -81,7 +96,7 @@ export default {
return {
paddingLeft: 25,
listTotal: 0,
listHeader: [],
listHeader: [{}],
listData: [],
topFilter: {
type: "",
......@@ -116,6 +131,38 @@ export default {
refreshPage() {
this.$refs.list.resetCurrentPage();
},
deleteSlectedItem() {
console.log("deleteSlectedItem");
},
cleanSlectedItem() {
console.log("cleanSlectedItem");
},
addNewSdk() {
console.log("addNewSdk");
},
},
};
</script>
<style>
.main_top_action {
display: flex;
justify-content: flex-start;
align-items: center;
}
.main_top_action .delete_btn {
}
.main_top_action .selected_text {
margin-left: 30px;
}
.main_top_action .clean_btn {
font-size: 14px;
line-height: 24px;
color: #2b4695;
text-decoration: underline;
margin-left: 30px;
}
.main_top_action .add_btn {
margin-left: auto;
}
</style>
src/router/index.js
View file @ 2b4f077d
......@@ -188,7 +188,8 @@ export default new Router({
path: "/technical_support/demo_center",
name: "technicalSupportDemo",
// redirect: "/technical_support/demo_center/index",
component: () => import("@/pages/technical-support/demo-center/index"),
component: () =>
import("@/pages/technical-support/demo-center/index"),
// children: [
// {
// path: "/technical_support/doc_manage/list",
......@@ -230,10 +231,34 @@ export default new Router({
{
path: "/technical_support/sdk/:type/:id",
name: "technicalSupportSdkDetail",
component: () => import("@/pages/technical-support/sdk/detail"),
component: () =>
import("@/pages/technical-support/sdk/detail"),
}, // 问答中心列表
],
}, // 问答中心
}, // SDK中心
{
path: "/technical_support/sdk_manage",
name: "technicalSupportDoc",
redirect: "/technical_support/sdk_manage/type",
component: () =>
import("@/pages/technical-support/sdk-manage/index"),
children: [
{
path: "/technical_support/sdk_manage/type",
name: "technicalSupportSdkType",
component: () =>
import("@/pages/technical-support/sdk-manage/type/index"),
}, // SDK类型管理
{
path: "/technical_support/sdk_manage/example",
name: "technicalSupportSdkExample",
component: () =>
import(
"@/pages/technical-support/sdk-manage/example/index"
),
}, // SDK示例管理
],
}, // SDK管理
],
}, // 技术支持
{
......
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