Merge branch 'master-500-dev-LH' into 'master-500-dev'

资源视图vmware 卡片跳转问题



See merge request !445

@@ -195,7 +195,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                 moduleId: 'resIndex',
                 moduleId: 'resIndex',
                 resType: resType
                 resType: resType
             },function (retCols) {
             },function (retCols) {
-
                 var cols;
                 var cols;
                 if (retCols) {
                 if (retCols) {
                     cols = retCols;
                     cols = retCols;
@@ -942,7 +941,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                 if(retCols){
                 if(retCols){
                     cols = retCols;
                     cols = retCols;
                 }
                 }
-
                 parentResListTable = table.render({
                 parentResListTable = table.render({
                     elem: '#resListTable'
                     elem: '#resListTable'
                     , id: 'resListTable'
                     , id: 'resListTable'
@@ -1069,6 +1067,14 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                 if (retCols) {
                 if (retCols) {
                     cols = retCols;
                     cols = retCols;
                 }
                 }
+
+                var url=""
+
+                if(resType=='VIRTUALIZATION_VMWARE'){
+                    url=common.domainName + '/api-web/home/virtual-res-list/' + resType
+                }else{
+                    url =common.domainName + '/api-web/home/res-list/' + resType;
+                }
                 resListTable = table.render({
                 resListTable = table.render({
                     elem: '#resListTable'
                     elem: '#resListTable'
                     , id: 'resListTable'
                     , id: 'resListTable'
@@ -1076,7 +1082,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                     , toolbar: '#resList-top-head-info-tpl' //开启头部工具栏，并为其绑定左侧模板
                     , toolbar: '#resList-top-head-info-tpl' //开启头部工具栏，并为其绑定左侧模板
                     , defaultToolbar: ['filter']
                     , defaultToolbar: ['filter']
                     , drag: {toolbar: false}
                     , drag: {toolbar: false}
-                    , url: common.domainName + '/api-web/home/res-list/' + resType
+                    , url: url
                     , where: {
                     , where: {
                         access_token: accessToken,
                         access_token: accessToken,
                         resName: $("#resindex_keyword").val() !== '' ? $("#resindex_keyword").val() : id,
                         resName: $("#resindex_keyword").val() !== '' ? $("#resindex_keyword").val() : id,