吉安感知网项目-前端
chenyao
2026-02-26 42dfb0b25a9ca23fd4330754b8c2a150a0a9605e
feat:更新反无和工单机构和用户隐藏 新增、删除相关功能
8 files modified
98 ■■■■ changed files
applications/drone-command/src/api/system/role.js 3 ●●●● patch | view | raw | blame | history
applications/drone-command/src/views/permissionManage/permissionDept/index.vue 18 ●●●● patch | view | raw | blame | history
applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue 3 ●●●● patch | view | raw | blame | history
applications/drone-command/src/views/permissionManage/permissionUser/index.vue 32 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/api/system/role.js 3 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue 8 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/organizational/userMange/FormDiaLog.vue 3 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/organizational/userMange/index.vue 28 ●●●● patch | view | raw | blame | history
applications/drone-command/src/api/system/role.js
@@ -73,12 +73,13 @@
  });
};
export const getRoleTree = tenantId => {
export const getRoleTree = (tenantId,sysType) => {
  return request({
    url: '/blade-system/role/tree',
    method: 'get',
    params: {
      tenantId,
      sysType
    },
  });
};
applications/drone-command/src/views/permissionManage/permissionDept/index.vue
@@ -27,12 +27,12 @@
            </el-form-item>
        </el-form>
        <div class="command-table-toolbar">
            <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
            <el-button :icon="Delete" color="#1A2652" type="primary" :disabled="!selectedIds.length" @click="handleDelete()">
                删除
            </el-button>
        </div>
<!--        <div class="command-table-toolbar">-->
<!--            <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>-->
<!--            <el-button :icon="Delete" color="#1A2652" type="primary" :disabled="!selectedIds.length" @click="handleDelete()">-->
<!--                删除-->
<!--            </el-button>-->
<!--        </div>-->
        <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">
@@ -66,9 +66,9 @@
                    <el-table-column label="操作" class-name="operation-btns">
                        <template v-slot="{ row }">
                            <el-link @click="handleView(row)">查看</el-link>
                            <el-link @click="handleEdit(row)">编辑</el-link>
                            <el-link @click="handleAddChild(row)">新增子项</el-link>
                            <el-link type="danger" @click="handleDelete(row)">删除</el-link>
<!--                            <el-link @click="handleEdit(row)">编辑</el-link>-->
<!--                            <el-link @click="handleAddChild(row)">新增子项</el-link>-->
<!--                            <el-link type="danger" @click="handleDelete(row)">删除</el-link>-->
                            <el-link type="danger" @click="handleShare(row)" v-if="hasSharing">共享</el-link>
                        </template>
                    </el-table-column>
applications/drone-command/src/views/permissionManage/permissionUser/FormDiaLog.vue
@@ -155,6 +155,7 @@
                            :data="deptTree"
                            :props="deptTreeSelectProps"
                            node-key="id"
                            disabled
                            check-strictly
                            clearable
                            placeholder="请选择"
@@ -259,7 +260,7 @@
}
async function getRoleTreeData() {
    const res = await getRoleTree('000000')
    const res = await getRoleTree('000000',5)
    roleTree.value = res.data.data
}
applications/drone-command/src/views/permissionManage/permissionUser/index.vue
@@ -41,21 +41,21 @@
            </el-form-item>
        </el-form>
        <div class="command-table-toolbar">
            <el-button v-if="permission.permissionUser_add" :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">
                新增
            </el-button>
            <el-button
                v-if="permission.permissionUser_remove"
                :icon="Delete"
                color="#1A2652"
                type="primary"
                :disabled="!selectedIds.length"
                @click="handleDelete()"
            >
                删除
            </el-button>
        </div>
<!--        <div class="command-table-toolbar">-->
<!--            <el-button v-if="permission.permissionUser_add" :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">-->
<!--                新增-->
<!--            </el-button>-->
<!--            <el-button-->
<!--                v-if="permission.permissionUser_remove"-->
<!--                :icon="Delete"-->
<!--                color="#1A2652"-->
<!--                type="primary"-->
<!--                :disabled="!selectedIds.length"-->
<!--                @click="handleDelete()"-->
<!--            >-->
<!--                删除-->
<!--            </el-button>-->
<!--        </div>-->
        <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">
