Commit 9e2e10d4 authored by 张俊's avatar 张俊

合并

parents e336c754 00ddee60
<template>
<div class="menu">
<img @click="gotopage('/services_shop')" src="../assets/imgs/home_img_logo.png" alt class="logo" />
<img
@click="gotopage('/services_shop')"
src="../assets/imgs/home_img_logo.png"
alt
class="logo"
/>
<div style="float:right;cursor: pointer;position:relative;" class="user_hover">
<span
v-if="userInfo.user_name && userInfo.user_name != ''"
......@@ -17,12 +22,14 @@
<div
v-for="(item, index) in user_arr"
:key="index + 700"
@click="gotopage(item.path)"
>{{ item.name }}</div>
@click="gotopage(item.visit_url)"
>{{ item.menu_name }}</div>
<div @click="gotopage('logout')">退出登录</div>
</div>
<div v-if="userInfo.user_name && userInfo.user_name != ''" class="sj"></div>
</div>
<div
v-if="show_shop_menu"
style="float:right;cursor: pointer;position:relative;"
class="shop_hover"
@click="gotopage('/shop/shopping_cart')"
......@@ -38,7 +45,10 @@
:key="'shopping' + index"
class="shop_list_cell shop_line"
>
<img :src="item.service_id == 0 ? item.application.logo : item.service.cover" class="shop_img" />
<img
:src="item.service_id == 0 ? item.application.logo : item.service.cover"
class="shop_img"
/>
<div class="shop_cell_msgs">
<p
@click="getDetail(item.id)"
......@@ -92,14 +102,15 @@ export default {
menu_arr: [],
now_menu: "",
user_arr: [
{ name: "个人档案", path: "/user/user_info" },
{ name: "消息通知", path: "/user/message" },
{ name: "订单管理", path: "/user/order_list" },
{ name: "关于BD-aPaaS", path: "" },
{ name: "退出登录", path: "logout" }
// { name: "个人档案", path: "/user/user_info" },
// { name: "消息通知", path: "/user/message" },
// { name: "订单管理", path: "/user/order_list" },
// { name: "关于BD-aPaaS", path: "" },
// { name: "退出登录", path: "logout" }
],
shopping_list: [],
menuCartNum: 0
menuCartNum: 0,
show_shop_menu: false
};
},
mounted() {
......@@ -182,14 +193,30 @@ export default {
},
getMenuIndex() {
let visit_url = window.sessionStorage.getItem("menuVisitUrl");
console.log(visit_url);
this.now_menu = visit_url ? visit_url : "/services_shop";
this.now_menu = visit_url ? visit_url : "";
},
getNowMenu() {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
if (response.data.success == 1) {
this.menu_arr =
let arr =
(response.data.data[0] && response.data.data[0].Child) || [];
let shop_index = arr.findIndex(
item => item.visit_url == "/shop/shopping_cart"
);
if (shop_index != -1) {
arr.splice(shop_index, 1);
this.show_shop_menu = true;
} else {
this.show_shop_menu = false;
}
let user_index = arr.findIndex(item => item.visit_url == "/user");
if (user_index != -1) {
this.user_arr = arr[user_index].Child;
arr.splice(user_index, 1);
} else {
}
this.menu_arr = arr;
console.log(this.user_arr);
this.getMenuIndex();
}
});
......
<template>
<div class="application_info" v-if="data">
<div class="application_info apass_button" v-if="data">
<div class="main_container">
<div class="main_container-left" v-if="data.logo">
<el-avatar shape="square" :size="144" fit="cover" :src="data.logo" />
......
<template>
<div class="service_info" v-if="data">
<div class="service_info apass_button" v-if="data">
<div class="service_title">
<span class="service_name" v-text="data.name"></span>
<span class="service_type" v-if="data.type" v-text="data.type"></span>
......
......@@ -54,7 +54,7 @@ export default {
let arr = response.data.data[0].Child;
let shopArr = [];
arr.forEach(item => {
if (item.visit_url == "/services_shop") {
if (item.visit_url == "/shop") {
shopArr = item.Child;
}
});
......
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item prop="preson">
<p class="formname">部门联系人:</p>
<el-input v-model="formInline.preson" placeholder="申请人"></el-input>
<el-input v-model="formInline.preson" placeholder="联系人"></el-input>
</el-form-item>
<el-form-item prop="phone">
<p class="formname">联系电话:</p>
......
......@@ -290,7 +290,7 @@ export default {
[1010, 120, 130, 520, 160, 1120, 110, 100],
[100, 1210, 130, 1530, 160, 120, 110, 1200]
],
legend: ["aaa1", "bbb1"]
legend: ["被调用次数", "调用次数"]
},
toplistData: [
{
......
......@@ -433,7 +433,7 @@ export default {
[1010, 120, 130, 520, 160, 1120, 110, 100],
[100, 1210, 130, 1530, 160, 120, 110, 1200]
],
legend: ["aaa1", "bbb1"]
legend: ["被调用次数", "调用次数"]
},
topology_datas: {}
}),
......
......@@ -156,8 +156,10 @@
<p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
数据分析中心
<img style="vertical-align:-9px;cursor:pointer;" @click="$router.push('/data_analysis')" src="@/assets/imgs/home_btn_enter.png" alt />
<span style="cursor:pointer;" @click="$router.push('/data_analysis')">
<span style="display: inline-block;vertical-align:middle;">数据分析中心</span>
<img style="vertical-align:middle;" src="@/assets/imgs/home_btn_enter.png" />
</span>
</p>
<div class="data_charts" style="width:100%;">
<div class="data_charts_left">
......@@ -197,8 +199,10 @@
<p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
数据分析中心
<img style="vertical-align:-9px;cursor:pointer;" @click="$router.push('/data_analysis')" src="@/assets/imgs/home_btn_enter.png" alt />
<span style="cursor:pointer;" @click="$router.push('/data_analysis')">
<span style="display: inline-block;vertical-align:middle;">数据分析中心</span>
<img style="vertical-align:middle;" src="@/assets/imgs/home_btn_enter.png" />
</span>
</p>
<div class="data_charts" style="width:100%;">
<div class="data_charts_left" style="width:590px;">
......@@ -229,13 +233,10 @@
<p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
{{ now_user == 0||now_user == 4 ? "我的服务" : "服务管理" }}
<img
style="vertical-align:-9px;cursor: pointer;"
src="@/assets/imgs/home_btn_enter.png"
@click="gotofw()"
alt
/>
<span style="cursor:pointer;" @click="gotofw">
<span style="display: inline-block;vertical-align:middle;"> {{ now_user == 0||now_user == 4 ? "我的服务" : "服务管理" }}</span>
<img style="vertical-align:middle;" src="@/assets/imgs/home_btn_enter.png" />
</span>
</p>
<div class="myservice">
<div class="myservice_title">
......@@ -278,13 +279,10 @@
<p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
{{ now_user == 0||now_user == 4 ? "我的应用" : "平台应用" }}
<img
@click="gotoyy"
style="vertical-align:-9px;cursor: pointer;"
src="@/assets/imgs/home_btn_enter.png"
alt
/>
<span style="cursor:pointer;" @click="gotoyy">
<span style="display: inline-block;vertical-align:middle;">{{ now_user == 0||now_user == 4 ? "我的应用" : "平台应用" }}</span>
<img style="vertical-align:middle;" src="@/assets/imgs/home_btn_enter.png" />
</span>
</p>
<div class="myapp">
<div class="myservice_title">
......@@ -330,6 +328,7 @@
</div>
</div>
</div>
<allot-info-confirm
ref="allotConfirm"
@allot-success="allotSuccess"
......
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