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

杭州-乙方运维-如果是日常资料，不能点击



See merge request !47

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

@@ -7847,4 +7847,10 @@ form[lay-filter="activewarning-form"] .layui-inline {
 
 
 .info-table .layui-badge-dot {
 .info-table .layui-badge-dot {
     width: 8px !important;
     width: 8px !important;
+}
+.info-ali-cloud-ecs {
+     text-align: center!important;
+}
+.info-ali-cloud-ecs span{
+    width: 16%!important;
 }
 }

@@ -7,7 +7,7 @@
                     <div class="lay-row">
                     <div class="lay-row">
                         <div class="lay-row-item lay-row-item--auto-width">
                         <div class="lay-row-item lay-row-item--auto-width">
                             <h5 class="lay-row-title">基本信息<i data-id="ali_cloud_ecs_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
                             <h5 class="lay-row-title">基本信息<i data-id="ali_cloud_ecs_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
-                            <ul class="info-table" id="ali_cloud_ecs_baseinfo"></ul>
+                            <ul class="info-table info-ali-cloud-ecs" id="ali_cloud_ecs_baseinfo"></ul>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="lay-row">
                     <div class="lay-row">

@@ -45,6 +45,10 @@ export default {
         let initFlg = Vue.ref(false);
         let initFlg = Vue.ref(false);
 
 
         let init = () => {
         let init = () => {
+            //如果是日常资料，不能点击
+            if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){
+                return true;
+            }
             // 查询绑定的文件列表
             // 查询绑定的文件列表
             let params = {
             let params = {
                 opsId: props.projectId,
                 opsId: props.projectId,