From ce123e31f9648b12e17a07db8370f259b2755d5b Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Tue, 11 May 2021 19:06:46 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-610=20fix:=20=E4=BF=AE=E5=A4=8Ddc=E3=80=81c?=
 =?UTF-8?q?abinet=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/cabinetTab.vue          | 15 ++-------------
 .../src/components/common/rightBox/dcBox.vue      |  6 ++----
 .../common/rightBox/setting/cabinetBox.vue        |  4 +++-
 .../common/table/settings/cabinetTable.vue        |  1 -
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 76d450de6..5c3eca35a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -26,7 +26,7 @@
         ></cabinet-table>
       </template>
       <template v-slot:top-tool-right>
-        <button id="asset-create-asset" v-has="'panel_chart_add'" class="top-tool-btn margin-r-10" @click.stop="addChart">
+        <button id="asset-create-asset" v-has="'dc_add'" class="top-tool-btn margin-r-10" @click.stop="add">
           <i class="nz-icon nz-icon-create-square"></i>
         </button>
       </template>
@@ -56,13 +56,11 @@ export default {
     'delete-button': deleteButton,
     cabinetTable
   },
-  props: {
-    obj: Object // 关联的实体对象
-  },
   data () {
     return {
       url: 'dc/cabinet',
       tableId: 'cabinetTable',
+
       blankObject: {
         id: '',
         idcId: '',
@@ -104,15 +102,6 @@ export default {
     // 切换tab
     changeTab (tab) {
       this.$emit('changeTab', tab)
-    },
-    addChart () {
-      this.rightBox.show = true
-    },
-    closeRightBox (refresh) {
-      this.rightBox.show = false
-      if (refresh) {
-        this.refresh()
-      }
     }
   },
   watch: {
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index 33801cfed..cbd199054 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -22,8 +22,7 @@
             </el-form-item>
             <el-form-item :label='$t("asset.principal")' prop="principal">
               <el-select value-key="id" class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" v-model="editDc.principal" placeholder="" size="small" id="dc-box-input-principal">
-                <el-option v-for="item in userData" :id="'dc-principal-op-'+item.userId" :key="item.userId" :label="item.username" :value="item.userId">
-                  <span>{{item.username}}</span>
+                <el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -91,7 +90,7 @@ export default {
     }
   },
   created() {
-    console.log(this.props)
+
   },
   methods: {
     /* 关闭弹框 */
@@ -209,7 +208,6 @@ export default {
       deep: true,
       handler (n, o) {
         this.editDc = JSON.parse(JSON.stringify(n))
-        console.info(this.editDc)
         this.$nextTick(() => {
           this.$refs.latlngPicker.setLnglat(this.editDc.latitude, this.editDc.longitude)
         })
diff --git a/nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue
index 0b8d37307..005ebb432 100644
--- a/nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/setting/cabinetBox.vue
@@ -57,6 +57,7 @@ export default {
     }
   },
   created() {
+
   },
   methods: {
     clickOutside () {
@@ -71,7 +72,7 @@ export default {
       this.prevent_opt.save = true
       this.$refs.cabinetForm.validate(valid => {
         if (valid) {
-          this.editCabinet.idcId = this.currentDc.id
+          this.editCabinet.dcId = this.currentDc.id
           if (this.editCabinet.id) {
             this.$put('/dc/cabinet', this.editCabinet).then(res => {
               this.prevent_opt.save = false
@@ -126,6 +127,7 @@ export default {
       deep: true,
       immediate: true,
       handler: function (n, o) {
+        console.info(n)
         if (n) {
           this.editCabinet = JSON.parse(JSON.stringify(n))
         }
diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
index 1cb5c5484..892797dba 100644
--- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
@@ -97,7 +97,6 @@ export default {
     }
   },
   methods: {
-
   }
 }
 </script>