From 944f80472ca0b3bfe5542f344bec8a9ee7783d61 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 25 Aug 2022 11:43:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/category/index.vue                                | 2 +-
 src/views/components/WarehouseWarning.vue                   | 2 --
 src/views/storeManage/warehouse3D/archivesStorage/index.vue | 1 +
 src/views/storeManage/warehouse3D/collateRoom/index.vue     | 1 +
 src/views/storeManage/warehouse3D/readRoom/index.vue        | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/category/index.vue b/src/views/category/index.vue
index c0647e2..0ba13d2 100644
--- a/src/views/category/index.vue
+++ b/src/views/category/index.vue
@@ -39,7 +39,7 @@
             </el-button>
           </template>
           <template v-slot:right>
-            <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
+            <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0 || (crud.selections.length === 1 && crud.selections[0].pid === '0' )" @click="toDelete(crud.selections)">删除</el-button>
             <el-button v-permission="permission.sort" icon="el-icon-sort" size="mini" :loading="sortLoading" :disabled="brotherNodeNum <= 1" @click="toSort(crud.selections)">排序</el-button>
           </template>
         </crudOperation>
diff --git a/src/views/components/WarehouseWarning.vue b/src/views/components/WarehouseWarning.vue
index 633beef..00e8e03 100644
--- a/src/views/components/WarehouseWarning.vue
+++ b/src/views/components/WarehouseWarning.vue
@@ -76,7 +76,6 @@ export default {
       clearInterval(this.scrollTimer) // 清除定时器
       const table = this.$refs.table // 获取DOM元素
       this.wrapperHeight = table.$el.offsetHeight - 30
-      console.log(this.wrapperHeight)
       // 组件一页能完整展示的数据条数
       this.displayNum = Math.floor(this.wrapperHeight / 40)
       if (this.tableData.length > this.displayNum) {
@@ -97,7 +96,6 @@ export default {
       if (this.displayNum && this.displayNum > 0) {
         this.scrollTimer = setInterval(() => {
           // scrollTop = bodyWrapper.scrollTop
-          console.log(bodyWrapper.scrollTop, bodyWrapper.scrollTop >= (this.tableData.length - this.displayNum) * 40)
           if (bodyWrapper.scrollTop + this.wrapperHeight >= this.tableData.length * 40) {
             bodyWrapper.scrollTop = 0
             this.showComplete = true
diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
index 566533b..1be66f5 100644
--- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue
+++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
@@ -201,6 +201,7 @@ export default {
         })
         // this.handleAlarm('DAK_MO_OAO_003')
         this.deviceState()
+        this.handleAQI()
       }
     },
     // 传入设备状态data  / 给iframe传初始值
diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue
index 6d10a7e..017d3f3 100644
--- a/src/views/storeManage/warehouse3D/collateRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/collateRoom/index.vue
@@ -76,6 +76,7 @@ export default {
         })
         // this.handleAlarm('DAK_MO_OAO_003')
         this.deviceState()
+        this.handleAQI()
       }
     },
     // 传入设备状态data  / 给iframe传初始值
diff --git a/src/views/storeManage/warehouse3D/readRoom/index.vue b/src/views/storeManage/warehouse3D/readRoom/index.vue
index 1d692bb..b797922 100644
--- a/src/views/storeManage/warehouse3D/readRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/readRoom/index.vue
@@ -71,6 +71,7 @@ export default {
           }
         })
         this.deviceState()
+        this.handleAQI()
       }
     },
     // 传入设备状态data  / 给iframe传初始值