Merge branch 'mater-ztq' into 'master'

Mater ztq



See merge request !1223

@@ -6,7 +6,7 @@
             </div>
             <div class="tencent-tenant-items">
                 <div class="tencent-tenant-item" v-for="(item,index) in tenantList" :key="index">
-                    <img class="tencent-tenant-img" :src="'/vue3/src/assets/images/machineRoom/TENCENT_CLOUD_PLAT_'+item.type+'.png'" alt="">
+                    <img class="tencent-tenant-img" :src="'/vue3/src/assets/images/machineRoom/'+item.resTypeCode+'.png'" alt="">
                     <div class="tencent-tenant-info">
                         <div class="tencent-tenant-name">
                             <div class="tencent-tenant-resTypeName">{{item.resTypeName}}</div>

@@ -13,11 +13,8 @@ export default {
             proxy.$http.get(`/api-web/bResource/tenantStatistics`,{
                 resId:resId,
             },(res)=>{
-                console.log(res.data);
+                //console.log(res.data)
                 tenantList.value = res.data;
-                tenantList.value.forEach(item=>{
-                    item.type='tencent-cloud-host';
-                })
             },(err)=>{
                 console.log(err);
             })