From c2cf06b48548cb3a0b91d3f2c7b131803c05a31b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 15 Jul 2021 15:30:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9assetBox=20vm?=
 =?UTF-8?q?=3D1=E6=97=B6=20=E4=BD=8D=E7=BD=AE=E5=8F=AF=E4=BB=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/bottomBox/bottomBox.vue  | 1 -
 .../src/components/common/project/L5/CanvasProps.vue         | 1 -
 .../src/components/common/rightBox/asset/assetBox.vue        | 4 +---
 .../src/components/common/table/asset/assetTable.vue         | 5 ++++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index 2adf33b9c..b4a36e320 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -107,7 +107,6 @@ export default {
     obj: {
       immediate: true,
       handler (n) {
-        console.log(n)
         if ((this.from === fromRoute.asset) && n) {
           if (n.childrenNum) {
             const assetSub = { prop: 'assetSubTab', name: this.$t('overall.assetSubTab'), active: false }
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 15977d2ae..23307cd0f 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -1473,7 +1473,6 @@ export default {
       getTopology(this.index).updateProps()
     },
     onLayout () { // 改变布局
-      console.log(this.layout)
       layout(getTopology(this.index).activeLayer.pens, this.layout)
       getTopology(this.index).updateProps()
     },
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index 16693da68..937e4277f 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -46,7 +46,6 @@
           </el-form-item>
           <el-form-item :label="$t('asset.brandAndModel')" class="placeholder-emphasize" prop="brandAndModel">
             <el-cascader
-              v-if="!vmLock"
               v-model="editAsset.brandAndModel"
               :placeholder="lockModelInputValue"
               :options="options.brandAndModelOptions"
@@ -55,7 +54,6 @@
               size="small"
               style="width: 100%;"
             ></el-cascader>
-            <el-input v-else v-model="lockModelInputValue" disabled size="small"></el-input>
           </el-form-item>
           <el-form-item :label="$t('asset.location')" prop="location">
             <location-cascader v-if="!vmLock" ref="locationCascader" :dc-option="options.dcOptions" :default-model-u-size="1" @change="setLocationData"></location-cascader>
@@ -369,7 +367,7 @@ export default {
       immediate: true,
       handler (n) {
         if (n.id) {
-          // this.vmLock = n.vm === 1 // vm == 1 时，锁定model和location
+          this.vmLock = n.vm === 1 // vm == 1 时，锁定model和location
           if (this.editAsset.id) { // 有id表示是修改asset，需要注意不要覆盖掉原有的port
             const oldPort = this.obj.authProtocolPort // 原有的port
             const oldAuthProtocol = this.obj.type.authProtocol // 原有的协议
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 80ac40087..b3de85db5 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -59,7 +59,10 @@
         <template v-else-if="item.prop === 'model'">{{scope.row.model ? scope.row.model.name : '-'}}</template>
         <template v-else-if="item.prop === 'parent'">{{scope.row.parent ? scope.row.parent.name : '-'}}</template>
         <template v-else-if="item.prop === 'children'">
-          <div  @click="$emit('showBottomBox', 'assetSubTab', scope.row)" v-if="scope.row.childrenNum"> {{scope.row.childrenNum}}</div>
+          <div  @click="$emit('showBottomBox', 'assetSubTab', scope.row)" v-if="scope.row.childrenNum">
+            <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i>
+            {{scope.row.childrenNum}}</div>
+          <span v-else-if="scope.row.type.vm===1">  <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i> 0 </span>
           <span v-else> - </span>
         </template>
         <template v-else-if="item.prop === 'brand'">{{scope.row.brand ? scope.row.brand.name : '-'}}</template>