fix:删除console。简单优化asset

This commit is contained in:
zhangyu
2020-11-21 14:41:48 +08:00
parent 1bd5cbec52
commit 7fe5f10696
4 changed files with 6 additions and 7 deletions

View File

@@ -149,7 +149,7 @@ export default {
immediate:true, immediate:true,
deep:true, deep:true,
handler(n,o){ handler(n,o){
console.log(n,n) // console.log(n,n)
} }
} }
} }

View File

@@ -626,7 +626,6 @@
}, },
// 新增label // 新增label
addLabel() { addLabel() {
console.log(123123);
this.editModule.labelModule.push({key: '', value: ''}); this.editModule.labelModule.push({key: '', value: ''});
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.labelBoxScrollbar.update(); this.$refs.labelBoxScrollbar.update();

View File

@@ -37,7 +37,7 @@
<el-table <el-table
class="nz-table" class="nz-table"
:height="mainTableHeight" :height="mainTableHeight"
style="width: 100%;" style="width: 100%;position: relative;z-index: 99"
:data="tableData" :data="tableData"
v-scrollBar:el-table="'large'" v-scrollBar:el-table="'large'"
v-show="bottomBox.mainResizeShow" v-show="bottomBox.mainResizeShow"
@@ -119,8 +119,8 @@
<span >{{scope.row.idc.name}}</span> <span >{{scope.row.idc.name}}</span>
</div> </div>
<template v-if="item.prop=='cabinet'"> <template v-if="item.prop=='cabinet'">
<span v-if="scope.row.cabinet && scope.row.cabinet != '--'">{{returnData(scope.row.cabinet).name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span> <span v-if="scope.row.cabinet && scope.row.cabinet != '--'">{{scope.row.cabinet.name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
<span v-else >{{returnData(scope.row.cabinet)}}</span> <span v-else >--</span>
</template> </template>
<div v-if="item.prop=='model'"> <div v-if="item.prop=='model'">
<span>{{scope.row.model.name}}</span> <span>{{scope.row.model.name}}</span>
@@ -129,7 +129,8 @@
<span>{{scope.row.model.vendor.value}}</span> <span>{{scope.row.model.vendor.value}}</span>
</div> </div>
<div v-if="item.prop=='purchaseDate'"> <div v-if="item.prop=='purchaseDate'">
<span>{{returnData(scope.row.purchaseDate)}}</span> <span v-if="scope.row.purchaseDate">{{scope.row.purchaseDate}}</span>
<span v-else="scope.row.purchaseDate">==</span>
</div> </div>
<div v-if="item.prop=='principal'"> <div v-if="item.prop=='principal'">
<span>{{getPrincipalName(scope.row.idc.principal)}}</span> <span>{{getPrincipalName(scope.row.idc.principal)}}</span>

View File

@@ -989,7 +989,6 @@
} }
let shadowMarker=null; let shadowMarker=null;
let marker=null; let marker=null;
console.log(dcStat);
if(dcInfo.state==='ON'){ if(dcInfo.state==='ON'){
let hasAlert=dcStat.alertP1!=0||dcStat.alertP2!=0||dcStat.alertP3!=0||dcStat.assetPingDown!=0||dcStat.endpointDown!=0||dcStat.promDown!=0; let hasAlert=dcStat.alertP1!=0||dcStat.alertP2!=0||dcStat.alertP3!=0||dcStat.assetPingDown!=0||dcStat.endpointDown!=0||dcStat.promDown!=0;
shadowMarker=L.circleMarker([dcInfo.latitude,dcInfo.longitude], {opacity:0,fillOpacity: 0, radius: symbolSize+10}); shadowMarker=L.circleMarker([dcInfo.latitude,dcInfo.longitude], {opacity:0,fillOpacity: 0, radius: symbolSize+10});