Browse Source

bug修改

master
z_yu 2 years ago
parent
commit
944f80472c
  1. 2
      src/views/category/index.vue
  2. 2
      src/views/components/WarehouseWarning.vue
  3. 1
      src/views/storeManage/warehouse3D/archivesStorage/index.vue
  4. 1
      src/views/storeManage/warehouse3D/collateRoom/index.vue
  5. 1
      src/views/storeManage/warehouse3D/readRoom/index.vue

2
src/views/category/index.vue

@ -39,7 +39,7 @@
</el-button> </el-button>
</template> </template>
<template v-slot:right> <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> <el-button v-permission="permission.sort" icon="el-icon-sort" size="mini" :loading="sortLoading" :disabled="brotherNodeNum <= 1" @click="toSort(crud.selections)">排序</el-button>
</template> </template>
</crudOperation> </crudOperation>

2
src/views/components/WarehouseWarning.vue

@ -76,7 +76,6 @@ export default {
clearInterval(this.scrollTimer) // clearInterval(this.scrollTimer) //
const table = this.$refs.table // DOM const table = this.$refs.table // DOM
this.wrapperHeight = table.$el.offsetHeight - 30 this.wrapperHeight = table.$el.offsetHeight - 30
console.log(this.wrapperHeight)
// //
this.displayNum = Math.floor(this.wrapperHeight / 40) this.displayNum = Math.floor(this.wrapperHeight / 40)
if (this.tableData.length > this.displayNum) { if (this.tableData.length > this.displayNum) {
@ -97,7 +96,6 @@ export default {
if (this.displayNum && this.displayNum > 0) { if (this.displayNum && this.displayNum > 0) {
this.scrollTimer = setInterval(() => { this.scrollTimer = setInterval(() => {
// scrollTop = bodyWrapper.scrollTop // scrollTop = bodyWrapper.scrollTop
console.log(bodyWrapper.scrollTop, bodyWrapper.scrollTop >= (this.tableData.length - this.displayNum) * 40)
if (bodyWrapper.scrollTop + this.wrapperHeight >= this.tableData.length * 40) { if (bodyWrapper.scrollTop + this.wrapperHeight >= this.tableData.length * 40) {
bodyWrapper.scrollTop = 0 bodyWrapper.scrollTop = 0
this.showComplete = true this.showComplete = true

1
src/views/storeManage/warehouse3D/archivesStorage/index.vue

@ -201,6 +201,7 @@ export default {
}) })
// this.handleAlarm('DAK_MO_OAO_003') // this.handleAlarm('DAK_MO_OAO_003')
this.deviceState() this.deviceState()
this.handleAQI()
} }
}, },
// data / iframe // data / iframe

1
src/views/storeManage/warehouse3D/collateRoom/index.vue

@ -76,6 +76,7 @@ export default {
}) })
// this.handleAlarm('DAK_MO_OAO_003') // this.handleAlarm('DAK_MO_OAO_003')
this.deviceState() this.deviceState()
this.handleAQI()
} }
}, },
// data / iframe // data / iframe

1
src/views/storeManage/warehouse3D/readRoom/index.vue

@ -71,6 +71,7 @@ export default {
} }
}) })
this.deviceState() this.deviceState()
this.handleAQI()
} }
}, },
// data / iframe // data / iframe

Loading…
Cancel
Save