Merge remote-tracking branch 'origin/master'

张含笑

2026-02-28 24907136d83ffd61f57a7cdce0ef9b546e1d7823

Merge remote-tracking branch 'origin/master'

 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)">

 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="用户姓名" />

 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};

 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">

 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="用户姓名" />