From 9733e3b67cd1abe6e7ce298cc048fabd86c0f24e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 25 六月 2025 10:01:09 +0800
Subject: [PATCH] 1、报警分析页面饼图种类过多时饼图颜色出现白色与背景色一致导致无法区分 2、综合效率分析页面计算OEE功能新增loading提示 3、统计分析和统计图表页面新增图表数据加载提示以及优化图表展示增加分辨率适应及代码
---
src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue b/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue
index 69b115e..6ea023b 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue
@@ -13,7 +13,8 @@
<a-tabs v-model="activeTabKey">
<a-tab-pane :key="1" tab="鍒嗛厤鐢ㄦ埛">
<UserPermissionTransfer ref="userPermissionTransferRef" :currentTreeNodeInfo="currentTreeNodeInfo"
- :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"/>
+ :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"
+ @setAdminDisabled="setAdminDisabled"/>
</a-tab-pane>
</a-tabs>
</a-modal>
@@ -22,7 +23,6 @@
<script>
import dncApi from '@/api/dnc'
import UserPermissionTransfer from './UserPermissionTransfer'
- import { queryProductionTreeList } from '@/api/api'
export default {
name: 'AssignPermissionModal',
@@ -69,17 +69,21 @@
dncApi.getAllUsersListApi()
.then(res => {
if (res.success) {
- this.allUsersList = res.result.records.map(item => {
- return {
- ...item,
- disabled: item.username === 'admin'
- }
- })
+ this.allUsersList = res.result
this.$nextTick(() => this.$refs.userPermissionTransferRef.getHasPermissionUserByApi())
}
})
},
+ setAdminDisabled() {
+ this.allUsersList = this.allUsersList.map(item => {
+ return {
+ ...item,
+ disabled: item.username === 'admin'
+ }
+ })
+ },
+
// 鎺у埗寮圭獥鍏抽棴
handleModalClose() {
this.visible = false
--
Gitblit v1.9.3