From 24907136d83ffd61f57a7cdce0ef9b546e1d7823 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 28 Feb 2026 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/permissionManage/permissionRole/index.vue | 4 ++--
applications/task-work-order/src/views/orderView/organizational/userMange/index.vue | 2 +-
applications/task-work-order/src/styles/common/cockpit.scss | 5 +++++
applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue | 4 ++--
applications/drone-command/src/views/permissionManage/permissionUser/index.vue | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/applications/drone-command/src/views/permissionManage/permissionRole/index.vue b/applications/drone-command/src/views/permissionManage/permissionRole/index.vue
index f72dc77..935e95b 100644
--- a/applications/drone-command/src/views/permissionManage/permissionRole/index.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionRole/index.vue
@@ -32,7 +32,7 @@
<el-button :icon="Delete" color="#1A2652" type="primary" :disabled="!selectedIds.length" @click="handleDelete()">
删除
</el-button>
- <el-button
+<!-- <el-button
color="#1A2652"
type="primary"
:disabled="selectedIds.length !== 1"
@@ -40,7 +40,7 @@
@click="handleRole"
>
权限设置
- </el-button>
+ </el-button>-->
</div>
<div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/index.vue b/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
index 246c55d..39dcb5a 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
@@ -60,7 +60,7 @@
<div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
<div class="command-table-content command-table-content-bg">
<el-table class="command-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" />
+<!-- <el-table-column type="selection" width="46" />-->
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
<el-table-column prop="account" show-overflow-tooltip label="登录账号" />
<el-table-column prop="realName" show-overflow-tooltip label="用户姓名" />
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index f90ae7d..80a3512 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -55,6 +55,11 @@
color: #ffffff;
}
+.gd-select,.gd-input,.gd-input-text,.gd-date-picker{
+ .is-disabled{
+ opacity: 0.6;
+ }
+}
.gd-select {
--bg: #{$form-bg};
--tips: #{$form-tips};
diff --git a/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue b/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue
index c77cf0d..69b10aa 100644
--- a/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue
@@ -33,7 +33,7 @@
<el-button :icon="Delete" color="#ECECF4" :disabled="!selectedIds.length" @click="handleDelete()">
删除
</el-button>
- <el-button
+<!-- <el-button
:icon="Setting"
color="#ECECF4"
:disabled="selectedIds.length !== 1"
@@ -41,7 +41,7 @@
@click="handleRole"
>
权限设置
- </el-button>
+ </el-button>-->
</div>
<div class="gd-table-content gd-table-content-bg">
diff --git a/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue b/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue
index 6ab2f4b..99acff9 100644
--- a/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/userMange/index.vue
@@ -58,7 +58,7 @@
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-content gd-table-content-bg">
<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" />
+<!-- <el-table-column type="selection" width="46" />-->
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
<el-table-column prop="account" show-overflow-tooltip label="登录账号" />
<el-table-column prop="realName" show-overflow-tooltip label="用户姓名" />
--
Gitblit v1.9.3