Merge branch 'master-v32-lushangqing' into 'master'

容量分析资源名称下探详情更改



See merge request !578

@@ -266,9 +266,13 @@ global.openDetail = (resId, resType, proxy) => {
     let collProtocol = '';
     let collProtocol = '';
 
 
     // 获取资源详情
     // 获取资源详情
-    proxy.$http.get(`/api-web/v32/res/detail/${resId}`, {}, function (res) {
-        if (res && res.map) {
-            let data = res.map;
+    // proxy.$http.get(`/api-web/v32/res/detail/${resId}`, {}, function (res) {
+    //start lsq 2022-04-29 容量分析资源名称下探详情更改
+    proxy.$http.get(`/api-web/manage/resource/findById/`, {resId:resId}, function (res) {
+        // if (res && res.map) {
+        //     let data = res.map;
+        if (res && res.obj) {
+            let data = res.obj.bean;
 
 
             provider = data.provider;
             provider = data.provider;
             ip = data.ip;
             ip = data.ip;