From ceb66442df7361a0247ebe7a6b12ad04e8b89c8c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 十月 2024 09:32:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaDeviceRoleWindow.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/OperaDeviceRoleWindow.vue b/admin/src/components/business/OperaDeviceRoleWindow.vue
index 211f896..49b5a38 100644
--- a/admin/src/components/business/OperaDeviceRoleWindow.vue
+++ b/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"
>
@@ -119,7 +119,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
@@ -148,7 +148,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
@@ -158,7 +158,7 @@
},
// 鑾峰彇璁惧
getLists () {
- getList({})
+ getList({type:0, isdeleted:0 })
.then(res => {
this.device = res.map(item => {
return {
--
Gitblit v1.9.3