Skip to content

A
apaas-ui
Commit b5b3765d authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

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

parents 11f99742 9e2e10d4
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 82 deletions
src/components/menu.vue
View file @ b5b3765d
<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();
}
});
......
src/components/service_shop_menu.vue
View file @ b5b3765d
......@@ -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;
}
});
......
src/components/shop-car-apply/apply_form.vue
View file @ b5b3765d
......@@ -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>
......
src/components/shop-car-apply/apply_service_state.vue
View file @ b5b3765d
......@@ -93,25 +93,25 @@ export default {
headers: [
{
label: "字段编码",
prop: "code",
prop: "name",
align: "left",
minWidth: "20%"
},
{
label: "字段名称",
prop: "name",
prop: "label",
align: "left",
minWidth: "20%"
},
{
label: "字段类型",
prop: "type",
prop: "show_type",
align: "center",
width: "150"
},
{
label: "字段描述",
prop: "desc",
prop: "descript",
align: "left",
minWidth: "50%"
}
......
src/pages/data-analysis/my-application.vue
View file @ b5b3765d
......@@ -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: [
{
......
src/pages/data-analysis/my-service.vue
View file @ b5b3765d
......@@ -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: {}
}),
......
src/pages/workbench/fwgl/serviceDetail.vue
View file @ b5b3765d
......@@ -219,14 +219,14 @@ export default {
header_arr: [
{
prop: "name",
label: "字段名称",
label: "字段编码",
minWidth: "20%",
align: "left"
},
{
prop: "field_type",
label: "字段编码",
width: "100px",
prop: "label",
label: "字段名称",
minWidth: "20%",
align: "center"
},
{
......
src/pages/workbench/workPlace.vue
View file @ b5b3765d
......@@ -156,8 +156,8 @@
<p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
<span style="cursor:pointer;">
<span style="display: inline-block;vertical-align:middle;">数据资产看板</span>
<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>
......@@ -199,8 +199,8 @@
<p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
<span style="cursor:pointer;">
<span style="display: inline-block;vertical-align:middle;">数据资产看板</span>
<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>
......
src/pages/workbench/yygl/deploy_app_detail.vue
View file @ b5b3765d
......@@ -98,10 +98,10 @@
<nor-card title="应用状态" class="service_card">
<template>
<div style="height:115px;padding-top:10px;">
<waveIcon :state="yx_state.state" style="margin:10px auto;"></waveIcon>
<waveIcon :state="yx_state.state=='running'?'运行中':'停止'" style="margin:10px auto;"></waveIcon>
<p
style="color: #58617a;font-size: 16px;text-align:center;"
>{{ yx_state.state }}</p>
>{{ yx_state.state=='running'?'运行中':'停止' }}</p>
</div>
</template>
</nor-card>
......@@ -144,10 +144,10 @@
<p
style="color: #707693;font-size: 16px;text-align:center;"
>服务状态</p>
<waveIcon :state="micor_state.state" style="margin:10px auto;"></waveIcon>
<waveIcon :state="micor_state.state=='running'?'运行中':'停止'" style="margin:10px auto;"></waveIcon>
<p
style="color: #58617a;font-size: 16px;text-align:center;"
>{{ micor_state.state }}</p>
>{{ micor_state.state=='running'?'运行中':'停止' }}</p>
</div>
<div style="height:115px;" class="service_num service_card_box">
......@@ -236,9 +236,9 @@
<el-select v-model="publicForm.area" placeholder="请选择服务领域">
<el-option
v-for="item in area_arr"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
......@@ -334,52 +334,7 @@ export default {
public_flag:false,
now_micor_service:0,
image_arr: [],
area_arr: [
{
label: "经济建设",
value: 0
},
{
label: "城市管理",
value: 1
},
{
label: "城市建设",
value: 2
},
{
label: "道路交通",
value: 3
},
{
label: "环境资源",
value: 4
},
{
label: "民生服务",
value: 5
},
{
label: "空间地理",
value: 6
},
{
label: "文化休闲",
value: 7
},
{
label: "社会团体",
value: 8
},
{
label: "教育机构",
value: 9
},
{
label: "其他",
value: 10
}
],
area_arr: [],
now_image_version:[],
form: {
name: "",
......@@ -576,6 +531,7 @@ export default {
this.getServiceBaseInfo();
this.get_service_list();
this.get_app_generl();
this.get_service_arae();
if (this.$route.query.showstate) {
this.now_service = 1;
}
......@@ -584,6 +540,17 @@ export default {
},
methods: {
get_service_arae(){
this.$http
.get('/apaas/service/v3/service/manager/servarea')
.then(response => {
let data = response.data.data
this.area_arr = data
})
.catch(function(response) {
});
},
public_service(){
this.$refs.actiondialog.show();
},
......@@ -1217,6 +1184,7 @@ background:khaki;
.imagebox {
overflow: hidden;
margin-bottom: 20px;
padding-left: 40px;
}
.imagebox span {
width: 165px;
......
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