Skip to content

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

Merge branch 'ldx' of cloud.wodcloud.com:apaas/apaas-v3-ui into ldx

parents 5eb690c0 cd6ba14e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1646 additions and 332 deletions
src/assets/imgs/ic_true.png
View replaced file @ 5eb690c0 View file @ 658fc9ab
src/assets/imgs/ic_true.png

1.51 KB | W: | H:

src/assets/imgs/ic_true.png

1.51 KB | W: | H:

src/assets/imgs/ic_true.png
src/assets/imgs/ic_true.png
src/assets/imgs/ic_true.png
src/assets/imgs/ic_true.png
  • 2-up
  • Swipe
  • Onion skin
src/components/apass-list.vue
View file @ 658fc9ab
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
<slot name="breadcrumb"></slot> <slot name="breadcrumb"></slot>
</div> </div>
<div class="main-container"> <div class="main-container">
<slot name="top"></slot>
<div class="header-container" v-if="!hideHeader"> <div class="header-container" v-if="!hideHeader">
<div class="header-left apass_button"> <div class="header-left apass_button">
<el-button <el-button
...@@ -18,6 +20,28 @@ ...@@ -18,6 +20,28 @@
" "
></i> ></i>
</el-button> </el-button>
<div
v-for="(item, index) in selectFilter"
:key="'select_' + index"
class="select_container"
>
<span class="select_title" v-text="item.name"></span>
<el-select
v-model="item.value"
placeholder="请选择"
@change="listAction"
>
<el-option
v-for="(v, i) in item.options"
:key="'select_' + index + '_option_' + i"
:label="v.name"
:value="v.value"
>
</el-option>
</el-select>
</div>
<slot name="header-left"></slot> <slot name="header-left"></slot>
</div> </div>
<div class="header-center"> <div class="header-center">
...@@ -51,7 +75,7 @@ ...@@ -51,7 +75,7 @@
<list-table <list-table
:header="listHeader" :header="listHeader"
:data="listData" :data="listData"
:padding-left="35" :padding-left="listPaddingLeft"
></list-table> ></list-table>
</div> </div>
...@@ -84,6 +108,10 @@ export default { ...@@ -84,6 +108,10 @@ export default {
type: Array, type: Array,
default: () => [], default: () => [],
}, },
otherFilter: {
type: Array,
default: () => [],
},
listHeader: { listHeader: {
type: Array, type: Array,
default: () => [], default: () => [],
...@@ -116,8 +144,21 @@ export default { ...@@ -116,8 +144,21 @@ export default {
currentPage: 1, currentPage: 1,
timer: null, timer: null,
pageSizes: [15, 50, 100], pageSizes: [15, 50, 100],
selectFilter: [],
}), }),
methods: { methods: {
initOtherFilter() {
this.otherFilter.forEach((item) => {
this.$set(this.filter, item.prop, item.default);
this.selectFilter.push({
name: item.name,
prop: item.prop,
value: item.default,
options: item.options,
});
});
},
searchAction(value) { searchAction(value) {
this.listAction(); this.listAction();
}, },
...@@ -140,8 +181,15 @@ export default { ...@@ -140,8 +181,15 @@ export default {
} }
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
let selectFilter = {};
this.selectFilter.forEach((item) => {
selectFilter[item.prop] = item.value;
});
this.$emit("list-action", { this.$emit("list-action", {
...this.filter, ...this.filter,
...selectFilter,
keyword: this.searchValue, keyword: this.searchValue,
size: this.pageSize, size: this.pageSize,
page: this.currentPage, page: this.currentPage,
...@@ -150,6 +198,10 @@ export default { ...@@ -150,6 +198,10 @@ export default {
}, },
}, },
mounted() { mounted() {
if (this.otherFilter && this.otherFilter.length > 0) {
this.initOtherFilter();
}
this.listAction(); this.listAction();
}, },
}; };
...@@ -182,7 +234,17 @@ export default { ...@@ -182,7 +234,17 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.header-container .el-button + .el-button { .header-container .select_container {
display: inline-block;
vertical-align: middle;
}
.header-container .select_container .select_title {
font-size: 14px;
color: #242c43;
margin-right: 10px;
}
.header-container .el-button + .el-button,
.header-container .select_container + .select_container {
margin-left: 25px; margin-left: 25px;
} }
.apass_filter { .apass_filter {
......
src/components/apass-table.vue
View file @ 658fc9ab
<template> <template>
<div class="apass_table"> <div class="apass_table">
<el-table :data="data"> <el-table :data="data">
<el-table-column :width="Math.max(paddingLeft - 10, 0)"></el-table-column> <el-table-column
v-if="paddingLeft > 10"
:width="paddingLeft - 10"
></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in header" v-for="(item, index) in header"
:label="item.label" :label="item.label"
...@@ -43,6 +46,33 @@ ...@@ -43,6 +46,33 @@
@click="item.callback && item.callback(scope.row)" @click="item.callback && item.callback(scope.row)"
></a> ></a>
</div> </div>
<div v-else-if="item.type === 'image'" class="img_content">
<img
:src="item.getImage && item.getImage(scope.row)"
:width="item.size"
/>
</div>
<div
v-else-if="
item.type === 'tooltip' &&
item.getLength &&
item.getLength(scope.row) > 1
"
>
<el-tooltip
placement="right-start"
popper-class="apass_table_tooltip"
>
<div
slot="content"
v-html="item.getContent && item.getContent(scope.row)"
></div>
<span
v-text="(item.getText && item.getText(scope.row)) + '..'"
style="text-decoration: underline;color: #515fe7;"
></span>
</el-tooltip>
</div>
<span <span
v-else v-else
v-text=" v-text="
...@@ -73,3 +103,19 @@ export default { ...@@ -73,3 +103,19 @@ export default {
}, },
}; };
</script> </script>
<style scoped>
.img_content {
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
</style>
<style>
.apass_table_tooltip {
font-size: 12px;
line-height: 20px;
}
</style>
src/components/card.vue
View file @ 658fc9ab
<template> <template>
<div class="card"> <div class="card" :style="flag?{borderRadius: '0px 12px 0px 0px'}:{}">
<div class="card_title"><div class="circle"></div>{{title}}</div> <div class="card_title"><div class="circle"></div>{{title}}</div>
<div class="card_contain"> <div class="card_contain">
<slot></slot> <slot></slot>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<script> <script>
export default { export default {
props: ['title'], props: ['title','flag'],
components: { components: {
}, },
......
src/components/e-charts/line_chart.vue
View file @ 658fc9ab
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
import uuidv1 from "uuid/v1"; import uuidv1 from "uuid/v1";
var echarts = require("echarts"); var echarts = require("echarts");
export default { export default {
props: [], props: ['data'],
components: {}, components: {},
data() { data() {
return { return {
...@@ -16,9 +16,11 @@ export default { ...@@ -16,9 +16,11 @@ export default {
watch: {}, watch: {},
computed: {}, computed: {},
created() {}, created() {},
mounted() {}, mounted() {
this.init_line_charts(this.data.xaxis,this.data.data)
},
methods: { methods: {
init_line_charts() { init_line_charts(xAxisData,yarr) {
let bgColor = "#fff"; let bgColor = "#fff";
let color = [ let color = [
"#0090FF", "#0090FF",
...@@ -28,73 +30,76 @@ export default { ...@@ -28,73 +30,76 @@ export default {
"#8B5CFF", "#8B5CFF",
"#00CA69", "#00CA69",
]; ];
let echartData = [ const hexToRgba = (hex, opacity) => {
let rgbaColor = "";
let reg = /^#[\da-f]{6}$/i;
if (reg.test(hex)) {
rgbaColor = `rgba(${parseInt("0x" + hex.slice(1, 3))},${parseInt(
"0x" + hex.slice(3, 5)
)},${parseInt("0x" + hex.slice(5, 7))},${opacity})`;
}
return rgbaColor;
};
var series = []
yarr.forEach((e,idx) => {
series.push(
{ {
name: "1", name: e.name,
value1: 100, type: "line",
value2: 233, smooth: true,
showSymbol: false,
// symbolSize: 8,
zlevel: 3,
lineStyle: {
normal: {
color: color[idx],
shadowBlur: 5,
shadowColor: hexToRgba(color[idx], 0.5),
shadowOffsetY: 10,
}, },
{
name: "2",
value1: 138,
value2: 233,
}, },
areaStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{ {
name: "3", offset: 0,
value1: 350, color: hexToRgba(color[idx], 0.3),
value2: 200,
}, },
{ {
name: "4", offset: 1,
value1: 173, color: hexToRgba(color[idx], 0.1),
value2: 180,
}, },
{ ],
name: "5", false
value1: 180, ),
value2: 199, shadowColor: hexToRgba(color[idx], 0.1),
shadowBlur: 10,
}, },
{
name: "6",
value1: 150,
value2: 233,
}, },
{ emphasis: {
name: "7", itemStyle: {
value1: 180, borderWidth: 5,
value2: 210,
}, },
{
name: "8",
value1: 230,
value2: 180,
}, },
]; data: e.arr,
},
let xAxisData = echartData.map((v) => v.name); )
//  ["1", "2", "3", "4", "5", "6", "7", "8"] });
let yAxisData1 = echartData.map((v) => v.value1);
// [100, 138, 350, 173, 180, 150, 180, 230]
let yAxisData2 = echartData.map((v) => v.value2);
// [233, 233, 200, 180, 199, 233, 210, 180]
const hexToRgba = (hex, opacity) => {
let rgbaColor = "";
let reg = /^#[\da-f]{6}$/i;
if (reg.test(hex)) {
rgbaColor = `rgba(${parseInt("0x" + hex.slice(1, 3))},${parseInt(
"0x" + hex.slice(3, 5)
)},${parseInt("0x" + hex.slice(5, 7))},${opacity})`;
}
return rgbaColor;
};
option = { var option = {
backgroundColor: bgColor, backgroundColor: bgColor,
color: color, color: color,
legend: { legend: {
// show:false,//是否显示图例 // show:false,//是否显示图例
right: "center", right: "center",
bottom: 10, bottom: 0,
itemWidth: 10, itemWidth: 10,
itemHeight: 10, itemHeight: 10,
icon: "roundRect", icon: "roundRect",
...@@ -111,7 +116,10 @@ export default { ...@@ -111,7 +116,10 @@ export default {
}, },
}, },
grid: { grid: {
top: 100, top: 10,
left:10,
right:10,
bottom:30,
containLabel: true, containLabel: true,
}, },
xAxis: [ xAxis: [
...@@ -167,102 +175,18 @@ export default { ...@@ -167,102 +175,18 @@ export default {
}, },
}, },
], ],
series: [ series: series,
{
name: "2018",
type: "line",
smooth: true,
showSymbol: false,
// symbolSize: 8,
zlevel: 3,
lineStyle: {
normal: {
color: color[0],
shadowBlur: 5,
shadowColor: hexToRgba(color[0], 0.5),
shadowOffsetY: 10,
},
},
areaStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{
offset: 0,
color: hexToRgba(color[0], 0.3),
},
{
offset: 1,
color: hexToRgba(color[0], 0.1),
},
],
false
),
shadowColor: hexToRgba(color[0], 0.1),
shadowBlur: 10,
},
},
emphasis: {
itemStyle: {
borderWidth: 4,
},
},
data: yAxisData1,
},
{
name: "2019",
type: "line",
smooth: true,
showSymbol: false,
// symbolSize: 8,
zlevel: 3,
lineStyle: {
normal: {
color: color[1],
shadowBlur: 5,
shadowColor: hexToRgba(color[1], 0.5),
shadowOffsetY: 10,
},
},
areaStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{
offset: 0,
color: hexToRgba(color[1], 0.3),
},
{
offset: 1,
color: hexToRgba(color[1], 0.1),
},
],
false
),
shadowColor: hexToRgba(color[1], 0.1),
shadowBlur: 10,
},
},
emphasis: {
itemStyle: {
borderWidth: 4,
},
},
data: yAxisData2,
},
],
}; };
window[this.line] = echarts.init(document.getElementById(this.line));
window[this.line].setOption(option, true);
}, },
}, },
}; };
</script> </script>
<style scoped></style> <style scoped>
.dashboard {
width: 100%;
height: 100%;
}
</style>
src/components/image-bugs.vue 0 → 100644
View file @ 658fc9ab
This diff is collapsed.
src/components/image-detail.vue 0 → 100644
View file @ 658fc9ab
This diff is collapsed.
src/components/menu.vue
View file @ 658fc9ab
<template> <template>
<div class="menu"> <div class="menu">
<img src="../assets/imgs/home_img_logo.png" alt class="logo" /> <img src="../assets/imgs/home_img_logo.png" alt class="logo" />
<div style="float:right;cursor: pointer;position:relative;" class="user_hover"> <div
style="float:right;cursor: pointer;position:relative;"
class="user_hover"
>
<span <span
v-if="userInfo.user_name && userInfo.user_name !=''" v-if="userInfo.user_name && userInfo.user_name != ''"
class="user" class="user"
>{{ userInfo.user_name }}</span> >{{ userInfo.user_name }}</span
>
<span v-else @click="gotopage('login')" class="user">请登录</span> <span v-else @click="gotopage('login')" class="user">请登录</span>
<img <img
:class="userInfo.picture_path ? 'user_pic': 'user_default'" :class="userInfo.picture_path ? 'user_pic' : 'user_default'"
:src=" :src="
userInfo.picture_path || require('../assets/imgs/home_ic_user.png') userInfo.picture_path || require('../assets/imgs/home_ic_user.png')
" "
/> />
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="user_menu"> <div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="user_menu"
>
<div <div
v-for="(item, index) in user_arr" v-for="(item, index) in user_arr"
:key="index + 700" :key="index + 700"
@click="gotopage(item.path)" @click="gotopage(item.path)"
>{{ item.name }}</div> >
{{ item.name }}
</div> </div>
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="sj"></div> </div>
<div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="sj"
></div>
</div> </div>
<div <div
style="float:right;cursor: pointer;position:relative;" style="float:right;cursor: pointer;position:relative;"
...@@ -28,10 +40,18 @@ ...@@ -28,10 +40,18 @@
@click="gotopage('/shop/shopping_cart')" @click="gotopage('/shop/shopping_cart')"
> >
<div class="car"> <div class="car">
<el-badge v-if="menuCartNum != 0" :value="menuCartNum" :max="99" class="number"></el-badge> <el-badge
v-if="menuCartNum != 0"
:value="menuCartNum"
:max="99"
class="number"
></el-badge>
<img src="../assets/imgs/home_ic_shop.png" alt class="car_img" /> <img src="../assets/imgs/home_ic_shop.png" alt class="car_img" />
</div> </div>
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="shop_menu"> <div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="shop_menu"
>
<div class="shop_list_title">最近加入的服务：</div> <div class="shop_list_title">最近加入的服务：</div>
<div <div
v-for="(item, index) in shopping_list" v-for="(item, index) in shopping_list"
...@@ -63,14 +83,23 @@ ...@@ -63,14 +83,23 @@
</p> </p>
</div> </div>
<div> <div>
<img @click.stop="deleteItem(item.id)" src="../assets/imgs/ic_delete.png" alt /> <img
@click.stop="deleteItem(item.id)"
src="../assets/imgs/ic_delete.png"
alt
/>
</div> </div>
</div> </div>
<div class="shop_footer"> <div class="shop_footer">
<el-button @click="settlement" size="small" class="shop_settlement">去购物车申请结算</el-button> <el-button @click="settlement" size="small" class="shop_settlement"
>去购物车申请结算</el-button
>
</div> </div>
</div> </div>
<div v-if="userInfo.user_name && userInfo.user_name !=''" class="shop_sj"></div> <div
v-if="userInfo.user_name && userInfo.user_name != ''"
class="shop_sj"
></div>
</div> </div>
<div style="float:right"> <div style="float:right">
...@@ -82,14 +111,24 @@ ...@@ -82,14 +111,24 @@
:style="{ color: now_menu == item.visit_url ? '#fff' : '' }" :style="{ color: now_menu == item.visit_url ? '#fff' : '' }"
> >
{{ item.menu_name }} {{ item.menu_name }}
<div class="user_menu" v-if="item.Child && item.Child.length" style="left: 30px;"> <div
class="user_menu"
v-if="item.Child && item.Child.length"
style="left: 30px;"
>
<div <div
v-for="(v, indexs) in item.Child" v-for="(v, indexs) in item.Child"
:key="indexs + 700" :key="indexs + 700"
@click.stop="gotoChildPage(v, item.visit_url)" @click.stop="gotoChildPage(v, item.visit_url)"
>{{ v.menu_name }}</div> >
{{ v.menu_name }}
</div> </div>
<div class="sj" v-if="item.Child && item.Child.length" style="left: 60px;"></div> </div>
<div
class="sj"
v-if="item.Child && item.Child.length"
style="left: 60px;"
></div>
<div class="bottom_show" v-if="now_menu == item.visit_url"></div> <div class="bottom_show" v-if="now_menu == item.visit_url"></div>
</div> </div>
</div> </div>
...@@ -107,10 +146,10 @@ export default { ...@@ -107,10 +146,10 @@ export default {
{ name: "消息通知", path: "/user/message" }, { name: "消息通知", path: "/user/message" },
{ name: "收银中心", path: "" }, { name: "收银中心", path: "" },
{ name: "关于BD-aPaaS", path: "" }, { name: "关于BD-aPaaS", path: "" },
{ name: "退出登录", path: "logout" } { name: "退出登录", path: "logout" },
], ],
shopping_list: [], shopping_list: [],
menuCartNum: 0 menuCartNum: 0,
}; };
}, },
mounted() { mounted() {
...@@ -123,12 +162,12 @@ export default { ...@@ -123,12 +162,12 @@ export default {
}, },
userInfo() { userInfo() {
return this.$store.state.userInfo || {}; return this.$store.state.userInfo || {};
} },
}, },
watch: { watch: {
getMenuCartState(newVal) { getMenuCartState(newVal) {
this.getList(); this.getList();
} },
}, },
methods: { methods: {
gotopage(n) { gotopage(n) {
...@@ -146,7 +185,7 @@ export default { ...@@ -146,7 +185,7 @@ export default {
}, },
deleteItem(id) { deleteItem(id) {
let query = [id]; let query = [id];
this.$api.serviceShop.delShoppingCart(query).then(response => { this.$api.serviceShop.delShoppingCart(query).then((response) => {
this.getList(); this.getList();
}); });
}, },
...@@ -175,7 +214,7 @@ export default { ...@@ -175,7 +214,7 @@ export default {
} }
}, },
getList() { getList() {
this.$api.serviceShop.getShoppingCart().then(response => { this.$api.serviceShop.getShoppingCart().then((response) => {
if (response.data.success == "1") { if (response.data.success == "1") {
this.menuCartNum = response.data.data.valid this.menuCartNum = response.data.data.valid
? response.data.data.valid.length ? response.data.data.valid.length
...@@ -194,14 +233,15 @@ export default { ...@@ -194,14 +233,15 @@ export default {
this.now_menu = visit_url ? visit_url : "/services_shop"; this.now_menu = visit_url ? visit_url : "/services_shop";
}, },
getNowMenu() { getNowMenu() {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => { this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.menu_arr = response.data.data[0].Child; this.menu_arr =
(response.data.data[0] && response.data.data[0].Child) || [];
this.getMenuIndex(); this.getMenuIndex();
} }
}); });
} },
} },
}; };
</script> </script>
......
src/components/service-header.vue
View file @ 658fc9ab
...@@ -57,7 +57,9 @@ export default { ...@@ -57,7 +57,9 @@ export default {
methods: { methods: {
subevent(val){ subevent(val){
if(val == 0){ if(val == 0){
this.$emit('deploy',this.data) // this.$emit('deploy',this.data)
this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/deployment/${this.$route.params.id}`)
console.log(this.$route);
}else if(val == 1){ }else if(val == 1){
this.$emit('editapp') this.$emit('editapp')
}else if(val == 2){ }else if(val == 2){
......
src/components/service-tabs/service-tab-comments.vue
View file @ 658fc9ab
...@@ -50,11 +50,11 @@ export default { ...@@ -50,11 +50,11 @@ export default {
score: 0, score: 0,
starInfo: [ starInfo: [
{ {
star: 1, star: 5,
percent: 0, percent: 0,
}, },
{ {
star: 2, star: 4,
percent: 0, percent: 0,
}, },
{ {
...@@ -62,11 +62,11 @@ export default { ...@@ -62,11 +62,11 @@ export default {
percent: 0, percent: 0,
}, },
{ {
star: 4, star: 2,
percent: 0, percent: 0,
}, },
{ {
star: 5, star: 1,
percent: 0, percent: 0,
}, },
], ],
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
return { return {
score: data.avgScore || 0, score: data.avgScore || 0,
starInfo: [1, 2, 3, 4, 5].map((star) => { starInfo: [5,4,3,2,1].map((star) => {
let percent = let percent =
this.commentsTtotal > 0 this.commentsTtotal > 0
? (((data.scoreStatic && data.scoreStatic[star]) || 0) / ? (((data.scoreStatic && data.scoreStatic[star]) || 0) /
......
src/components/service-tabs/service-tabs.vue
View file @ 658fc9ab
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
></service-tab-detail> ></service-tab-detail>
</el-tab-pane> </el-tab-pane>
<!-- 规格定价 --> <!-- 规格说明 -->
<el-tab-pane <el-tab-pane
:label="specificationTitle" :label="specificationTitle"
name="specification" name="specification"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
></service-tab-specification> ></service-tab-specification>
</el-tab-pane> </el-tab-pane>
<!-- 提供机构 --> <!-- 提供组织 -->
<el-tab-pane :label="providerTitle" name="provider" v-if="providerData"> <el-tab-pane :label="providerTitle" name="provider" v-if="providerData">
<service-tab-provider <service-tab-provider
class="service_info" class="service_info"
...@@ -65,11 +65,11 @@ export default { ...@@ -65,11 +65,11 @@ export default {
}, },
specificationTitle: { specificationTitle: {
type: String, type: String,
default: () => "规格定价", default: () => "规格说明",
}, },
providerTitle: { providerTitle: {
type: String, type: String,
default: () => "提供机构", default: () => "提供组织",
}, },
commentsTitle: { commentsTitle: {
type: String, type: String,
......
src/pages/data-analysis/my-service.vue
View file @ 658fc9ab
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
<block-radius class="block"></block-radius> <block-radius class="block"></block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
<block-radius class="block"></block-radius> <block-radius class="block">
<line-chart :data="line_data"></line-chart>
</block-radius>
</el-col> </el-col>
<el-col :span="24" class="in_block"> <el-col :span="24" class="in_block">
<block-radius class="block"> <block-radius class="block">
...@@ -76,6 +78,7 @@ import BlockRadius from "@/components/general/block-radius"; ...@@ -76,6 +78,7 @@ import BlockRadius from "@/components/general/block-radius";
import Dashboard from "@/components/e-charts/dashboard"; import Dashboard from "@/components/e-charts/dashboard";
import multipleCircle from '@/components/e-charts/multiple_circle' import multipleCircle from '@/components/e-charts/multiple_circle'
import singleCircle from '@/components/e-charts/single_circle' import singleCircle from '@/components/e-charts/single_circle'
import lineChart from '@/components/e-charts/line_chart'
import Toplist from "@/components/e-charts/toplist"; import Toplist from "@/components/e-charts/toplist";
import Starlist from "@/components/e-charts/starlist"; import Starlist from "@/components/e-charts/starlist";
export default { export default {
...@@ -85,7 +88,8 @@ export default { ...@@ -85,7 +88,8 @@ export default {
multipleCircle, multipleCircle,
singleCircle, singleCircle,
Toplist, Toplist,
Starlist Starlist,
lineChart
}, },
data: () => ({ data: () => ({
navList: [], navList: [],
...@@ -99,6 +103,23 @@ export default { ...@@ -99,6 +103,23 @@ export default {
num:12, num:12,
color:'#515fe7', color:'#515fe7',
text:'共享' text:'共享'
},
line_data:{
xaxis:['01-01','01-02','01-03','01-04','01-05','01-06','01-07','01-08'],
data:[
{
name:'开发者应用',
arr:[100,120,130,150,160,120,110,100]
},
{
name:'平台应用',
arr:[120,130,140,130,140,120,100,90]
},
{
name:'未上架',
arr:[80,90,100,110,100,70,80,90]
},
],
} }
}), }),
mounted() {}, mounted() {},
......
src/pages/service_shop/yysdDetail.vue
View file @ 658fc9ab
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
<service-tabs <service-tabs
:detail-data="detailData" :detail-data="detailData"
detail-title="应用详情信息"
:provider-data="providerData" :provider-data="providerData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
comments-title="应用评价信息"
:is_app_detail="true" :is_app_detail="true"
></service-tabs> ></service-tabs>
</div> </div>
......
src/pages/workbench/app_build.vue
View file @ 658fc9ab
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
下一步 下一步
</el-button> </el-button>
</div> </div>
<image-detail ref="imageDetail" :image="selectedImage"></image-detail>
</app-build-step> </app-build-step>
<app-build-step <app-build-step
title="上传部署文件" title="上传部署文件"
...@@ -282,6 +283,7 @@ import appBuildStep from "@/components/app-build-steps/app-build-step"; ...@@ -282,6 +283,7 @@ import appBuildStep from "@/components/app-build-steps/app-build-step";
import apassTable from "@/components/apass-table"; import apassTable from "@/components/apass-table";
import uploadFile from "@/components/general/upload_file"; import uploadFile from "@/components/general/upload_file";
import apassDialog from "@/components/apass-dialog"; import apassDialog from "@/components/apass-dialog";
import imageDetail from "@/components/image-detail";
export default { export default {
components: { components: {
...@@ -290,6 +292,7 @@ export default { ...@@ -290,6 +292,7 @@ export default {
apassTable, apassTable,
uploadFile, uploadFile,
apassDialog, apassDialog,
imageDetail,
}, },
data: () => ({ data: () => ({
step: 0, step: 0,
...@@ -357,6 +360,7 @@ export default { ...@@ -357,6 +360,7 @@ export default {
msg: "", msg: "",
submit: null, submit: null,
}, },
selectedImage: null,
}), }),
methods: { methods: {
preStep() { preStep() {
...@@ -570,8 +574,9 @@ export default { ...@@ -570,8 +574,9 @@ export default {
return ""; return "";
} }
}, },
showDetail(item) { showImageDetail(item) {
console.log(item); this.selectedImage = item;
this.$refs.imageDetail.showDialog();
}, },
}, },
mounted() { mounted() {
...@@ -581,7 +586,7 @@ export default { ...@@ -581,7 +586,7 @@ export default {
prop: "name", prop: "name",
align: "left", align: "left",
type: "button", type: "button",
callback: this.showDetail, callback: this.showImageDetail,
}, },
{ {
label: "版本号", label: "版本号",
......
src/pages/workbench/fwgl/fwglList.vue
View file @ 658fc9ab
This diff is collapsed.
src/pages/workbench/yygl/deploy_app_detail.vue
View file @ 658fc9ab
...@@ -125,10 +125,50 @@ ...@@ -125,10 +125,50 @@
</nor-card> </nor-card>
</div> </div>
<p class="service_title" style="margin-top:20px;"> <p class="service_title" style="margin-top:20px;">
<span></span>应用设置 <span></span>微服务
</p> </p>
<div style="overflow:hidden;height:700px;">
<el-scrollbar class="service_list">
<div class="service_box" v-for="(item,index) in service_list_arr" :key="index+60000">{{item.service}} <span v-if="item.is_unhealth" class="service_tips">故障</span> </div>
</el-scrollbar>
<div class="service_detail">
<nor-card title="服务概况" flag="true">
<template>
<div style="overflow:hidden;height:160px;padding-top:10px;">
<div style="height:115px;padding-top:10px;" class="service_card_box">
<p
style="color: #707693;font-size: 16px;text-align:center;"
>服务状态</p>
<waveIcon :state="yx_state.state" style="margin:10px auto;"></waveIcon>
<p
style="color: #58617a;font-size: 16px;text-align:center;"
>{{ yx_state.state }}</p>
</div>
<div style="height:115px;" class="service_num service_card_box">
<span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">服务平均响应时间</span>
<p>{{ yx_state.averageTime }}</p>
<p>最大响应时间：{{ yx_state.maxTime }}</p>
</div>
<div style="height:115px;" class="service_num service_card_box">
<span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">吞吐率</span>
<p>{{ yx_state.averageTraffic }}</p>
<p>最大吞吐率：{{ yx_state.maxTraffic }}</p>
</div>
<div style="height:115px;padding-top:30px;" class="service_num service_card_box">
<span style="color: #707693;font-size: 16px;text-align:center;margin-bottom:26px;display:inline-block;">内存使用</span>
<p>{{ yx_state.memory }}</p>
</div>
</div>
</template>
</nor-card>
<nor-card title="服务设置" flag="true">
<div class="addimage">多版本回滚</div> <div class="addimage">多版本回滚</div>
<p class="imagebox"> <!-- <p class="imagebox">
<span <span
@click="image_select = index" @click="image_select = index"
:style=" :style="
...@@ -139,7 +179,7 @@ ...@@ -139,7 +179,7 @@
v-for="(item, index) in image_arr" v-for="(item, index) in image_arr"
:key="index + 6000" :key="index + 6000"
>{{ item.name }}</span> >{{ item.name }}</span>
</p> </p> -->
<table-um <table-um
v-for="(item, index) in image_arr" v-for="(item, index) in image_arr"
:key="index+7000" :key="index+7000"
...@@ -153,6 +193,9 @@ ...@@ -153,6 +193,9 @@
@grouppublic="grouppublic" @grouppublic="grouppublic"
@online="online" @online="online"
></table-um> ></table-um>
</nor-card>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -191,6 +234,84 @@ export default { ...@@ -191,6 +234,84 @@ export default {
oldpag_name: "镜像文件002.rar", oldpag_name: "镜像文件002.rar",
imgList: [], imgList: [],
imgList1: [], imgList1: [],
service_list_arr:[
{
service:'cemplat-api1',
is_unhealth:1
},
{
service:'cemplat-api1',
is_unhealth:1
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
{
service:'cemplat-api1',
is_unhealth:0
},
],
yx_state: { yx_state: {
state: "", state: "",
averageTime: "", averageTime: "",
...@@ -477,6 +598,7 @@ export default { ...@@ -477,6 +598,7 @@ export default {
this.getServiceBaseInfo(); this.getServiceBaseInfo();
this.getServiceyxztInfo(); this.getServiceyxztInfo();
this.getImageInfo(); this.getImageInfo();
this.get_service_list();
if (this.$route.query.showstate) { if (this.$route.query.showstate) {
this.now_service = 1; this.now_service = 1;
} }
...@@ -662,12 +784,24 @@ export default { ...@@ -662,12 +784,24 @@ export default {
let data = response.data.data; let data = response.data.data;
this.markdown = data; this.markdown = data;
}); });
},
get_service_list(){
this.$http
.get(`/apaas/hubApi/market/services/${this.$route.params.deploy_id}`)
.then(response => {
if(response.data.success){
this.service_list_arr = response.data.data
}
})
} }
} }
}; };
</script> </script>
<style> <style>
.el-scrollbar__wrap {
overflow-x: hidden;
}
.savebtn .el-button { .savebtn .el-button {
float: right; float: right;
margin-left: 20px; margin-left: 20px;
...@@ -685,6 +819,7 @@ export default { ...@@ -685,6 +819,7 @@ export default {
background-color: #f7f8f9; background-color: #f7f8f9;
width: 1022px; width: 1022px;
} }
</style> </style>
<style scoped> <style scoped>
.detail_contain { .detail_contain {
...@@ -772,6 +907,7 @@ export default { ...@@ -772,6 +907,7 @@ export default {
border-radius: 8px; border-radius: 8px;
margin-top: 20px; margin-top: 20px;
margin-bottom: 30px; margin-bottom: 30px;
margin-left: 40px;
cursor: pointer; cursor: pointer;
} }
.use_know p { .use_know p {
...@@ -881,4 +1017,50 @@ export default { ...@@ -881,4 +1017,50 @@ export default {
overflow: hidden; overflow: hidden;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.service_list{
float: left;
width: 400px;
height: 100%;
overflow-x: hidden;
border: 1px solid #e5f0ff;
border-radius: 12px 0px 0px 12px;
}
.service_box{
width: 400px;
height: 48px;
line-height: 48px;
text-align: left;
padding-left: 38px;
border-bottom: 1px solid #e5f0ff;
position: relative;
cursor: pointer;
}
.service_tips{
display: inline-block;
position: absolute;
font-size: 12px;
color: #e15260;
width: 42px;
height: 20px;
line-height: 20px;
text-align: center;
background-color: #ffefef;
border-radius: 4px;
border: solid 1px #d7a4a9;
top:13px;
right:50px;
}
.service_detail{
float: left;
height: 270px;
width: calc(100% - 425px);
}
.service_card_box{
float: left;
border-right: 1px solid #e5f0ff;
width: calc(25%);
}
.card_contain .service_card_box:nth-last-of-type(1){
border-right:0;
}
</style> </style>
src/store/index.js
View file @ 658fc9ab
...@@ -8,9 +8,9 @@ const store = new Vuex.Store({ ...@@ -8,9 +8,9 @@ const store = new Vuex.Store({
userInfo: null, // 用户信息 userInfo: null, // 用户信息
serviceShopMenu: "/shop/data_service_list", // 服务超市侧边栏 serviceShopMenu: "/shop/data_service_list", // 服务超市侧边栏
fwglNav: [ fwglNav: [
["注册发布的服务", "申请的服务" /* , "云资源服务" */], // 普通用户 ["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户
["组织服务管理", "服务审批管理" /* , "云资源管理" */], // 组织管理员 ["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员
["平台服务管理", "服务审批管理" /* , "云资源管理" */], // 超级管理员 ["平台服务管理", "服务审批管理", "云资源管理"], // 超级管理员
], // 服务管理列表，onlyRead ], // 服务管理列表，onlyRead
yyglNav: [ yyglNav: [
["应用仓库", "我部署的应用", "申请的应用"], // 普通用户 ["应用仓库", "我部署的应用", "申请的应用"], // 普通用户
......
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