完成权限策略，正添加查看组织架构

components.d.ts

@@ -69,6 +69,7 @@ declare module '@vue/runtime-core' {
     ElTour: typeof import('element-plus/es')['ElTour']
     ElTourStep: typeof import('element-plus/es')['ElTourStep']
     ElTransfer: typeof import('element-plus/es')['ElTransfer']
+    ElTreeV2: typeof import('element-plus/es')['ElTreeV2']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ElWatermark: typeof import('element-plus/es')['ElWatermark']
     Header: typeof import('./src/components/header.vue')['default']

src/api/permiss_policy.ts

@@ -24,29 +24,26 @@ export const GetPermissPolicyService = (req) =>{
 }
 
 export const UpdatePermissPolicyService = (Data: any) => {
-    const params = new URLSearchParams();
+    // 将 Data 转换为 JSON 字符串
-    for (let key in Data) {
+    const jsonData = JSON.stringify(Data);
-        params.append(key, Data[key])
+    const token = localStorage.getItem("token") || "";
-    }
-    let token = localStorage.getItem("token") || "";
-    return request.post('/permission/update_policy', params,{
-        headers: {
-            'token': token, //token
-        }
-    })
-}
     
+    return request.post('/permission/update_policy', jsonData, {
+        headers: {
+            'token': token,
+            'Content-Type': 'application/json' // 必须指定 JSON 格式的 Content-Type
+        }
+    });
+};
 
 
 export const AddPermissPolicyService = (Data: any) => {
-    const params = new URLSearchParams();
+    const jsonData = JSON.stringify(Data);
-    for (let key in Data) {
+    const token = localStorage.getItem("token") || "";
-        params.append(key, Data[key])
+    return request.post('/permission/add_policy', jsonData,{
-    }
-    let token = localStorage.getItem("token") || "";
-    return request.post('/permission/add_policy', params,{
         headers: {
             'token': token, //token
+            'Content-Type': 'application/json' // 必须指定 JSON 格式的 Content-Type
         }
     })
 }

src/api/user.ts

@@ -59,6 +59,10 @@ export const getUUIDService = (registerData) => {
     return request.post('/user/uuid', params)
 }
 
+export const getAllDefaultUsers = () => {
+    return request.get('/user/get_all_default_users')
+}
+
 export const addGroupRequestService  = (Data) => {
     const params = new URLSearchParams();
     for (let key in Data) {
@@ -66,7 +70,20 @@ export const addGroupRequestService  = (Data) => {
     }
     return request.post('/im/send_message', params,{
         headers: {
-            'token': Data.token, // 闂佽绻愭蹇涘箯閿燂拷 token 闂備礁鎼ú锔锯偓绗涘啰鏆﹂柛娆忣槺閳绘棃鏌ｉ幋鐏活亝绂嶉崼鏇熺厽闁靛ǹ鍎遍褔鏌熼煬鎻掆偓婵嬪箖瑜忔禒锔炬喆閿濆懍澹曢梺璺ㄥ櫐閹凤拷  
+            'token': Data.token,
+        }
+    })
+}
+
+export const AdminAddUserRequestService  = (Data) => {
+    const params = new URLSearchParams();
+    for (let key in Data) {
+        params.append(key, Data[key])
+    }
+    let token = localStorage.getItem("token") || "";
+    return request.post('/user/admin_add_user', params,{
+        headers: {
+            'token': token,
         }
     })
 }

src/components/table-edit.vue

@@ -5,7 +5,7 @@
 				<el-form-item :label="item.label" :prop="item.prop">
 					<!-- 文本框、数字框、下拉框、日期框、开关、上传 -->
 					<el-input v-if="item.type === 'input'" v-model="form[item.prop]" :disabled="item.disabled"
-						:placeholder="item.placeholder" clearable type="textarea" :row="item.rows?item.rows:1"></el-input>
+						:placeholder="item.placeholder" clearable :row="item.rows?item.rows:1"></el-input>
 					<el-input-number v-else-if="item.type === 'number'" v-model="form[item.prop]"
 						:disabled="item.disabled" controls-position="right"></el-input-number>
 					<el-select v-else-if="item.type === 'select'" v-model="form[item.prop]" :disabled="item.disabled"
@@ -19,8 +19,8 @@
 						:disabled="item.disabled"
 						:active-text="item.activeText" 
 						:inactive-text="item.inactiveText"
-						:active-value="item.activeValue ?? true" 
+						:active-value="1" 
-						:inactive-value="item.inactiveValue ?? false"
+						:inactive-value="-1"
 						></el-switch>
 					<el-date-picker v-else-if="item.type === 'date'" type="date" v-model="form[item.prop]"
 						:value-format="item.format"></el-date-picker>

src/types/form-option.ts

@@ -22,4 +22,5 @@ export interface FormOptionList {
     activeText?: string;
     inactiveText?: string;
     required?: boolean;
+    is_textarea?: boolean;
 }

src/types/permiss_policy.ts

@@ -47,5 +47,5 @@ export interface PolicyUserRange {
   upload_size: number; // 上传大小限制
   upload_max_size: number; // 最大上传大小限制
   send_mail: number; // 同上
-  range: Range[]; // 范围信息数组
+  range: number[]; // 范围信息数组
 }

src/views/system/manage-permiss-policy.vue

@@ -17,13 +17,13 @@
             </div>
 
         </div>
-        <el-dialog :title="isEdit ? '编辑': '编辑'" v-model="visible" width="700px" destroy-on-close
+        <el-dialog :title="isEdit ? '编辑': '编辑'" v-model="visible" width="900px" destroy-on-close
             :close-on-click-modal="false" @close="closeDialog">
-            <TableEdit :form-data="rowData" :options="options_edit" :edit="isEdit" :update="updateData" />
+            <TableEdit :form-data="rowData" :options="options_edit" :edit="isEdit" :update="handleUpdatePermissPolicy" />
         </el-dialog>
-        <el-dialog :title="isAdd ? '新增' : '新增'" v-model="visible_add" width="700px" destroy-on-close
+        <el-dialog :title="isAdd ? '新增' : '新增'" v-model="visible_add" width="900px" destroy-on-close
             :close-on-click-modal="false" @close="closeDialog">
-            <TableEdit :form-data="rowData" :options="options" :edit="isAdd" :update="addData" />
+            <TableEdit :form-data="rowData" :options="options" :edit="isAdd" :update="handleAddPermissPolicy" />
         </el-dialog>
         <el-dialog title="查看详情" v-model="visible1" width="700px" destroy-on-close>
             <TableDetail :data="viewData"></TableDetail>
@@ -38,7 +38,6 @@
                  <div v-if="permiss_policy_check_res.ID">
                     <p>匹配到的权限策略：{{ permiss_policy_check_res.name }}</p>
                     <p>描述信息：{{ permiss_policy_check_res.info }}</p>
-                    <p>Redis权限：{{ permiss_policy_check_res.redis>0 ? '有' : '无' }}</p>
                  </div>
             </div>
         </el-dialog>
@@ -49,6 +48,7 @@
 import { onMounted,ref, reactive } from 'vue';
 import { CirclePlusFilled,Search } from '@element-plus/icons-vue';
 import {PermissPolicyResponseData, PolicyUserRange} from '@/types/permiss_policy';
+import {getAllDefaultUsers} from '@/api/user';
 import {GetPermissPolicyService, DelPermissPolicyService, UpdatePermissPolicyService, AddPermissPolicyService} from '@/api/permiss_policy';
 import { ElMessage } from 'element-plus';
 import { FormOption, FormOptionList } from '@/types/form-option';
@@ -95,12 +95,34 @@ const closeDialog = () => {
     isEdit.value = false;
 };
 
-const handleAddPermissPolicy = async () => {
+
+const handleAddPermissPolicy = async (data) => {
+    if (data.upload_size && isNaN(Number(data.upload_size))) {
+        ElMessage.error('单个上传大小必须是数字');
+        return;
+    }
+    if (data.upload_max_size && isNaN(Number(data.upload_max_size))) {
+        ElMessage.error('总上传大小必须是数字');
+        return;
+    }
     // 添加权限策略
     let req = {
-        "policy_name": "测试策略",
+        "policy_name": data.name,
-        "user_range": [{'id':1}]
+        "policy_info": data.info,
+        "user_range": [],
+        "redis": data.redis > 0 ? 1 : -1,
+        "run_shell": data.run_shell  > 0 ? 1 : -1,
+        "upload": data.upload > 0 ? 1 : -1,
+        "cid": data.cid > 0? 1 : -1,
+        "file": data.file > 0? 1 : -1,
+        "device": data.device > 0 ? 1 : -1,
+        "upload_size": data.upload_size > 0 ? parseInt(data.upload_size) : 0,
+        "upload_max_size": data.upload_max_size > 0 ? parseInt(data.upload_max_size) : 0,
+        "send_mail": data.send_mail > 0 ? 1 : -1,
     };
+    for(let i=0;i<data.range.length;i++){
+        req.user_range.push({"id":data.range[i]});
+    }
     try {
         const response = await AddPermissPolicyService(req);
         if (response['code'] !== 0) {
@@ -108,19 +130,65 @@ const handleAddPermissPolicy = async () => {
             return;
         }
         ElMessage.success('添加权限策略成功');
+        visible_add.value = false;
+        GetPermissPolicy();
     } catch (error) {
         console.error('获取权限策略失败:', error);
     }
 
 };
 
-const handleUpdatePermissPolicy = async () => {
+const GetAllDefaultUsers = async () => {
+    try {
+        const response = await getAllDefaultUsers();
+        if (response['code'] !== 0) {
+            console.error('获取默认用户失败:', response["message"]);
+            return;
+        }
+        user_select_opts.value.length = 0;
+        for (let i = 0; i < response.data.length; i++) {
+            let user = response.data[i];
+            console.log("user:", user);
+            user_select_opts.value.push({
+                value: user.id,
+                label: (user.type === 0 ? "user":"group" )+ ":"+user.name
+            });
+        }
+        console.log("user_select_opts:", user_select_opts.value);
+    } catch (error) {
+        console.error('获取默认用户失败:', error);
+    }
+};
+
+GetAllDefaultUsers();
+
+const handleUpdatePermissPolicy = async (data) => {
     // 更新权限策略
     let req = {
-        "id": 1,
+        "id": data.ID,
-        "policy_name": "测试策略",
+        "policy_name": data.name,
-        "user_range": [{'id':1}]
+        "policy_info": data.info,
+        "user_range": [],
+        "redis": data.redis > 0 ? 1 : -1,
+        "run_shell": data.run_shell  > 0 ? 1 : -1,
+        "upload": data.upload > 0 ? 1 : -1,
+        "cid": data.cid > 0? 1 : -1,
+        "file": data.file > 0? 1 : -1,
+        "device": data.device > 0 ? 1 : -1,
+        "upload_size": 0,
+        "upload_max_size": 0,
+        "send_mail": data.send_mail > 0 ? 1 : -1,
     };
+    //upload_size和upload_max_size必须是数字
+    if (data.upload_size > 0) {
+        req.upload_size = parseInt(data.upload_size);
+    }
+    if (data.upload_max_size > 0) {
+        req.upload_max_size = parseInt(data.upload_max_size);
+    }
+    for(let i=0;i<data.range.length;i++){
+        req.user_range.push({"id":data.range[i]});
+    }
         try {
         const response = await UpdatePermissPolicyService(req);
         if (response['code'] !== 0) {
@@ -185,10 +253,12 @@ const GetOnePermissPolicy = async () => {
                 upload_size: temp.policy.upload_size, // 同上
                 upload_max_size: temp.policy.upload_max_size, // 同上
                 send_mail: temp.policy.send_mail, // 发送邮件相关权限
-                range: temp.range,
+                range: temp.range.map(item => item.id),
             };
             permiss_policy_check_res.value = temp_;
 
+            console.log("alldata 1:", addData[0])
+        
     } catch (error) {
         console.error('获取权限策略失败:', error);
     }
@@ -228,7 +298,7 @@ const GetPermissPolicy = async () => {
                 upload_size: temp.policy.upload_size, // 同上
                 upload_max_size: temp.policy.upload_max_size, // 同上
                 send_mail: temp.policy.send_mail, // 发送邮件相关权限
-                range: temp.range,
+                range: temp.range.map(item => item.id),
             };
             allData.value.push(temp_);
         }
@@ -251,10 +321,10 @@ const GetPermissPolicy = async () => {
         loading.value = false;
     }
 };
-const handleEdit = async (row: PolicyUserRange) => {
+const handleEdit = async (row) => {
     let data = row;
+    console.log("edit_row_data:", data);
     rowData.value = data;
-    //console.log("edit_row_data:", rowData.value);
     isEdit.value = true;
     visible.value = true;
 };
@@ -343,12 +413,16 @@ let options = ref<FormOption>({
     list: [
         { type: 'input', label: '名称', prop: 'name', required: true },
         { type: 'input', label: '描述', prop: 'info', required: true },
+        { type: 'input', label: '单个上传大小', prop: 'upload_size', required: true, is_textarea: false },
+        { type: 'input', label: '总上传大小', prop: 'upload_max_size', required: true, is_textarea: false },
         { type: 'select', label: '生效范围', prop: 'range', required: true, opts:user_select_opts.value ,multiple: true},
         { type: 'switch', label: 'Redis权限', prop: 'redis', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '运行Shell权限', prop: 'run_shell', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '上传权限', prop: 'upload', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '设备权限', prop: 'device', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '发送邮件权限', prop: 'send_mail', required: false, activeText: '开启', inactiveText: '关闭' },
+        { type: 'switch', label: 'CID权限', prop: 'cid', required: false, activeText: '开启', inactiveText: '关闭' },
+        { type: 'switch', label: '文件管理权限', prop: 'file', required: false, activeText: '开启', inactiveText: '关闭' },
     ]
 })
 
@@ -359,16 +433,20 @@ let options_edit = ref<FormOption>({
     list: [
         { type: 'input', label: '名称', prop: 'name', required: true },
         { type: 'input', label: '描述', prop: 'info', required: true },
+        { type: 'input', label: '单个上传大小', prop: 'upload_size', required: true },
+        { type: 'input', label: '总上传大小', prop: 'upload_max_size', required: true },
         { type: 'select', label: '生效范围', prop: 'range', required: true, opts:user_select_opts.value ,multiple: true},
         { type: 'switch', label: 'Redis权限', prop: 'redis', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '运行Shell权限', prop: 'run_shell', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '上传权限', prop: 'upload', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '设备权限', prop: 'device', required: false, activeText: '开启', inactiveText: '关闭' },
         { type: 'switch', label: '发送邮件权限', prop: 'send_mail', required: false, activeText: '开启', inactiveText: '关闭' },
+        { type: 'switch', label: 'CID权限', prop: 'cid', required: false, activeText: '开启', inactiveText: '关闭' },
+        { type: 'switch', label: '文件管理权限', prop: 'file', required: false, activeText: '开启', inactiveText: '关闭' },
     ]
 })
 
-const handleView =async (row: Function) => {
+const handleView =async (row) => {
     viewData.value.row = row;
     viewData.value.list = [
         {
@@ -383,6 +461,34 @@ const handleView =async (row: Function) => {
             prop: 'info',
             label: '描述',
         },
+        {
+            prop: 'redis',
+            label: 'Redis权限',
+        },
+        {
+            prop: 'run_shell',
+            label: '运行Shell权限',
+        },
+        {
+            prop: 'upload',
+            label: '上传权限',
+        },
+        {
+            prop: 'device',
+            label: '设备权限',
+        },
+        {
+            prop: 'send_mail',
+            label: '发送邮件权限',
+        },
+        {
+            prop: 'cid',
+            label: 'CID权限',
+        },
+        {
+            prop: 'file',
+            label: '文件管理权限',
+        },
         {
             prop: 'CreatedAt',
             label: '创建时间',
@@ -398,10 +504,9 @@ const handleView =async (row: Function) => {
 };
 
 // 删除相关
-const handleDelete = async (row: PermissPolicyResponseData) => {
+const handleDelete = async (row) => {
     let req={
-        token: localStorage.getItem('token'),
+        id: row.ID,
-        id: row.policy.ID,
     }
     try{
         let result = await DelPermissPolicyService(req);

src/views/system/user.vue

@@ -4,9 +4,10 @@
         <div class="container">
             <TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
                 :delFunc="handleDelete" :changePage="changePage" :currentPage="page.index"  :editFunc="handleEdit">
-                <!-- <template #toolbarBtn>
+                <template #toolbarBtn>
                     <el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
-                </template> -->
+                    <el-button type="primary" @click="visible_system = true">查看组织架构</el-button>
+                </template>
             </TableCustom>
 
         </div>
@@ -14,13 +15,26 @@
             :close-on-click-modal="false" @close="closeDialog">
             <TableEdit :form-data="rowData" :options="options_edit" :edit="isEdit" :update="updateData" />
         </el-dialog>
-        <!-- <el-dialog :title="isAdd ? '新增' : '新增'" v-model="visible_add" width="700px" destroy-on-close
+        <el-dialog :title="isAdd ? '新增' : '新增'" v-model="visible_add" width="700px" destroy-on-close
             :close-on-click-modal="false" @close="closeDialog">
             <TableEdit :form-data="rowData" :options="options" :edit="isAdd" :update="addData" />
-        </el-dialog> -->
+        </el-dialog>
         <el-dialog title="查看详情" v-model="visible1" width="700px" destroy-on-close>
             <TableDetail :data="viewData"></TableDetail>
         </el-dialog>
+
+        <el-dialog title="组织架构" v-model="visible_system" width="700px" destroy-on-close>
+            <div>
+                <el-tree-v2
+                ref="treeRef"
+                style="max-width: 300px"
+                :data="treeData" 
+                :props="treeProps"
+                :filter-method="filterMethod"
+                :height="200"
+            />
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -30,18 +44,71 @@ import { ElMessage } from 'element-plus';
 import { CirclePlusFilled } from '@element-plus/icons-vue';
 import { UserInfo } from '@/types/user';
 import { fetchUserData } from '@/api';
-import { SearchUserService } from "@/api/user";
+import { SearchUserService,AdminAddUserRequestService } from "@/api/user";
 import {GetUserInfoService} from "@/api/user";
 import {updateUserInfoService} from "@/api/user";
 import TableCustom from '@/components/table-custom.vue';
 import TableDetail from '@/components/table-detail.vue';
 import TableSearch from '@/components/table-search.vue';
 import { FormOption, FormOptionList } from '@/types/form-option';
+import {getAllDefaultUsers} from '@/api/user';
 
+const treeData = ref([]);
+const treeProps = ref({
+        id: 'id',       // 节点唯一标识字段（对应数据中的 id）
+        label: 'name',  // 节点显示文本字段（对应数据中的 name）
+        children: 'children' // 子节点数组字段（转换后会添加 children 字段）
+      });
 // 查询相关
 const query = reactive({
     name: '',
 });
+
+const GetAllDefaultUsers = async () => {
+    try {
+        const response = await getAllDefaultUsers();
+        if (response['code'] !== 0) {
+            console.error('获取默认用户失败:', response["message"]);
+            return;
+        }
+        buildTree(response['data']);
+    } catch (error) {
+        console.error('获取默认用户失败:', error);
+    }
+};
+
+GetAllDefaultUsers();
+
+const buildTree = (data) => {
+      // 1. 用 map 存储所有节点（key 为 id，value 为节点对象），方便快速查找父节点
+      const nodeMap = {};
+      data.forEach(node => {
+        // 为每个节点初始化 children 数组（避免后续添加子节点时 undefined 错误）
+        nodeMap[node.id] = { ...node, children: [] };
+      });
+
+      // 2. 遍历所有节点，根据 prev 字段找到父节点，添加到父节点的 children 中
+      const tree = [];
+      Object.values(nodeMap).forEach(node => {
+        const parentId = node["prev"];
+        if (parentId === 0) {
+          // prev 为 0 表示根节点，直接加入树形结构的顶层
+          tree.push(node);
+        } else {
+          // 找到父节点，将当前节点添加到父节点的 children 中
+          const parentNode = nodeMap[parentId];
+          if (parentNode) {
+            parentNode.children.push(node);
+          }
+        }
+      });
+        treeData.value = tree;
+    };
+
+const filterMethod =(node, value) =>{
+      // node 是当前节点对象，value 是过滤输入的值
+      return node.name.toLowerCase().includes(value.toLowerCase());
+    }
 const searchOpt = ref<FormOptionList[]>([
     { type: 'input', label: '用户名或ID：', prop: 'name' }
 ])
@@ -79,6 +146,8 @@ const handleSearch = async () => {
     tableData.value = result.data.slice(start, end);
 };
 
+const visible_system = ref(false);
+
 // 表格相关
 let columns = ref([
     { type: 'index', label: '序号', width: 55, align: 'center' },
@@ -120,6 +189,29 @@ const getData = async () => {
 };
 getData();
 
+const addData = async (data) => {
+    let result ={}
+      try{
+        let req={
+
+            name: data.Name,
+            email: data.Email,
+            password: data.Password,
+        }
+        
+        result = await AdminAddUserRequestService(req);
+        if (result["code"] === 0) {
+            ElMessage.success("新增成功");
+            closeDialog();
+        } else {
+            ElMessage.error("新增失败:"+result["message"]);
+        }
+        }catch(e){
+            console.log(e);
+        }
+    getData();  
+};
+
 const changePage = (val: number) => {
         page.index = val;
     //分页
@@ -142,7 +234,6 @@ let options = ref<FormOption>({
         { type: 'input', label: '用户名', prop: 'Name', required: true },
         { type: 'input', label: '密码', prop: 'Password', required: true },
         { type: 'input', label: '邮箱', prop: 'Email', required: true },
-        { type: 'input', label: '角色', prop: 'Role', required: true },
     ]
 })