Skip to content

A
apaas-ui
Commit a23cd756 authored by liminge's avatar liminge
Browse files
Options

定版优化

parent 801972f4
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 43 deletions
src/components/menu.vue
View file @ a23cd756
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
@mouseleave.stop="change_now_hover(-1)" @mouseleave.stop="change_now_hover(-1)"
@mouseenter.stop="change_now_hover(indexs)" @mouseenter.stop="change_now_hover(indexs)"
@click.stop="gotoChildPage(v, item.visit_url)" @click.stop="gotoChildPage(v, item.visit_url)"
v-if="v.menu_name != '在线组件工具'"
> >
{{ v.menu_name }} {{ v.menu_name }}
</div> </div>
...@@ -284,6 +285,8 @@ export default { ...@@ -284,6 +285,8 @@ export default {
} else if (parent == "/services_shop") { } else if (parent == "/services_shop") {
this.$store.commit("serviceShopMenuAct", v.visit_url); this.$store.commit("serviceShopMenuAct", v.visit_url);
this.$router.push(v.visit_url); this.$router.push(v.visit_url);
} else if (v.visit_url.indexOf("orgId") > 0) {
this.$router.push(v.visit_url + this.userInfo.department_id);
} else if (v.visit_url.indexOf("#") > 0) { } else if (v.visit_url.indexOf("#") > 0) {
window.open(v.visit_url); window.open(v.visit_url);
} else { } else {
...@@ -398,7 +401,7 @@ export default { ...@@ -398,7 +401,7 @@ export default {
} }
.menu_box { .menu_box {
float: right; float: right;
width: 185px; width: 190px;
font-size: 16px; font-size: 16px;
height: 58px; height: 58px;
text-align: center; text-align: center;
......
src/pages/workbench/workPlace.vue
View file @ a23cd756
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<img style="width:40px;" :src="picture_path?picture_path:require('../../assets/imgs/img_head.png')" alt /> <img style="width:40px;" :src="picture_path?picture_path:require('../../assets/imgs/img_head.png')" alt />
<span>你好，{{ person }}！{{login_time?'最近登录 ':''}}{{ login_time }}</span> <span>你好，{{ person }}！{{login_time?'最近登录 ':''}}{{ login_time }}</span>
</div> </div>
<div class="person_menu"> <!-- <div class="person_menu">
管理功能&nbsp;&nbsp;&nbsp; 管理功能&nbsp;&nbsp;&nbsp;
<div class="person_manage_pic"></div> <div class="person_manage_pic"></div>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
{{ item.text }} {{ item.text }}
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="menu"> <div class="menu">
<div <div
...@@ -969,45 +969,45 @@ export default { ...@@ -969,45 +969,45 @@ export default {
] ]
], ],
online_tool_arr: [ online_tool_arr: [
{ // {
text: "智能制图", // text: "智能制图",
pic: require("@/assets/imgs/home_tool_ic_znht.png"), // pic: require("@/assets/imgs/home_tool_ic_znht.png"),
bg: "#e5f4fe", // bg: "#e5f4fe",
color: "#38aef9", // color: "#38aef9",
url: "/vmap/#/map", // url: "/vmap/#/map",
target: 1 // target: 1
}, // },
{ // {
text: "流程设计", // text: "流程设计",
pic: require("@/assets/imgs/home_tool_ic_lcsj.png"), // pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
bg: "#e6ebfe", // bg: "#e6ebfe",
color: "#515fe7", // color: "#515fe7",
url: "/apaas/ui/#/progress", // url: "/apaas/ui/#/progress",
// url: "/lcyq/ui/#/process/model", // // url: "/lcyq/ui/#/process/model",
target: 1 // target: 1
}, // },
{ // {
text: "可视化图表", // text: "可视化图表",
pic: require("@/assets/imgs/home_tool_ic_kshbb.png"), // pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
bg: "#fff2e2", // bg: "#fff2e2",
color: "#ea7d19", // color: "#ea7d19",
url: "/iam/api/bi/token", // url: "/iam/api/bi/token",
target: 1 // target: 1
}, // },
{ // {
text: "应用创新", // text: "应用创新",
pic: require("@/assets/imgs/home_tool_ic_yycx.png"), // pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
bg: "#e7fdfc", // bg: "#e7fdfc",
color: "#25bdb1", // color: "#25bdb1",
url: "/app_build", // url: "/app_build",
}, // },
{ // {
text: "搜索引擎", // text: "搜索引擎",
pic: require("@/assets/imgs/home_tool_ic_ssyq.png"), // pic: require("@/assets/imgs/home_tool_ic_ssyq.png"),
bg: "#f1f1f3", // bg: "#f1f1f3",
color: "#58617a", // color: "#58617a",
url:'/search_engine', // url:'/search_engine',
}, // },
], ],
service_arr: [ service_arr: [
["服务列表", "申请服务", "云资源"], ["服务列表", "申请服务", "云资源"],
...@@ -1066,12 +1066,12 @@ export default { ...@@ -1066,12 +1066,12 @@ export default {
}) })
}, },
mounted() { mounted() {
console.log(this.level);
if (this.userInfo) { if (this.userInfo) {
this.now_user = this.level; this.now_user = this.level;
this.manage_arr[0].url = this.manage_arr[0].url =
"/authority/organization/detail/" + this.userInfo.department_id; "/authority/organization/detail/" + this.userInfo.department_id;
this.init_func(); this.init_func();
this.getNowMenu()
} else { } else {
this.getCurrentUser(); this.getCurrentUser();
} }
...@@ -1080,6 +1080,74 @@ export default { ...@@ -1080,6 +1080,74 @@ export default {
} }
}, },
methods: { methods: {
getNowMenu() {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
if (response.data.success == 1) {
let arr =
(response.data.data[0] && response.data.data[0].Child) || [];
if(arr && arr.length > 0){
let workplace_index = arr.findIndex(
item => item.visit_url == "/workplace"
);
let zxzjgz_index = arr[workplace_index].Child.findIndex(
item => item.visit_url == "/zxzjgz"
);
var menuList = arr[workplace_index].Child[zxzjgz_index].Child
var new_online_tool_arr = [];
if(menuList && menuList.length > 0){
for(var i=0;i<menuList.length;i++){
console.log(menuList[i])
if(menuList[i].menu_name == '智能制图'){
new_online_tool_arr.push({
text:menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_znht.png"),
bg: "#e5f4fe",
color: "#38aef9",
url: menuList[i].visit_url,
target: 1
})
}else if(menuList[i].menu_name == '流程设计'){
new_online_tool_arr.push({
text: menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
bg: "#e6ebfe",
color: "#515fe7",
url: menuList[i].visit_url,
target: 1
})
}else if(menuList[i].menu_name == '可视化图表'){
new_online_tool_arr.push({
text:menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
bg: "#fff2e2",
color: "#ea7d19",
url: menuList[i].visit_url,
target: 1
})
}else if(menuList[i].menu_name == '应用创新'){
new_online_tool_arr.push({
text:menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
bg: "#e7fdfc",
color: "#25bdb1",
url:menuList[i].visit_url,
})
}else if(menuList[i].menu_name == '搜索引擎'){
new_online_tool_arr.push({
text: menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_ssyq.png"),
bg: "#f1f1f3",
color: "#58617a",
url:menuList[i].visit_url,
})
}
}
}
this.online_tool_arr = new_online_tool_arr;
}
}
});
},
//鼠标所在在线工具位置 //鼠标所在在线工具位置
change_now_online(n,m){ change_now_online(n,m){
if((n||n==0)&&(m||m==0)){ if((n||n==0)&&(m||m==0)){
......
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