Authored by wangtao

优化跳转拓扑

... ... @@ -110,14 +110,14 @@ public class GaeaDictController extends GaeaBaseController<GaeaDictParam, GaeaDi
*/
@GetMapping("/all")
public ResponseBean all(){
Locale locale = LocaleContextHolder.getLocale();
//语言
String language = locale.getLanguage();
Map<String, List<KeyValue>> all = gaeaDictService.all(language);
// Locale locale = LocaleContextHolder.getLocale();
// //语言
// String language = locale.getLanguage();
//
// Map<String, List<KeyValue>> all = gaeaDictService.all(language);
Map<String,Object> data = new HashMap<>();
data.put("gaeaDict",all);
data.put("gaeaDict",new HashMap<>());
data.put("config",systemConfig);
ResponseBean responseBean = responseSuccessWithData(data);
return responseBean;
... ...
... ... @@ -66,6 +66,7 @@ export default {
},
headers() {
return {
AuthorizationMj: localStorage.getItem('AuthVal'),
Authorization: getToken() // 直接从本地获取token就行
};
}
... ...
... ... @@ -61,6 +61,7 @@ service.interceptors.request.use(
let userName = getVal('nickName');
switch (config.method) {
case 'POST':
case 'post':
config.headers.AuthorizationMj = "BearerMj " + mjToken + ""
config.headers.MjUserId = userId;
... ...
... ... @@ -493,15 +493,23 @@
resTopo(item) {
// this.topoSrc = this.topoAddress.topoUrl;
// this.topoVisible = true;
let param = {
type:'topology',
data:{
// let param = {
// type:'topology',
// data:{
// resId: item.resId,
// resType: item.resType
// }
//
// }
// window.parent.postMessage(param, '*')
window.top.postMessage({
type: 'openResTopo',
message: {'params': {
resId: item.resId,
resType: item.resType
}
}
window.parent.postMessage(param, '*')
}}
}, '*')
},
//弹框关闭确定
hideDialog() {
... ...
... ... @@ -385,11 +385,16 @@ export default {
if(func){
let params = func(item);
if(params){
let param = {
type: 'topology',
data: params
}
window.parent.postMessage(param, '*')
// let param = {
// type: 'topology',
// data: params
// }
// window.parent.postMessage(param, '*')
window.top.postMessage({
type: 'openResTopo',
message: {'params': params}
}, '*')
}
}
}catch (e){
... ...
... ... @@ -11,7 +11,7 @@
<div class="system-item" :style="itemStyle" v-for="(item,index) in systemData" :key="index">
<div class="system-img">
<!-- <img :src="'/src/assets/images/monitor/capacityAnalysis/'+item.resType+'.png'" alt="">-->
<img :src="'/static/capacityAnalysis/'+(item.resType?item.resType:'VIRTUALIZATION_VMWARE')+'.png'" alt="">
<img :src="'/aj-web/static/capacityAnalysis/'+(item.resType?item.resType:'VIRTUALIZATION_VMWARE')+'.png'" alt="">
</div>
<div class="system-info" :style="titleProposalStyle">
... ...