Authored by 王涛

Merge branch 'master-V32-XuHaoJie' into 'master'

杭州-资源视图-阿里云详情页面还原代码



See merge request !51
@@ -692,7 +692,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -692,7 +692,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
692 resType = this.detailPathByProviderAndModel(resType,resId); 692 resType = this.detailPathByProviderAndModel(resType,resId);
693 } 693 }
694 //如果是虚拟化相关资源类型,则根据采集协议判断去那个页面 694 //如果是虚拟化相关资源类型,则根据采集协议判断去那个页面
695 - var resTypeList = ['VIRTUALIZATION_VMWARE_VHOST','VIRTUALIZATION_HUAWEI_VHOST','ALL_CLOUD_ECS']; 695 + var resTypeList = ['VIRTUALIZATION_VMWARE_VHOST','VIRTUALIZATION_HUAWEI_VHOST','HUAWEI_CLOUD_VIRTUALHOST','ALI_CLOUD_ECS'];
696 if (resTypeList.indexOf(resType) != -1) { 696 if (resTypeList.indexOf(resType) != -1) {
697 if (protocol == 'SSH' || protocol == 'SNMP') { 697 if (protocol == 'SSH' || protocol == 'SNMP') {
698 resType = 'HOST_X86VIRTUAL'; 698 resType = 'HOST_X86VIRTUAL';