@@ -71,7 +71,7 @@
                        <template v-slot="{ row }">
                            <el-link  @click="handleView(row)">查看</el-link>
                            <el-link v-if="permission.permissionUser_edit" @click="handleEdit(row)">编辑</el-link>
                            <el-link v-if="permission.permissionUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>
<!--                            <el-link v-if="permission.permissionUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>-->
                        </template>
                    </el-table-column>
                </el-table>
applications/task-work-order/src/api/system/role.js
@@ -85,12 +85,13 @@
  });
};
export const getRoleTree = tenantId => {
export const getRoleTree = (tenantId, sysType) => {
  return request({
    url: '/blade-system/role/tree',
    method: 'get',
    params: {
      tenantId,
      sysType
    },
  });
};
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
@@ -39,8 +39,8 @@
    </el-form>
    <div class="gd-table-toolbar">
      <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增机构</el-button>
      <el-button :icon="Upload" @click="handleImport">机构导入</el-button>
<!--      <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增机构</el-button>-->
<!--      <el-button :icon="Upload" @click="handleImport">机构导入</el-button>-->
      <el-button :icon="Download" :loading="exportLoading" :disabled="exportLoading" @click="handleExport">机构导出</el-button>
    </div>
@@ -65,8 +65,8 @@
          <el-table-column label="操作" class-name="operation-btns" width="200">
            <template v-slot="{ row }">
              <el-link type="primary" @click="openForm('view', row)">查看</el-link>
              <el-link type="primary"  @click="openForm('edit', row)">编辑</el-link>
              <el-link type="primary" @click="handleDelete(row)">删除</el-link>
<!--              <el-link type="primary"  @click="openForm('edit', row)">编辑</el-link>-->
<!--              <el-link type="primary" @click="handleDelete(row)">删除</el-link>-->
              <el-link type="primary" @click="toggleStatus(row)">{{row.status === 1 ? '禁用' : '启用'}}</el-link>
            </template>
          </el-table-column>
applications/task-work-order/src/views/orderView/organizational/userMange/FormDiaLog.vue
@@ -155,6 +155,7 @@
                            :data="deptTree"
                            :props="deptTreeSelectProps"
                            node-key="id"
                            disabled
                            check-strictly
                            clearable
                            placeholder="请选择"
@@ -259,7 +260,7 @@
}
async function getRoleTreeData() {
    const res = await getRoleTree('000000')
    const res = await getRoleTree('000000', 6)
    roleTree.value = res.data.data
}
applications/task-work-order/src/views/orderView/organizational/userMange/index.vue
@@ -41,19 +41,19 @@
            </el-form-item>
        </el-form>
        <div class="gd-table-toolbar">
            <el-button v-if="permission.orderUser_add" :icon="Plus" color="#4C34FF" type="primary" @click="handleAdd">
                新增
            </el-button>
            <el-button
                v-if="permission.orderUser_remove"
                :icon="Delete"
                :disabled="!selectedIds.length"
                @click="handleDelete()"
            >
                删除
            </el-button>
        </div>
<!--        <div class="gd-table-toolbar">-->
<!--            <el-button v-if="permission.orderUser_add" :icon="Plus" color="#4C34FF" type="primary" @click="handleAdd">-->
<!--                新增-->
<!--            </el-button>-->
<!--            <el-button-->
<!--                v-if="permission.orderUser_remove"-->
<!--                :icon="Delete"-->
<!--                :disabled="!selectedIds.length"-->
<!--                @click="handleDelete()"-->
<!--            >-->
<!--                删除-->
<!--            </el-button>-->
<!--        </div>-->
        <div class="gd-table-container" v-loading="loading">
            <div class="gd-table-content gd-table-content-bg">
@@ -69,7 +69,7 @@
                        <template v-slot="{ row }">
                            <el-link  @click="handleView(row)">查看</el-link>
                            <el-link v-if="permission.orderUser_edit" @click="handleEdit(row)">编辑</el-link>
                            <el-link v-if="permission.orderUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>
<!--                            <el-link v-if="permission.orderUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>-->
                        </template>
                    </el-table-column>
                </el-table>