Showing
6 changed files
with
34 additions
and
19 deletions
@@ -110,14 +110,14 @@ public class GaeaDictController extends GaeaBaseController<GaeaDictParam, GaeaDi | @@ -110,14 +110,14 @@ public class GaeaDictController extends GaeaBaseController<GaeaDictParam, GaeaDi | ||
110 | */ | 110 | */ |
111 | @GetMapping("/all") | 111 | @GetMapping("/all") |
112 | public ResponseBean all(){ | 112 | public ResponseBean all(){ |
113 | - Locale locale = LocaleContextHolder.getLocale(); | ||
114 | - //语言 | ||
115 | - String language = locale.getLanguage(); | ||
116 | - | ||
117 | - Map<String, List<KeyValue>> all = gaeaDictService.all(language); | 113 | +// Locale locale = LocaleContextHolder.getLocale(); |
114 | +// //语言 | ||
115 | +// String language = locale.getLanguage(); | ||
116 | +// | ||
117 | +// Map<String, List<KeyValue>> all = gaeaDictService.all(language); | ||
118 | 118 | ||
119 | Map<String,Object> data = new HashMap<>(); | 119 | Map<String,Object> data = new HashMap<>(); |
120 | - data.put("gaeaDict",all); | 120 | + data.put("gaeaDict",new HashMap<>()); |
121 | data.put("config",systemConfig); | 121 | data.put("config",systemConfig); |
122 | ResponseBean responseBean = responseSuccessWithData(data); | 122 | ResponseBean responseBean = responseSuccessWithData(data); |
123 | return responseBean; | 123 | return responseBean; |
@@ -66,6 +66,7 @@ export default { | @@ -66,6 +66,7 @@ export default { | ||
66 | }, | 66 | }, |
67 | headers() { | 67 | headers() { |
68 | return { | 68 | return { |
69 | + AuthorizationMj: localStorage.getItem('AuthVal'), | ||
69 | Authorization: getToken() // 直接从本地获取token就行 | 70 | Authorization: getToken() // 直接从本地获取token就行 |
70 | }; | 71 | }; |
71 | } | 72 | } |
@@ -61,6 +61,7 @@ service.interceptors.request.use( | @@ -61,6 +61,7 @@ service.interceptors.request.use( | ||
61 | let userName = getVal('nickName'); | 61 | let userName = getVal('nickName'); |
62 | 62 | ||
63 | switch (config.method) { | 63 | switch (config.method) { |
64 | + case 'POST': | ||
64 | case 'post': | 65 | case 'post': |
65 | config.headers.AuthorizationMj = "BearerMj " + mjToken + "" | 66 | config.headers.AuthorizationMj = "BearerMj " + mjToken + "" |
66 | config.headers.MjUserId = userId; | 67 | config.headers.MjUserId = userId; |
@@ -493,15 +493,23 @@ | @@ -493,15 +493,23 @@ | ||
493 | resTopo(item) { | 493 | resTopo(item) { |
494 | // this.topoSrc = this.topoAddress.topoUrl; | 494 | // this.topoSrc = this.topoAddress.topoUrl; |
495 | // this.topoVisible = true; | 495 | // this.topoVisible = true; |
496 | - let param = { | ||
497 | - type:'topology', | ||
498 | - data:{ | 496 | + // let param = { |
497 | + // type:'topology', | ||
498 | + // data:{ | ||
499 | + // resId: item.resId, | ||
500 | + // resType: item.resType | ||
501 | + // } | ||
502 | + // | ||
503 | + // } | ||
504 | + // window.parent.postMessage(param, '*') | ||
505 | + | ||
506 | + window.top.postMessage({ | ||
507 | + type: 'openResTopo', | ||
508 | + message: {'params': { | ||
499 | resId: item.resId, | 509 | resId: item.resId, |
500 | resType: item.resType | 510 | resType: item.resType |
501 | - } | ||
502 | - | ||
503 | - } | ||
504 | - window.parent.postMessage(param, '*') | 511 | + }} |
512 | + }, '*') | ||
505 | }, | 513 | }, |
506 | //弹框关闭确定 | 514 | //弹框关闭确定 |
507 | hideDialog() { | 515 | hideDialog() { |
@@ -385,11 +385,16 @@ export default { | @@ -385,11 +385,16 @@ export default { | ||
385 | if(func){ | 385 | if(func){ |
386 | let params = func(item); | 386 | let params = func(item); |
387 | if(params){ | 387 | if(params){ |
388 | - let param = { | ||
389 | - type: 'topology', | ||
390 | - data: params | ||
391 | - } | ||
392 | - window.parent.postMessage(param, '*') | 388 | + // let param = { |
389 | + // type: 'topology', | ||
390 | + // data: params | ||
391 | + // } | ||
392 | + // window.parent.postMessage(param, '*') | ||
393 | + | ||
394 | + window.top.postMessage({ | ||
395 | + type: 'openResTopo', | ||
396 | + message: {'params': params} | ||
397 | + }, '*') | ||
393 | } | 398 | } |
394 | } | 399 | } |
395 | }catch (e){ | 400 | }catch (e){ |
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <div class="system-item" :style="itemStyle" v-for="(item,index) in systemData" :key="index"> | 11 | <div class="system-item" :style="itemStyle" v-for="(item,index) in systemData" :key="index"> |
12 | <div class="system-img"> | 12 | <div class="system-img"> |
13 | <!-- <img :src="'/src/assets/images/monitor/capacityAnalysis/'+item.resType+'.png'" alt="">--> | 13 | <!-- <img :src="'/src/assets/images/monitor/capacityAnalysis/'+item.resType+'.png'" alt="">--> |
14 | - <img :src="'/static/capacityAnalysis/'+(item.resType?item.resType:'VIRTUALIZATION_VMWARE')+'.png'" alt=""> | 14 | + <img :src="'/aj-web/static/capacityAnalysis/'+(item.resType?item.resType:'VIRTUALIZATION_VMWARE')+'.png'" alt=""> |
15 | 15 | ||
16 | </div> | 16 | </div> |
17 | <div class="system-info" :style="titleProposalStyle"> | 17 | <div class="system-info" :style="titleProposalStyle"> |
-
Please register or login to post a comment