From 4fd6e8aa4ce85b2890c52dec6e3d84d47b3a52fc Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Tue, 26 Jul 2022 17:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storeManage/deviceManage/mac.js                |  2 +-
 .../outInStorage/inStorage/module/inDialog.vue         | 10 +---------
 src/views/components/DeviceTree.vue                    |  4 +++-
 src/views/storeManage/levelManage/index.vue            |  2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/api/storeManage/deviceManage/mac.js b/src/api/storeManage/deviceManage/mac.js
index c2a2e5f..4649b05 100644
--- a/src/api/storeManage/deviceManage/mac.js
+++ b/src/api/storeManage/deviceManage/mac.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getMac() {
   return request({
-    url: 'api/mac/get',
+    url: 'api/RFID/getDeviceMac',
     method: 'get'
   })
 }
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
index 7dcd5e3..4449cbb 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
@@ -143,14 +143,6 @@ export default {
       singleVisible: false,
       childData: [],
       cnName: '',
-      defaultProps: { children: 'children', label: 'cnName' },
-      treeData: [{
-        cnName: '档案库',
-        children: [
-          { cnName: '密集架' },
-          { cnName: '回转柜' }
-        ]
-      }],
       fieldNum: 1, // 柜号
       btnChecked: [], // 校验状态
       numArr: [], // 选择器 值
@@ -172,7 +164,7 @@ export default {
   methods: {
     // 选中设备
     handleNodeClick(data) {
-      this.cnName = data.cnName
+      this.cnName = data.deviceTypeId.name
       console.log(data)
       // 按钮状态
       this.btnChecked = this.childArr(1)
diff --git a/src/views/components/DeviceTree.vue b/src/views/components/DeviceTree.vue
index 129e91d..50b96e7 100644
--- a/src/views/components/DeviceTree.vue
+++ b/src/views/components/DeviceTree.vue
@@ -63,7 +63,9 @@ export default {
       })
     },
     handleNodeClick(selectedData) {
-      this.$emit('nodeClick', selectedData)
+      if (selectedData.deviceName) {
+        this.$emit('nodeClick', selectedData)
+      }
     }
   }
 }
diff --git a/src/views/storeManage/levelManage/index.vue b/src/views/storeManage/levelManage/index.vue
index f206a4a..bdbb7f8 100644
--- a/src/views/storeManage/levelManage/index.vue
+++ b/src/views/storeManage/levelManage/index.vue
@@ -42,7 +42,7 @@
           <el-table-column align="center" prop="rowNo" label="层号" width="80" />
           <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '回转柜'" align="center" prop="columnRowNo" label="列号" width="80" />
           <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '密集架'" align="center" prop="direction" label="方向" width="80" />
-          <el-table-column align="center" prop="" label="标签" />
+          <el-table-column align="center" prop="tid" label="标签" />
           <el-table-column align="center" prop="update_time" label="操作时间" width="150">
             <template slot-scope="scope">
               <div>{{ scope.row.update_time | parseTime }}</div>