Merge remote-tracking branch 'origin/master'

jiangping

2024-10-14 ceb66442df7361a0247ebe7a6b12ad04e8b89c8c

 admin/src/components/business/OperaDeviceRoleWindow.vue

@@ -2,7 +2,7 @@
    <GlobalWindow
        :title="title"
        :visible.sync="visible"
        width="900px"
        width="1000px"
        :confirm-working="isWorking"
        @confirm="confirm"
    >
@@ -158,7 +158,7 @@
    },
    // 获取设备
    getLists () {
      getList({})
      getList({type:0, isdeleted:0 })
        .then(res => {
          this.device = res.map(item => {
            return {