From a9e4d032eb46debe2891c09c01cb017901717d37 Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Mon, 17 Nov 2025 08:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/roleapi/postrole.ts            |  37 +
 src/api/system/roleapi/power.ts               |  13 +
 src/api/system/roleapi/types.ts               |  37 +
 .../rolepower/setuprole/setuprolepower.vue    |   3 +
 .../system/monitor/online/index copy 4.vue    | 865 +++++++++++++++++
 src/views/system/monitor/online/index.vue     | 351 +------
 src/views/system/monitor/online/index123.vue  | 903 ++++++++++++++++++
 src/views/system/monitor/online/index2.vue    | 823 ++++++++++++++++
 .../{index copy.vue => index_20251112.vue}    |   0
 src/views/system/monitor/online/page.vue      | 283 ++++++
 .../lowcodepage/pageFlow/appTableFlow.vue     |   2 +-
 ....timestamp-1762732876054-97f8b5f7ef739.mjs | 215 +++++
 12 files changed, 3187 insertions(+), 345 deletions(-)
 create mode 100644 src/api/system/roleapi/power.ts
 create mode 100644 src/views/system/monitor/online/index copy 4.vue
 create mode 100644 src/views/system/monitor/online/index123.vue
 create mode 100644 src/views/system/monitor/online/index2.vue
 rename src/views/system/monitor/online/{index copy.vue => index_20251112.vue} (100%)
 create mode 100644 src/views/system/monitor/online/page.vue
 create mode 100644 vite.config.ts.timestamp-1762732876054-97f8b5f7ef739.mjs

diff --git a/src/api/system/roleapi/postrole.ts b/src/api/system/roleapi/postrole.ts
index e059889..a2e7874 100644
--- a/src/api/system/roleapi/postrole.ts
+++ b/src/api/system/roleapi/postrole.ts
@@ -103,6 +103,13 @@ export function gainAppTableList(data?: any){
 	  data:data
 	});
 }
+export function gainAppTableListNew(data?: any){
+	return request({
+	  url: '/systemapi/grant/gainAppTableListNew',
+	  method: 'post',
+	  data:data
+	});
+}
 /**
  * 获取指定角色授权
  */
@@ -113,3 +120,33 @@ export function setpAppTableForms(data?: any){
 	  data:data
 	});
 }
+/**
+ * 获取首层子行政组织和本组织下的人员
+ */
+export function getMyPeoplceAndSunOrg(data?: any){
+	return request({
+	  url: '/systemapi/authorize/getMyPeoplceAndSunOrg',
+	  method: 'post',
+	  data:data
+	});
+}
+/**
+ * 获取首层子行政组织和本组织下的岗位及人员
+ */
+export function getMyPeopleAndSunOrgPost(data?: any){
+	return request({
+	  url: '/systemapi/authorize/getMyPeopleAndSunOrgPost',
+	  method: 'post',
+	  data:data
+	});
+}
+/**
+ * 获取人员
+ */
+export function getPowerPageUser(data?: any){
+	return request({
+	  url: '/systemapi/authorize/getPowerPageUser',
+	  method: 'post',
+	  data:data
+	});
+}
diff --git a/src/api/system/roleapi/power.ts b/src/api/system/roleapi/power.ts
new file mode 100644
index 0000000..d629c11
--- /dev/null
+++ b/src/api/system/roleapi/power.ts
@@ -0,0 +1,13 @@
+import request from "@/utils/request";
+import { getSystemPower } from "./types";
+
+/**
+ * 获取平台授权项目
+ */
+ export function appPowerUnit(data: getSystemPower){
+    return request({
+      url: '/systemapi/authorize/appPowerUnit',
+      method: 'post',
+      data:data
+    });
+}
diff --git a/src/api/system/roleapi/types.ts b/src/api/system/roleapi/types.ts
index 50ab1cc..630c9af 100644
--- a/src/api/system/roleapi/types.ts
+++ b/src/api/system/roleapi/types.ts
@@ -285,3 +285,40 @@ export interface custerAppTablePower extends  custerAppInfo{
 		attribute:number[]
 	};
 }
+
+//获取平台授权项目
+export interface getSystemPower{
+	powerType:string;
+    appType:string;
+	appSystem:string;
+    roleId:string;
+}
+
+
+// 平台授权结构体
+export interface AppPowerInfo  {
+	id       :number; 
+	name     :string;                                    //菜单名称
+	types    :number;   
+	perm    :number; 
+	sort     :number; 
+	parentId :number; 
+	isTrue   :boolean; 
+}
+
+// 分流
+export interface AppMenuBut extends AppPowerInfo {
+	buttenPower:AppPowerInfo[]
+}
+
+// 平台授权结构树
+export interface AppPowerTree extends AppMenuBut  {
+	children:AppPowerTree[]
+	visible :number;
+	visibleRange:VisibleRangeInfo[]; //当可见范围为自定义范围时。此辅助选项生效
+}
+
+export interface VisibleRangeInfo  {
+	types:number;
+	val:string;
+}
diff --git a/src/views/powermanage/rolepower/setuprole/setuprolepower.vue b/src/views/powermanage/rolepower/setuprole/setuprolepower.vue
index 72a164e..a386767 100644
--- a/src/views/powermanage/rolepower/setuprole/setuprolepower.vue
+++ b/src/views/powermanage/rolepower/setuprole/setuprolepower.vue
@@ -385,6 +385,7 @@ const pickOrgIdClick = () => {
                       v-for="itemes in appList"
                       :class="itemes.signCode == activeAppId ? 'active' : ''"
                       @click="pickAppList(itemes)"
+                      :key="itemes.id"
                     >
                       {{ itemes.name }}
                     </li>
@@ -406,6 +407,7 @@ const pickOrgIdClick = () => {
                       v-for="itemes in appList"
                       :class="itemes.signCode == activeAppId ? 'active' : ''"
                       @click="pickAppList(itemes)"
+                      :key="itemes.id"
                     >
                       {{ itemes.name }}
                     </li>
@@ -590,4 +592,5 @@ const pickOrgIdClick = () => {
     background-color: #a0cfff;
   }
 }
+
 </style>
diff --git a/src/views/system/monitor/online/index copy 4.vue b/src/views/system/monitor/online/index copy 4.vue
new file mode 100644
index 0000000..93caa87
--- /dev/null
+++ b/src/views/system/monitor/online/index copy 4.vue	
@@ -0,0 +1,865 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-10-21 10:06:51
+@ 备注: 在线人数
+-->
+<script lang='ts' setup>
+import { giveRoleTree,editRoleStatus,getOrgPostTree } from '@/api/role/index'
+import type {RoleListTree,RoleFormInfo,orgAndPostisListTree} from '@/api/role/types'
+import type {  TreeNode,TreeInstance  } from 'element-plus'
+import { Search } from '@element-plus/icons-vue'
+import { orgInfo } from "@/api/hr/org/type";
+import { getOrgTreeList } from "@/api/hr/org/index";
+import { appPowerUnit } from "@/api/system/roleapi/power";
+import type { getSystemPower,AppPowerTree } from "@/api/system/roleapi/types";
+import { appTableBut, appListBut } from "@/utils/workflow/const";
+import {
+  gainAppList,
+  gainAppTableListNew
+} from "@/api/system/roleapi/postrole";
+import {
+  custerAppInfo
+} from "@/api/system/roleapi/types";
+
+
+
+import AddRoleGroup from '@/views/system/monitor/online/roleConfig/addRoleGroup.vue'
+import EditRoleGroup from '@/views/system/monitor/online/roleConfig/editRoleGroup.vue'
+
+const squareUrl = ref<string>(
+  "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png"
+);
+const orgTree = ref<orgInfo[]>([])
+const roleGroupOrInfo = ref(1)
+const searchQuery = ref('')
+const orgWorkRole = ref("org")
+const appSysPick = ref("system")
+const treeRef = ref<TreeInstance>()
+const treeRefOrg = ref<TreeInstance>()
+const roleListdata = ref<RoleListTree[]>([])
+const orgPostisListdata = ref<orgAndPostisListTree[]>([])
+const treeBoxHeight = ref(300)
+const treeBoxHeightOrg = ref(300)
+const roleLeft = ref()
+const systemPowerTree = ref<AppPowerTree[]>([])
+const ownerPeople = ref<any>([])
+
+const props = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+const propsOrg = {
+  value: 'id',
+  label: 'name',
+  disabled:'status',
+  children: 'child',
+}
+const propsOrgPost = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+const systemPower = ref<getSystemPower>({
+    powerType:"org",
+    appType:"appsystem",
+    appSystem:"system",
+    roleId:"",
+})
+const roleLoading = ref(false)
+const openRoleGroup = ref(false)
+const orgLoading = ref(false)
+const orgPostLoading = ref(false)
+
+const appList = ref<custerAppInfo[]>([]);
+//搜索角色
+const onQueryChanged = (query: string) => {
+  treeRef.value!.filter(query)
+}
+//搜索行政组织
+const onQueryChangedOrg = (query: string) => {
+  treeRefOrg.value!.filter(query)
+}
+const filterMethod = (query: string, node: any) => node.label!.includes(query)
+const filterMethodOrg = (query: string, node: any) => node.name!.includes(query)
+
+//监测赋权组
+watch(()=>systemPower.value.powerType,(val:string)=>{
+    console.log("监测赋权组",val)
+    getSystemPowerSub();
+    switch(val){
+        case "org":
+            getOrgTreeAry();
+            break;
+        case "job":
+            getOrgPostisTree()
+            break;
+        case "role":
+            getRoleTree();
+            break;
+        default:
+    }
+
+    if(systemPower.value.appSystem=="app"){
+        getAppList();
+    }else{
+        getSystemPowerSub();
+    }
+    
+},{
+    deep:true
+})
+//选中角色节点
+const pickRoleTree = (data:any) => {
+    if(data.status && data.types==1){
+        console.log("监测赋权组------->",data)
+    }
+}
+//选择行政组织
+const pickOrgTree = (data:any) => {
+    console.log("监测赋权组------->",data)
+}
+//获取角色树
+const getRoleTree = () => {
+    roleLoading.value = true
+    giveRoleTree().then(({data})=>{
+        console.log("监测赋权组------->",data)
+        if(Array.isArray(data) && data.length>0){
+            systemPower.value.roleId=data[0].id
+        }
+        roleListdata.value=data;
+        roleLoading.value = false;
+    }).finally(()=>{roleLoading.value = false})
+}
+const editRoleCont = ref<RoleFormInfo>()
+const openEditRoleGroup = ref(false)
+//编辑角色信息
+const editMyInfoIcon = (data:RoleListTree,types:number) => {
+    console.log("编辑角色信息------->",data)
+    console.log("编辑角色信息---types---->",types)
+    switch(types){
+        case 1:
+            editRoleStatusBut(data.id,2)
+            break;
+        case 2:
+            editRoleStatusBut(data.id,1)
+            break;
+        case 3:
+            editRoleCont.value = {
+                id:data.id,
+                name:data.label,
+                type:data.types,
+                superior:data.superior,
+                sort:data.sort
+            }
+            openEditRoleGroup.value = true
+            break;
+        case 4:
+            ElMessageBox.confirm(
+                "您确定要删除此信息吗？一经删除！数据将不可恢复！请慎重操作！",
+                "警告",
+                {
+                    confirmButtonText: '确定删除',
+                    cancelButtonText: '取消删除',
+                    type: 'warning',
+                }
+            ).then(()=>{
+                editRoleStatusBut(data.id,3)
+            })
+            break;            
+        default:
+            break;
+    }
+}
+//编辑角色状态
+const editRoleStatusBut = (id:string|number,types:number) => {
+    // console.log("编辑角色状态--->",id)
+    editRoleStatus({id:id.toString(),status:types}).then((data:any)=>{
+                if(data.code==0){
+                    ElMessage({
+                        message: data.msg,
+                        type: 'success',
+                    })
+                    getRoleTree()
+                }else{
+                    ElMessage({
+                        message: data.msg,
+                        type: 'success',
+                    })
+                }
+            })
+}
+//添加角色组
+const addRoleGroup = (types:number) => {
+    
+    roleGroupOrInfo.value = types
+    openRoleGroup.value = true     
+}
+//获取行政组织树
+const getOrgTreeAry = () => {
+    roleLoading.value = true
+    if(!Array.isArray(orgTree.value) || orgTree.value.length<=0){
+        
+        getOrgTreeList({ orgid: 0 })
+        .then(({ data }) => {
+            if(Array.isArray(data) && data.length>0){
+                systemPower.value.roleId=data[0].id
+            }
+            orgTree.value = data
+            roleLoading.value = false
+        }).finally(()=>{roleLoading.value = false})
+    }else{
+        roleLoading.value = false
+    }
+    
+}
+//获取行政组织及岗位
+const getOrgPostisTree = () => {
+    orgPostLoading.value=true
+    if(!Array.isArray(orgPostisListdata.value) || orgPostisListdata.value.length<=0){
+        
+        getOrgPostTree({id:"313"}).then(({data})=>{
+            console.log("获取行政组织及岗位--------->",data)
+            if(Array.isArray(data) && data.length>0){
+                systemPower.value.roleId=data[0].id
+            }
+            orgPostisListdata.value = data
+            orgPostLoading.value=false
+        }).finally(()=>{orgPostLoading.value=false})
+    }else{
+        orgPostLoading.value=true
+    }
+}
+
+//获取平台授权项目
+const getSystemPowerSub = () => {
+    appPowerUnit(systemPower.value).then(({data})=>{
+        console.log("获取平台授权项目------->",data)
+        systemPowerTree.value = data
+    })
+}
+
+const activeAppId = ref<string>("");
+const appTableList = ref<custerAppTablePower[]>([]);
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 14:20:47
+@ 功能: 获取自定义App
+*/
+const getAppList = () => {
+  gainAppList().then((data: any) => {
+    console.log("获取自定义App", data);
+    appList.value = data.data;
+    if (data.data && data.data.length > 0) {
+      if (data.data[0] && data.data[0].signCode) {
+        activeAppId.value = data.data[0].signCode;
+        getAppTableList();
+      }
+    }
+    console.log("获取自定义App", activeAppId.value);
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 16:00:19
+@ 功能: 获取对应App下边的表单
+*/
+const getAppTableList = () => {
+    systemPower.value.roleId = activeAppId.value
+  gainAppTableListNew({id:activeAppId.value,appType:systemPower.value.appType,powerType:systemPower.value.powerType,roleId:systemPower.value.roleId}).then(
+    (data: any) => {
+      console.log("获取对应App下边的表单", data);
+      if (Array.isArray(data.data)) {
+        appTableList.value = data.data;
+      } else {
+        appTableList.value = [];
+      }
+    }
+  );
+};
+watch(()=>systemPower.value.appSystem,(val:string)=>{
+    if(val=="app"){
+        getAppList();
+    }
+},{
+    immediate:true
+})
+onMounted(()=>{
+    getOrgTreeAry();
+    getSystemPowerSub();
+    console.log("高度-----1---->",roleLeft.value?.offsetHeight)
+    nextTick(()=>{
+        treeBoxHeight.value = roleLeft.value?.offsetHeight - 140
+        treeBoxHeightOrg.value = roleLeft.value?.offsetHeight - 100
+    })
+    
+})
+watch(
+  () => activeAppId.value,
+  (val) => {
+    getAppTableList();
+  },
+  {
+    immediate:true
+  }
+);
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-14 15:01:26
+@ 功能: 选择App数据
+*/
+const pickAppList = (val: custerAppInfo) => {
+  activeAppId.value = val.signCode;
+};
+const systemMenuTreePropsing = {
+  children: "child",
+  label: "name",
+  value: "id",
+};
+</script>
+<template>
+    <div class="roleBox">
+        <div ref="roleLeft" class="roleLeft">
+            <el-tabs v-model="systemPower.powerType" class="demo-tabs">
+                <el-tab-pane label="组织" name="org">
+                    <template #label>
+                        <el-text class="tabsTitle">组织</el-text>
+                    </template>
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的行政组织" :suffix-icon="Search" @input="onQueryChangedOrg"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRefOrg"
+                        style="max-width: 350px;"
+                        :data="orgTree"
+                        :props="propsOrg"
+                        :filter-method="filterMethodOrg"
+                        :height="treeBoxHeightOrg"
+                        v-loading="roleLoading"
+                        :highlight-current="true"
+                        :check-on-click-node="true"
+                        :expand-on-click-node="false"
+                        @node-click="pickOrgTree"
+                    >
+                    </el-tree-v2>
+                </el-tab-pane>
+                <el-tab-pane label="岗位" name="job">
+                    <template #label>
+                        <el-text class="tabsTitle">岗位</el-text>
+                    </template>
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的行政组织" :suffix-icon="Search" @input="onQueryChangedOrg"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRefOrg"
+                        style="max-width: 350px;"
+                        :data="orgPostisListdata"
+                        :props="propsOrgPost"
+                        :filter-method="filterMethodOrg"
+                        :height="treeBoxHeightOrg"
+                        v-loading="orgPostLoading"
+                        :highlight-current="true"
+                        :check-on-click-node="true"
+                        :expand-on-click-node="false"
+                        @node-click="pickOrgTree"
+                    >
+                    </el-tree-v2>
+                </el-tab-pane>
+                <el-tab-pane label="角色" name="role">
+                    <template #label>
+                        <el-text class="tabsTitle">角色</el-text>
+                    </template>
+                    <div class="butBox">
+                        <el-button type="primary" @click="addRoleGroup(1)">新建角色组</el-button>
+                        <el-button type="primary" @click="addRoleGroup(2)">新建角色</el-button>
+                    </div>
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的角色" :suffix-icon="Search" @input="onQueryChanged"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRef"
+                        style="max-width: 350px;"
+                        :data="roleListdata"
+                        :props="props"
+                        :filter-method="filterMethod"
+                        :height="treeBoxHeight"
+                        v-loading="roleLoading"
+                        :highlight-current="true"
+                        :check-on-click-node="true"
+                        :expand-on-click-node="false"
+                        @node-click="pickRoleTree"
+                    >
+                        <template #default="{ node }" >
+                            <div class="treeRoleBox">
+                                <span>{{ node.label }}</span>
+                                <div class="spanButBox">
+                                    <el-text v-if="node.disabled"  type="warning" size="small" @click.stop="editMyInfoIcon(node.data,1)">禁用</el-text>
+                                    <el-text v-else  type="success" size="small" @click.stop="editMyInfoIcon(node.data,2)">启用</el-text>
+                                    <el-text  type="primary" size="small" @click.stop="editMyInfoIcon(node.data,3)">编辑</el-text>
+                                    <el-text  type="danger" size="small" @click.stop="editMyInfoIcon(node.data,4)">删除</el-text>
+                                </div>
+                            </div>
+                        </template>
+                    </el-tree-v2>
+                </el-tab-pane>
+                <el-tab-pane label="个人" name="person">
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的人" :suffix-icon="Search" @input="onQueryChangedOrg"/>
+                    </div>
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+        <div class="roleright">
+            <el-tabs v-model="systemPower.appSystem" class="demo-tabs">
+                <el-tab-pane label="平台" name="system">
+                    <template #label>
+                        <el-text class="tabsTitleCont">平台</el-text>
+                    </template>
+                    
+
+                    <el-container v-if="systemPower.powerType == 'role'">
+                        <el-main>
+
+                            <el-table
+                                :data="systemPowerTree"
+                                style="width: 100%; height: calc(100vh - 277px)"
+                                :cell-style="{ padding: '10px 0' }"
+                                :header-cell-style="{ background: '#F5F7FA', color: '#909399' }"
+                                border
+                            
+                                row-key="id"
+                    
+                            >
+                                <el-table-column fixed prop="name" label="目录/菜单" width="380">
+                                    <template #default="scope">
+                                        <span class="tree_sapn">{{ scope.row.name }}</span>
+                                        <el-tag v-if="scope.row.types === 2" type="warning" size="small">目录</el-tag>
+                                        <el-tag v-if="scope.row.types === 1" type="success" size="small">菜单</el-tag>
+                                        <el-tag v-if="scope.row.types === 4" type="danger" size="small">按钮</el-tag>
+                                        <el-tag v-if="scope.row.types === 3" type="info" size="small">外链</el-tag>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="isTrue" label="授权" width="80" align="center" >
+                                    <template #default="scope">
+                                        <el-checkbox v-model="scope.row.isTrue" label=""  />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="buttenPower" label="操作按钮" >
+                                    <template #header>
+                                        <div class="pickButBox">
+                                            <el-text  >操作按钮</el-text>
+                                            <el-button type="primary" size="small">确定授权</el-button>
+                                        </div>
+                                    </template>
+                                    <template #default="scope">
+                                        <el-checkbox v-for="item in scope.row.buttenPower" :key="item" v-model="scope.row.isTrue" :label="item.name"  />
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+
+
+                        </el-main>
+                        <el-aside width="200px">
+                            <div class="userTitleBox">
+                                <el-text type="info" >使用人员</el-text>
+                                <el-button type="primary" size="small">添加使用人</el-button>
+                            </div>
+                             <el-scrollbar class="scrollBox">
+                            <div class="userBox" v-for="item in ownerPeople" :key="item.id">
+                                 <el-avatar shape="square" :size="size" :src="item.icon?item.icon:squareUrl" />
+                                 <div>
+                                    <el-text type="primary" >{{item.name}}{{ '('+item.code+')' }}</el-text>
+                                    <el-text type="primary" >{{item.orgName}}</el-text>
+                                 </div>
+                            </div>
+                            
+                            </el-scrollbar>
+                        </el-aside>
+                    </el-container>
+
+                    <el-table
+                    v-else
+                                :data="systemPowerTree"
+                                style="width: 100%; height: calc(100vh - 277px)"
+                                :cell-style="{ padding: '10px 0' }"
+                                :header-cell-style="{ background: '#F5F7FA', color: '#909399' }"
+                                border
+                            
+                                row-key="id"
+                    
+                            >
+                                <el-table-column fixed prop="name" label="目录/菜单" width="380" >
+                                    <template #default="scope">
+                                        <span class="tree_sapn">{{ scope.row.name }}</span>
+                                        <el-tag v-if="scope.row.types === 2" type="warning" size="small">目录</el-tag>
+                                        <el-tag v-if="scope.row.types === 1" type="success" size="small">菜单</el-tag>
+                                        <el-tag v-if="scope.row.types === 4" type="danger" size="small">按钮</el-tag>
+                                        <el-tag v-if="scope.row.types === 3" type="info" size="small">外链</el-tag>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="isTrue" label="授权" width="80" align="center" >
+                                    <template #default="scope">
+                                        <el-checkbox v-model="scope.row.isTrue" label=""  />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="buttenPower" label="操作按钮" >
+                                    <template #header>
+                                        <div class="pickButBox">
+                                            <el-text  >操作按钮</el-text>
+                                            <el-button type="primary" size="small">确定授权</el-button>
+                                        </div>
+                                    </template>
+                                    <template #default="scope">
+                                        <el-checkbox v-for="item in scope.row.buttenPower" :key="item" v-model="scope.row.isTrue" :label="item.name"  />
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+
+
+
+                </el-tab-pane>
+                <el-tab-pane label="应用" name="app">
+                    <template #label>
+                        <el-text class="tabsTitleCont">应用</el-text>
+                    </template>
+
+                    
+                    
+                     <table class="table_body">
+                        <thead>
+                            <tr  v-if="systemPower.powerType == 'role'">
+                                <td align="center" width="20%">应用</td>
+                                <td align="center" width="50%">应用详情</td>
+                                <td align="center" width="30%">
+                                    <div class="userTitleBoxes">
+                                        <el-text type="info" >使用人员</el-text>
+                                        <el-button type="primary" size="small">添加使用人</el-button>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr v-else>
+                                <td align="center" width="20%">应用</td>
+                                <td width="80%">
+                                    <div  class="appPickPower">
+                                        应用详情
+                                        <el-button type="primary" size="small">确定授权</el-button>
+                                    </div>
+                                </td>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr >
+                                <td valign="top">
+                                    <el-scrollbar class="tab_pane_box">
+                                        <ul class="appListBox">
+                                            <li v-for="item in appList" :key="item"  @click="pickAppList(item)">{{ item.name }}</li>
+                                        </ul>
+                                    </el-scrollbar>
+                                </td>
+                                <td valign="top">
+                                    <el-row class="row_head">
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                                页面
+                                        </el-col>
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                            表单权力
+                                        </el-col>
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                            列表权限
+                                        </el-col>
+                                        <el-col class="roe_col_head" :span="6">
+                                            数据权限
+                                        </el-col>
+                                    </el-row>
+                                    <el-scrollbar class="tab_pane_body">
+                                        <el-row class="left_right" v-for="item in appTableList" :key="item.id">
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                                {{ item.name }}
+                                            </el-col>
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                                
+                                                <el-checkbox-group v-model="item.tablePower">
+                                                    <el-checkbox
+                                                    v-for="city in appTableBut"
+                                                    :key="city.key"
+                                                    :label="city.label"
+                                                    :value="city.value"
+                                                    >
+                                                    {{ city.label }}
+                                                    </el-checkbox>
+                                                </el-checkbox-group>
+                                            </el-col>
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                              
+                                               <el-checkbox-group v-if="item.istIsTrue" v-model="item.listPower">
+                                                    <el-checkbox
+                                                        v-for="city in appListBut"
+                                                        :key="city.key"
+                                                        :label="city.label"
+                                                        :value="city.value"
+                                                        >
+                                                        {{ city.label }}
+                                                        </el-checkbox>
+                                                    </el-checkbox-group>
+                                            </el-col>
+                                            <el-col  class="roe_col_head" :span="6">
+                                                
+                                                 <el-radio-group
+                                                        v-model="item.datePower.types"
+                                                        @change="pickAppDataPower(item.datePower)"
+                                                    >
+                                                        <el-row>
+                                                        <el-col :span="24"><el-radio :value="1">本人</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="2">本岗位</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="3">本部门</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="4">本分部</el-radio></el-col>
+                                                        <el-col :span="24">
+                                                            <el-radio :value="5">指定行政组织</el-radio>
+                                                            <el-tree-select
+                                                                v-if="item.datePower.types == 5"
+                                                                v-model="item.datePower.attribute"
+                                                                :data="orgTree"
+                                                                style="width: 100%"
+                                                                node-key="id"
+                                                                :props="systemMenuTreePropsing"
+                                                                clearable
+                                                                multiple
+                                                                :render-after-expand="false"
+                                                                show-checkbox
+                                                                collapse-tags
+                                                                collapse-tags-tooltip
+                                                            />
+                                                        </el-col>
+                                                        <el-col :span="24"><el-radio :value="6">所有</el-radio></el-col>
+                                                        </el-row>
+                                                    </el-radio-group>
+                                            </el-col>
+                                        </el-row>
+                                    </el-scrollbar>
+                                </td>
+                                <td v-if="systemPower.powerType == 'role'"  valign="top">
+                                    <el-scrollbar class="tab_pane_bodyes">
+                                        <div class="userBox" v-for="item in 30" :key="item.id">
+                                            <el-avatar shape="square" :size="size" :src="item.icon?item.icon:squareUrl" />
+                                            <div>
+                                                <el-text type="primary" >{{item.name}}{{ '('+item.code+')' }}</el-text>
+                                                <el-text type="primary" >{{item.orgName}}</el-text>
+                                            </div>
+                                        </div>
+                                        
+                                    </el-scrollbar>
+
+                                </td>
+                            </tr>
+                            
+                        </tbody>
+                    </table>
+
+
+
+
+
+
+
+
+
+
+
+
+
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+        <AddRoleGroup v-if="openRoleGroup" v-model:show="openRoleGroup" :group-info="roleGroupOrInfo" @resthandel="getRoleTree" />
+        <EditRoleGroup v-if="openEditRoleGroup" v-model:show="openEditRoleGroup" :group-info="roleGroupOrInfo" :data="editRoleCont" @resthandel="getRoleTree" />
+    </div>
+</template>
+<style  lang='scss' scoped>
+.roleBox{
+    display: flex;
+    width: 100%;
+    height: calc(100vh - 170px);
+    padding: 15px 20px 0 20px;
+    justify-content: space-between;
+    .roleLeft{
+        width: 350px;
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        .butBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0 10px 10px 10px;
+        }
+        .searchBox{
+            padding: 0 10px 10px 10px;
+        }
+        .treeBox{
+            height: calc(100vh - 330px);
+            
+        }
+    }
+    .roleright{
+        width: calc(100% - 370px);
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        overflow: hidden;
+        :deep .el-tabs__content{
+            padding: 15px 15px  15px  0px;
+        }
+        :deep .el-main{
+            padding: 0 15px;
+        }
+        
+        .userTitleBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0px 0px 15px 0px;
+            border-bottom: 1px solid rgba($color: #000000, $alpha: 0.2);
+        }
+        .userTitleBoxes{
+            display: flex;
+            justify-content: space-between;
+        }
+        .pickButBox{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .scrollBox{
+            margin-top: 5px;
+            height: calc(100vh - 320px);
+        }
+        .userBox{
+            width: 100%;
+            height: 50px;
+            display: flex;
+            align-items: center;
+            justify-items: space-between;
+            border-bottom: 1px dashed rgba($color: #000000, $alpha: 0.2);
+            div{
+                span{
+                    display: flex;
+                    width: 100%;
+                    padding: 0 5px;
+                    color:rgba($color: #000000, $alpha: 0.6);
+                }
+            }
+        }
+    }
+    .tabsTitle{
+        padding: 0 15px;
+    }
+    .tabsTitleCont{
+        padding: 0 35px;
+    }
+    .treeRoleBox{
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        align-items: center;
+    }
+    .spanButBox{
+        span{
+            padding: 0 5px;
+        }
+    }
+}
+.tree_sapn {
+  padding: 0 10px 0 0;
+}
+
+
+.table_body {
+  background-color: #ffffff;
+  width: 100%;
+  border-collapse: collapse;
+  /*
+       * 设置边框
+       */
+  td,
+  th {
+    border: 1px solid #cccccc;
+    padding: 5px;
+    table {
+      width: 100%;
+      td,
+      th {
+        border: 0px solid #cccccc;
+        padding: 0px;
+      }
+    }
+  }
+}
+
+.appListBox {
+  width: 100%;
+  li {
+    padding: 10px 2px;
+    border-bottom: 1px solid #ececec;
+    cursor: pointer;
+  }
+  li.active {
+    background-color: #a0cfff;
+  }
+}
+.tab_pane_box {
+  height: calc(100vh - 310px);
+  overflow: hidden;
+  overflow-y: auto;
+    .table_body {
+        background-color: #ffffff;
+        width: 100%;
+        border-collapse: collapse;
+        /*
+            * 设置边框
+            */
+        td,
+        th {
+            border: 1px solid #cccccc;
+            padding: 5px;
+            table {
+            width: 100%;
+            td,
+            th {
+                border: 0px solid #cccccc;
+                padding: 0px;
+            }
+            }
+        }
+    }
+}
+.row_head{
+    background-color: #f5f7fa;
+    color: #000000;
+    text-align: center;
+    border: 1px solid #E4E7ED;
+}
+.roe_col_head{
+    padding: 5px 5px;
+}
+.left_right{
+    border-left: 1px solid #E4E7ED;
+    border-right: 1px solid #E4E7ED;
+    border-bottom: 1px solid #E4E7ED;
+}
+.left_line{
+    border-right: 1px solid #E4E7ED;
+}
+.tab_pane_body {
+  height: calc(100vh - 340px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.tab_pane_bodyes {
+  height: calc(100vh - 320px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.appPickPower{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+</style>
diff --git a/src/views/system/monitor/online/index.vue b/src/views/system/monitor/online/index.vue
index 47d6d78..08db74b 100644
--- a/src/views/system/monitor/online/index.vue
+++ b/src/views/system/monitor/online/index.vue
@@ -1,355 +1,18 @@
 <!--
 @ 作者: 秦东
-@ 时间: 2025-10-21 10:06:51
-@ 备注: 在线人数
+@ 时间: 2025-11-17 08:08:01
+@ 备注: 
 -->
 <script lang='ts' setup>
-import { giveRoleTree,editRoleStatus,getOrgPostTree } from '@/api/role/index'
-import type {RoleListTree,RoleFormInfo,orgAndPostisListTree} from '@/api/role/types'
-import type {  TreeNode,TreeInstance  } from 'element-plus'
-import { Search } from '@element-plus/icons-vue'
-import { orgInfo } from "@/api/hr/org/type";
-import { getOrgTreeList } from "@/api/hr/org/index";
 
-import AddRoleGroup from '@/views/system/monitor/online/roleConfig/addRoleGroup.vue'
-import EditRoleGroup from '@/views/system/monitor/online/roleConfig/editRoleGroup.vue'
-
-const orgTree = ref<orgInfo[]>([])
-const roleGroupOrInfo = ref(1)
-const searchQuery = ref('')
-const orgWorkRole = ref("org")
-const appSysPick = ref("system")
-const treeRef = ref<TreeInstance>()
-const treeRefOrg = ref<TreeInstance>()
-const roleListdata = ref<RoleListTree[]>([])
-const orgPostisListdata = ref<orgAndPostisListTree[]>([])
-const treeBoxHeight = ref(300)
-const treeBoxHeightOrg = ref(300)
-const roleLeft = ref()
-const props = {
-  value: 'id',
-  label: 'label',
-  disabled:'status',
-  children: 'children',
-}
-const propsOrg = {
-  value: 'id',
-  label: 'name',
-  disabled:'status',
-  children: 'child',
-}
-const propsOrgPost = {
-  value: 'id',
-  label: 'label',
-  disabled:'status',
-  children: 'children',
-}
-const roleLoading = ref(false)
-const openRoleGroup = ref(false)
-const orgLoading = ref(false)
-const orgPostLoading = ref(false)
-//搜索角色
-const onQueryChanged = (query: string) => {
-  treeRef.value!.filter(query)
-}
-//搜索行政组织
-const onQueryChangedOrg = (query: string) => {
-  treeRefOrg.value!.filter(query)
-}
-const filterMethod = (query: string, node: any) => node.label!.includes(query)
-const filterMethodOrg = (query: string, node: any) => node.name!.includes(query)
-
-//监测赋权组
-watch(()=>orgWorkRole.value,(val:string)=>{
-    console.log("监测赋权组",val)
-    switch(val){
-        case "org":
-            getOrgTreeAry();
-            break;
-        case "job":
-            getOrgPostisTree()
-            break;
-        case "role":
-            getRoleTree();
-            break;
-        default:
-    }
-},{
-    deep:true
-})
-//选中角色节点
-const pickRoleTree = (data:any) => {
-    if(data.status && data.types==1){
-        console.log("监测赋权组------->",data)
-    }
-}
-//选择行政组织
-const pickOrgTree = (data:any) => {
-    console.log("监测赋权组------->",data)
-}
-//获取角色树
-const getRoleTree = () => {
-    roleLoading.value = true
-    giveRoleTree().then(({data})=>{
-        console.log("监测赋权组------->",data)
-        roleListdata.value=data;
-        roleLoading.value = false;
-    }).finally(()=>{roleLoading.value = false})
-}
-const editRoleCont = ref<RoleFormInfo>()
-const openEditRoleGroup = ref(false)
-//编辑角色信息
-const editMyInfoIcon = (data:RoleListTree,types:number) => {
-    console.log("编辑角色信息------->",data)
-    console.log("编辑角色信息---types---->",types)
-    switch(types){
-        case 1:
-            editRoleStatusBut(data.id,2)
-            break;
-        case 2:
-            editRoleStatusBut(data.id,1)
-            break;
-        case 3:
-            editRoleCont.value = {
-                id:data.id,
-                name:data.label,
-                type:data.types,
-                superior:data.superior,
-                sort:data.sort
-            }
-            openEditRoleGroup.value = true
-            break;
-        case 4:
-            ElMessageBox.confirm(
-                "您确定要删除此信息吗？一经删除！数据将不可恢复！请慎重操作！",
-                "警告",
-                {
-                    confirmButtonText: '确定删除',
-                    cancelButtonText: '取消删除',
-                    type: 'warning',
-                }
-            ).then(()=>{
-                editRoleStatusBut(data.id,3)
-            })
-            break;            
-        default:
-            break;
-    }
-}
-//编辑角色状态
-const editRoleStatusBut = (id:string|number,types:number) => {
-    // console.log("编辑角色状态--->",id)
-    editRoleStatus({id:id.toString(),status:types}).then((data:any)=>{
-                if(data.code==0){
-                    ElMessage({
-                        message: data.msg,
-                        type: 'success',
-                    })
-                    getRoleTree()
-                }else{
-                    ElMessage({
-                        message: data.msg,
-                        type: 'success',
-                    })
-                }
-            })
-}
-//添加角色组
-const addRoleGroup = (types:number) => {
-    
-    roleGroupOrInfo.value = types
-    openRoleGroup.value = true     
-}
-//获取行政组织树
-const getOrgTreeAry = () => {
-    roleLoading.value = true
-    if(!Array.isArray(orgTree.value) || orgTree.value.length<=0){
-        
-        getOrgTreeList({ orgid: 0 })
-        .then(({ data }) => {
-            orgTree.value = data
-            roleLoading.value = false
-        }).finally(()=>{roleLoading.value = false})
-    }else{
-        roleLoading.value = false
-    }
-    
-}
-//获取行政组织及岗位
-const getOrgPostisTree = () => {
-    orgPostLoading.value=true
-    if(!Array.isArray(orgPostisListdata.value) || orgPostisListdata.value.length<=0){
-        
-        getOrgPostTree({id:"313"}).then(({data})=>{
-            console.log("获取行政组织及岗位--------->",data)
-            orgPostisListdata.value = data
-            orgPostLoading.value=false
-        }).finally(()=>{orgPostLoading.value=false})
-    }else{
-        orgPostLoading.value=true
-    }
-}
-onMounted(()=>{
-    getOrgTreeAry();
-    console.log("高度-----1---->",roleLeft.value?.offsetHeight)
-    nextTick(()=>{
-        treeBoxHeight.value = roleLeft.value?.offsetHeight - 140
-        treeBoxHeightOrg.value = roleLeft.value?.offsetHeight - 100
-    })
-    
-})
 </script>
 <template>
-    <div class="roleBox">
-        <div ref="roleLeft" class="roleLeft">
-            <el-tabs v-model="orgWorkRole" class="demo-tabs">
-                <el-tab-pane label="行政组织" name="org">
-                    <template #label>
-                        <el-text class="tabsTitle">行政组织</el-text>
-                    </template>
-                    <div class="searchBox">
-                        <el-input v-model="searchQuery" placeholder="请输入要查找的行政组织" :suffix-icon="Search" @input="onQueryChangedOrg"/>
-                    </div>
-                    <el-tree-v2
-                        ref="treeRefOrg"
-                        style="max-width: 350px;"
-                        :data="orgTree"
-                        :props="propsOrg"
-                        :filter-method="filterMethodOrg"
-                        :height="treeBoxHeightOrg"
-                        v-loading="roleLoading"
-                        :highlight-current="true"
-                        :check-on-click-node="true"
-                        :expand-on-click-node="false"
-                        @node-click="pickOrgTree"
-                    >
-                    </el-tree-v2>
-                </el-tab-pane>
-                <el-tab-pane label="岗位" name="job">
-                    <template #label>
-                        <el-text class="tabsTitle">岗位</el-text>
-                    </template>
-                    <div class="searchBox">
-                        <el-input v-model="searchQuery" placeholder="请输入要查找的行政组织" :suffix-icon="Search" @input="onQueryChangedOrg"/>
-                    </div>
-                    <el-tree-v2
-                        ref="treeRefOrg"
-                        style="max-width: 350px;"
-                        :data="orgPostisListdata"
-                        :props="propsOrgPost"
-                        :filter-method="filterMethodOrg"
-                        :height="treeBoxHeightOrg"
-                        v-loading="orgPostLoading"
-                        :highlight-current="true"
-                        :check-on-click-node="true"
-                        :expand-on-click-node="false"
-                        @node-click="pickOrgTree"
-                    >
-                    </el-tree-v2>
-                </el-tab-pane>
-                <el-tab-pane label="角色" name="role">
-                    <template #label>
-                        <el-text class="tabsTitle">角色</el-text>
-                    </template>
-                    <div class="butBox">
-                        <el-button type="primary" @click="addRoleGroup(1)">新建角色组</el-button>
-                        <el-button type="primary" @click="addRoleGroup(2)">新建角色</el-button>
-                    </div>
-                    <div class="searchBox">
-                        <el-input v-model="searchQuery" placeholder="请输入要查找的角色" :suffix-icon="Search" @input="onQueryChanged"/>
-                    </div>
-                    <el-tree-v2
-                        ref="treeRef"
-                        style="max-width: 350px;"
-                        :data="roleListdata"
-                        :props="props"
-                        :filter-method="filterMethod"
-                        :height="treeBoxHeight"
-                        v-loading="roleLoading"
-                        :highlight-current="true"
-                        :check-on-click-node="true"
-                        :expand-on-click-node="false"
-                        @node-click="pickRoleTree"
-                    >
-                        <template #default="{ node }" >
-                            <div class="treeRoleBox">
-                                <span>{{ node.label }}</span>
-                                <div class="spanButBox">
-                                    <el-text v-if="node.disabled"  type="warning" size="small" @click.stop="editMyInfoIcon(node.data,1)">禁用</el-text>
-                                    <el-text v-else  type="success" size="small" @click.stop="editMyInfoIcon(node.data,2)">启用</el-text>
-                                    <el-text  type="primary" size="small" @click.stop="editMyInfoIcon(node.data,3)">编辑</el-text>
-                                    <el-text  type="danger" size="small" @click.stop="editMyInfoIcon(node.data,4)">删除</el-text>
-                                </div>
-                            </div>
-                        </template>
-                    </el-tree-v2>
-                </el-tab-pane>
-            </el-tabs>
-        </div>
-        <div class="roleright">
-            <el-tabs v-model="appSysPick" class="demo-tabs">
-                <el-tab-pane label="平台" name="system">
-                    <template #label>
-                        <el-text class="tabsTitleCont">平台</el-text>
-                    </template>
-                </el-tab-pane>
-                <el-tab-pane label="应用" name="app">
-                    <template #label>
-                        <el-text class="tabsTitleCont">应用</el-text>
-                    </template>
-                </el-tab-pane>
-            </el-tabs>
-        </div>
-        <AddRoleGroup v-if="openRoleGroup" v-model:show="openRoleGroup" :group-info="roleGroupOrInfo" @resthandel="getRoleTree" />
-        <EditRoleGroup v-if="openEditRoleGroup" v-model:show="openEditRoleGroup" :group-info="roleGroupOrInfo" :data="editRoleCont" @resthandel="getRoleTree" />
-    </div>
+  <div class="app-content">
+    
+  </div>
 </template>
 <style  lang='scss' scoped>
-.roleBox{
-    display: flex;
-    width: 100%;
-    height: calc(100vh - 170px);
-    padding: 15px 20px 0 20px;
-    justify-content: space-between;
-    .roleLeft{
-        width: 350px;
-        height: calc(100vh - 185px);
-        background-color: #FFFFFF;
-        .butBox{
-            display: flex;
-            justify-content: space-between;
-            padding: 0 10px 10px 10px;
-        }
-        .searchBox{
-            padding: 0 10px 10px 10px;
-        }
-        .treeBox{
-            height: calc(100vh - 330px);
-            
-        }
-    }
-    .roleright{
-        width: calc(100% - 370px);
-        height: calc(100vh - 185px);
-        background-color: #FFFFFF;
-    }
-    .tabsTitle{
-        padding: 0 15px;
-    }
-    .tabsTitleCont{
-        padding: 0 35px;
-    }
-    .treeRoleBox{
-        display: flex;
-        justify-content: space-between;
-        width: 100%;
-        align-items: center;
-    }
-    .spanButBox{
-        span{
-            padding: 0 5px;
-        }
-    }
+.app-content {
+  
 }
-
 </style>
diff --git a/src/views/system/monitor/online/index123.vue b/src/views/system/monitor/online/index123.vue
new file mode 100644
index 0000000..202d4b1
--- /dev/null
+++ b/src/views/system/monitor/online/index123.vue
@@ -0,0 +1,903 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-10-21 10:06:51
+@ 备注: 在线人数
+-->
+<script lang='ts' setup>
+import { giveRoleTree,editRoleStatus,getOrgPostTree } from '@/api/role/index'
+import type {RoleListTree,RoleFormInfo,orgAndPostisListTree} from '@/api/role/types'
+import type {  TreeNode,TreeInstance  } from 'element-plus'
+import { Search } from '@element-plus/icons-vue'
+import { orgInfo } from "@/api/hr/org/type";
+import { getOrgTreeList } from "@/api/hr/org/index";
+import { appPowerUnit } from "@/api/system/roleapi/power";
+import type { getSystemPower,AppPowerTree } from "@/api/system/roleapi/types";
+import { appTableBut, appListBut } from "@/utils/workflow/const";
+import {
+  gainAppList,
+  gainAppTableListNew,
+  getMyPeoplceAndSunOrg,
+  getMyPeopleAndSunOrgPost,
+  getPowerPageUser
+} from "@/api/system/roleapi/postrole";
+import {
+  custerAppInfo
+} from "@/api/system/roleapi/types";
+import type { LoadFunction } from 'element-plus'
+
+
+
+import AddRoleGroup from '@/views/system/monitor/online/roleConfig/addRoleGroup.vue'
+import EditRoleGroup from '@/views/system/monitor/online/roleConfig/editRoleGroup.vue'
+
+const squareUrl = ref<string>(
+  "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png"
+);
+const orgTree = ref<orgInfo[]>([])
+const roleGroupOrInfo = ref(1)
+const searchQuery = ref('')
+const orgWorkRole = ref("org")
+const appSysPick = ref("system")
+const treeRef = ref<TreeInstance>()
+const treeRefOrg = ref<TreeInstance>()
+const roleListdata = ref<RoleListTree[]>([])
+const orgPostisListdata = ref<orgAndPostisListTree[]>([])
+const treeBoxHeight = ref(300)
+const treeBoxHeightOrg = ref(300)
+const roleLeft = ref()
+const systemPowerTree = ref<AppPowerTree[]>([])
+const ownerPeople = ref<any>([])
+
+const props = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+const propsOrg = {
+  value: 'id',
+  label: 'name',
+  disabled:'status',
+  children: 'child',
+}
+const propsOrgPost = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+const searchUser =  reactive({
+    page:1,
+    pageSize:19,
+    name:"",
+    total:0,
+});
+const systemPower = ref<getSystemPower>({
+    powerType:"org",
+    appType:"appsystem",
+    appSystem:"system",
+    roleId:"",
+})
+const roleLoading = ref(false)
+const openRoleGroup = ref(false)
+const orgLoading = ref(false)
+const orgPostLoading = ref(false)
+
+const appList = ref<custerAppInfo[]>([]);
+//搜索角色
+const onQueryChanged = (query: string) => {
+  treeRef.value!.filter(query)
+}
+//搜索行政组织
+const onQueryChangedOrg = (query: string) => {
+//   treeRefOrg.value!.filter(query)
+    searchUser.page = 1
+    searchUser.total = 0
+    fpickUserTabs()
+}
+const filterMethod = (query: string, node: any) => node.label!.includes(query)
+const filterMethodOrg = (query: string, node: any) => node.name!.includes(query)
+
+//监测赋权组
+watch(()=>systemPower.value.powerType,(val:string)=>{
+    console.log("监测赋权组",val)
+    getSystemPowerSub();
+    switch(val){
+        case "org":
+            getOrgTreeAry();
+            break;
+        case "job":
+            getOrgPostisTree()
+            break;
+        case "role":
+            getRoleTree();
+            break;
+        case "person":
+            fpickUserTabs();
+            break;
+        default:
+    }
+
+    if(systemPower.value.appSystem=="app"){
+        getAppList();
+    }else{
+        getSystemPowerSub();
+    }
+    
+},{
+    deep:true
+})
+//选中角色节点
+const pickRoleTree = (data:any) => {
+    if(data.status && data.types==1){
+        console.log("监测赋权组------->",data)
+    }
+}
+//选择行政组织
+const pickOrgTree = (data:any) => {
+    console.log("监测赋权组------->",data)
+}
+//获取角色树
+const getRoleTree = () => {
+    roleLoading.value = true
+    giveRoleTree().then(({data})=>{
+        console.log("监测赋权组------->",data)
+        if(Array.isArray(data) && data.length>0){
+            systemPower.value.roleId=data[0].id
+        }
+        roleListdata.value=data;
+        roleLoading.value = false;
+    }).finally(()=>{roleLoading.value = false})
+}
+const editRoleCont = ref<RoleFormInfo>()
+const openEditRoleGroup = ref(false)
+//编辑角色信息
+const editMyInfoIcon = (data:RoleListTree,types:number) => {
+    console.log("编辑角色信息------->",data)
+    console.log("编辑角色信息---types---->",types)
+    switch(types){
+        case 1:
+            editRoleStatusBut(data.id,2)
+            break;
+        case 2:
+            editRoleStatusBut(data.id,1)
+            break;
+        case 3:
+            editRoleCont.value = {
+                id:data.id,
+                name:data.label,
+                type:data.types,
+                superior:data.superior,
+                sort:data.sort
+            }
+            openEditRoleGroup.value = true
+            break;
+        case 4:
+            ElMessageBox.confirm(
+                "您确定要删除此信息吗？一经删除！数据将不可恢复！请慎重操作！",
+                "警告",
+                {
+                    confirmButtonText: '确定删除',
+                    cancelButtonText: '取消删除',
+                    type: 'warning',
+                }
+            ).then(()=>{
+                editRoleStatusBut(data.id,3)
+            })
+            break;            
+        default:
+            break;
+    }
+}
+//编辑角色状态
+const editRoleStatusBut = (id:string|number,types:number) => {
+    // console.log("编辑角色状态--->",id)
+    editRoleStatus({id:id.toString(),status:types}).then((data:any)=>{
+                if(data.code==0){
+                    ElMessage({
+                        message: data.msg,
+                        type: 'success',
+                    })
+                    getRoleTree()
+                }else{
+                    ElMessage({
+                        message: data.msg,
+                        type: 'success',
+                    })
+                }
+            })
+}
+//添加角色组
+const addRoleGroup = (types:number) => {
+    
+    roleGroupOrInfo.value = types
+    openRoleGroup.value = true     
+}
+//获取行政组织树
+const getOrgTreeAry = () => {
+    roleLoading.value = true
+    if(!Array.isArray(orgTree.value) || orgTree.value.length<=0){
+        
+        getOrgTreeList({ orgid: 0 })
+        .then(({ data }) => {
+            if(Array.isArray(data) && data.length>0){
+                systemPower.value.roleId=data[0].id
+            }
+            orgTree.value = data
+            roleLoading.value = false
+        }).finally(()=>{roleLoading.value = false})
+    }else{
+        roleLoading.value = false
+    }
+    
+}
+//获取行政组织及岗位
+const getOrgPostisTree = () => {
+    orgPostLoading.value=true
+    if(!Array.isArray(orgPostisListdata.value) || orgPostisListdata.value.length<=0){
+        
+        getOrgPostTree({id:"313"}).then(({data})=>{
+            console.log("获取行政组织及岗位--------->",data)
+            if(Array.isArray(data) && data.length>0){
+                systemPower.value.roleId=data[0].id
+            }
+            orgPostisListdata.value = data
+            orgPostLoading.value=false
+        }).finally(()=>{orgPostLoading.value=false})
+    }else{
+        orgPostLoading.value=true
+    }
+}
+
+//获取平台授权项目
+const getSystemPowerSub = () => {
+    appPowerUnit(systemPower.value).then(({data})=>{
+        console.log("获取平台授权项目------->",data)
+        systemPowerTree.value = data
+    })
+}
+
+const activeAppId = ref<string>("");
+const appTableList = ref<custerAppTablePower[]>([]);
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 14:20:47
+@ 功能: 获取自定义App
+*/
+const getAppList = () => {
+  gainAppList().then((data: any) => {
+    console.log("获取自定义App", data);
+    appList.value = data.data;
+    if (data.data && data.data.length > 0) {
+      if (data.data[0] && data.data[0].signCode) {
+        activeAppId.value = data.data[0].signCode;
+        getAppTableList();
+      }
+    }
+    console.log("获取自定义App", activeAppId.value);
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 16:00:19
+@ 功能: 获取对应App下边的表单
+*/
+const getAppTableList = () => {
+    systemPower.value.roleId = activeAppId.value
+  gainAppTableListNew({id:activeAppId.value,appType:systemPower.value.appType,powerType:systemPower.value.powerType,roleId:systemPower.value.roleId}).then(
+    (data: any) => {
+      console.log("获取对应App下边的表单", data);
+      if (Array.isArray(data.data)) {
+        appTableList.value = data.data;
+      } else {
+        appTableList.value = [];
+      }
+    }
+  );
+};
+watch(()=>systemPower.value.appSystem,(val:string)=>{
+    if(val=="app"){
+        getAppList();
+    }
+},{
+    immediate:true
+})
+onMounted(()=>{
+    // getOrgTreeAry();
+    getSystemPowerSub();
+    console.log("高度-----1---->",roleLeft.value?.offsetHeight)
+    nextTick(()=>{
+        treeBoxHeight.value = roleLeft.value?.offsetHeight - 140
+        treeBoxHeightOrg.value = roleLeft.value?.offsetHeight - 100
+    })
+    
+})
+watch(
+  () => activeAppId.value,
+  (val) => {
+    getAppTableList();
+  },
+  {
+    immediate:true
+  }
+);
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-14 15:01:26
+@ 功能: 选择App数据
+*/
+const pickAppList = (val: custerAppInfo) => {
+  activeAppId.value = val.signCode;
+};
+const systemMenuTreePropsing = {
+  children: "child",
+  label: "name",
+  value: "id",
+};
+interface Tree {
+  name: string
+  leaf?: boolean
+}
+
+const propsLoading = {
+  label: 'name',
+  children: 'zones',
+  isLeaf: 'isLeaf',
+}
+const loadNode: LoadFunction<Tree> = (node, resolve, reject) => {
+    console.log("node============>",node)
+     console.log("resolve===>",resolve)
+  if (node.level === 0) {
+    getMyPeoplceAndSunOrg({id:"313",level:node.level}).then((res) => {
+        console.log("res================>",res)
+        resolve(res.data)
+    })
+  } 
+
+  if (node.level > 0){
+    getMyPeoplceAndSunOrg({id:node.data.id.toString(),level:1}).then((res) => {
+        console.log("res=========1=======>",res.data) 
+        if(res.data && Array.isArray(res.data) && res.data.length > 0){
+            resolve(res.data)
+        }else{
+            resolve([])
+        }
+    }).catch(() => {
+        return reject()
+    })
+  }
+}
+
+const loadNodePost: LoadFunction<Tree> = (node, resolve, reject) => {
+    console.log("node============>",node)
+     console.log("resolve===>",resolve)
+  if (node.level === 0) {
+    getMyPeopleAndSunOrgPost({id:"313",level:node.level,types:node.data.types}).then((res) => {
+        console.log("res================>",res)
+        resolve(res.data)
+    })
+  } 
+
+  if (node.level > 0){
+    getMyPeopleAndSunOrgPost({id:node.data.id.toString(),level:1,types:node.data.types}).then((res) => {
+        console.log("res=========1=======>",res.data) 
+        if(res.data && Array.isArray(res.data) && res.data.length > 0){
+            resolve(res.data)
+        }else{
+            resolve([])
+        }
+    }).catch(() => {
+        return reject()
+    })
+  }
+}
+//获取人员信息
+const fpickUserTabs = () => {
+    getPowerPageUser(searchUser).then((res) => {
+        console.log("res================>",res)
+        ownerPeople.value = res.data.list
+        searchUser.total = res.data.total
+    })
+}
+//分页
+const pageCurrentChange = (val:number) => {
+    searchUser.page = val
+    fpickUserTabs()
+}
+</script>
+<template>
+    <div class="roleBox">
+        <div ref="roleLeft" class="roleLeft">
+            <el-tabs v-model="systemPower.powerType" class="demo-tabs">
+                <el-tab-pane label="组织" name="org">
+                    <template #label>
+                        <el-text class="tabsTitle">组织</el-text>
+                    </template>
+                    <el-scrollbar class="tab_pane_bodyLoading">
+                        <el-tree
+                            ref="treeRefOrg"
+                            style="max-width: 350px;"
+                            :props="propsLoading"
+                            :load="loadNode"
+                            :highlight-current="true"
+                            :expand-on-click-node="false"
+                            :filter-method="filterMethodOrg"
+                            :height="treeBoxHeightOrg"
+                            node-key="id"
+                            lazy
+                            show-checkbox
+                            @node-click="pickOrgTree"
+                        />                                                              
+                    </el-scrollbar>
+                </el-tab-pane>
+                <el-tab-pane label="岗位" name="job">
+                    <template #label>
+                        <el-text class="tabsTitle">岗位</el-text>
+                    </template>
+                    <el-scrollbar class="tab_pane_bodyLoading">
+                        <el-tree
+                            ref="treeRefOrg"
+                            style="max-width: 350px;"
+                            :props="propsLoading"
+                            :load="loadNodePost"
+                            :highlight-current="true"
+                            :expand-on-click-node="false"
+                            :filter-method="filterMethodOrg"
+                            :height="treeBoxHeightOrg"
+                            node-key="id"
+                            lazy
+                            show-checkbox
+                            @node-click="pickOrgTree"
+                        />                                                              
+                    </el-scrollbar>
+                    
+                </el-tab-pane>
+                <el-tab-pane label="角色" name="role">
+                    <template #label>
+                        <el-text class="tabsTitle">角色</el-text>
+                    </template>
+                    <div class="butBox">
+                        <el-button type="primary" @click="addRoleGroup(1)">新建角色组</el-button>
+                        <el-button type="primary" @click="addRoleGroup(2)">新建角色</el-button>
+                    </div>
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的角色" :suffix-icon="Search" @input="onQueryChanged"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRef"
+                        style="max-width: 350px;"
+                        :data="roleListdata"
+                        :props="props"
+                        :filter-method="filterMethod"
+                        :height="treeBoxHeight"
+                        v-loading="roleLoading"
+                        :highlight-current="true"
+                        :check-on-click-node="true"
+                        :expand-on-click-node="false"
+                        @node-click="pickRoleTree"
+                    >
+                        <template #default="{ node }" >
+                            <div class="treeRoleBox">
+                                <span>{{ node.label }}</span>
+                                <div class="spanButBox">
+                                    <el-text v-if="node.disabled"  type="warning" size="small" @click.stop="editMyInfoIcon(node.data,1)">禁用</el-text>
+                                    <el-text v-else  type="success" size="small" @click.stop="editMyInfoIcon(node.data,2)">启用</el-text>
+                                    <el-text  type="primary" size="small" @click.stop="editMyInfoIcon(node.data,3)">编辑</el-text>
+                                    <el-text  type="danger" size="small" @click.stop="editMyInfoIcon(node.data,4)">删除</el-text>
+                                </div>
+                            </div>
+                        </template>
+                    </el-tree-v2>
+                </el-tab-pane>
+                <el-tab-pane label="个人" name="person">
+                    <div class="searchBox">
+                        <el-input v-model="searchUser.name" placeholder="请输入要查找的人" :suffix-icon="Search" @input="onQueryChangedOrg"/>
+                    </div>
+                    <el-scrollbar class="tab_pane_bodyes">
+                        <div class="userBox" v-for="item in ownerPeople" :key="item.id">
+                            <el-avatar shape="square" :size="size" :src="item.icon?item.icon:squareUrl" />
+                            <div>
+                                <el-text type="primary" >{{item.name}}{{ '('+item.code+')' }}</el-text>
+                                <el-text type="primary" >{{item.org}}</el-text>
+                            </div>
+                        </div>
+                                        
+                    </el-scrollbar>
+                    <div style="width: 100%; display: flex; justify-content: center; margin-top: 5px;">
+                        <el-pagination
+                            :page-size="searchUser.pageSize"
+                            
+                            :pager-count="7"
+                            layout="prev, pager, next"
+                            :total="searchUser.total"
+                            @current-change="pageCurrentChange"
+                        />
+                    </div>
+
+
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+        <div class="roleright">
+            <el-tabs v-model="systemPower.appSystem" class="demo-tabs">
+                <el-tab-pane label="平台" name="system">
+                    <template #label>
+                        <el-text class="tabsTitleCont">平台</el-text>
+                    </template>
+                    
+
+                    
+
+                    <el-table
+
+                                :data="systemPowerTree"
+                                style="width: 100%; height: calc(100vh - 277px)"
+                                :cell-style="{ padding: '10px 0' }"
+                                :header-cell-style="{ background: '#F5F7FA', color: '#909399' }"
+                                border
+                            
+                                row-key="id"
+                    
+                            >
+                                <el-table-column fixed prop="name" label="目录/菜单" width="380" >
+                                    <template #default="scope">
+                                        <span class="tree_sapn">{{ scope.row.name }}</span>
+                                        <el-tag v-if="scope.row.types === 2" type="warning" size="small">目录</el-tag>
+                                        <el-tag v-if="scope.row.types === 1" type="success" size="small">菜单</el-tag>
+                                        <el-tag v-if="scope.row.types === 4" type="danger" size="small">按钮</el-tag>
+                                        <el-tag v-if="scope.row.types === 3" type="info" size="small">外链</el-tag>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="isTrue" label="授权" width="80" align="center" >
+                                    <template #default="scope">
+                                        <el-checkbox v-model="scope.row.isTrue" label=""  />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="buttenPower" label="操作按钮" min-width="380"  >
+                                    <template #header>
+                                        <div class="pickButBox">
+                                            <el-text  >操作按钮</el-text>
+                                            <el-button type="primary" size="small">确定授权</el-button>
+                                        </div>
+                                    </template>
+                                    <template #default="scope">
+                                        <el-checkbox v-for="item in scope.row.buttenPower" :key="item" v-model="scope.row.isTrue" :label="item.name"  />
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+
+
+
+                </el-tab-pane>
+                <el-tab-pane label="应用" name="app">
+                    <template #label>
+                        <el-text class="tabsTitleCont">应用</el-text>
+                    </template>
+
+                    
+                    
+                     <table class="table_body">
+                        <thead>
+                            <tr  v-if="systemPower.powerType == 'role'">
+                                <td align="center" width="20%">应用</td>
+                                <td align="center" width="50%">应用详情</td>
+                            </tr>
+                            <tr v-else>
+                                <td align="center" width="20%">应用</td>
+                                <td width="80%">
+                                    <div  class="appPickPower">
+                                        应用详情
+                                        <el-button type="primary" size="small">确定授权</el-button>
+                                    </div>
+                                </td>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr >
+                                <td valign="top">
+                                    <el-scrollbar class="tab_pane_box">
+                                        <ul class="appListBox">
+                                            <li v-for="item in appList" :key="item"  @click="pickAppList(item)">{{ item.name }}</li>
+                                        </ul>
+                                    </el-scrollbar>
+                                </td>
+                                <td valign="top">
+                                    <el-row class="row_head">
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                                页面
+                                        </el-col>
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                            表单权力
+                                        </el-col>
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                            列表权限
+                                        </el-col>
+                                        <el-col class="roe_col_head" :span="6">
+                                            数据权限
+                                        </el-col>
+                                    </el-row>
+                                    <el-scrollbar class="tab_pane_body">
+                                        <el-row class="left_right" v-for="item in appTableList" :key="item.id">
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                                {{ item.name }}
+                                            </el-col>
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                                
+                                                <el-checkbox-group v-model="item.tablePower">
+                                                    <el-checkbox
+                                                    v-for="city in appTableBut"
+                                                    :key="city.key"
+                                                    :label="city.label"
+                                                    :value="city.value"
+                                                    >
+                                                    {{ city.label }}
+                                                    </el-checkbox>
+                                                </el-checkbox-group>
+                                            </el-col>
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                              
+                                               <el-checkbox-group v-if="item.istIsTrue" v-model="item.listPower">
+                                                    <el-checkbox
+                                                        v-for="city in appListBut"
+                                                        :key="city.key"
+                                                        :label="city.label"
+                                                        :value="city.value"
+                                                        >
+                                                        {{ city.label }}
+                                                        </el-checkbox>
+                                                    </el-checkbox-group>
+                                            </el-col>
+                                            <el-col  class="roe_col_head" :span="6">
+                                                
+                                                 <el-radio-group
+                                                        v-model="item.datePower.types"
+                                                        @change="pickAppDataPower(item.datePower)"
+                                                    >
+                                                        <el-row>
+                                                        <el-col :span="24"><el-radio :value="1">本人</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="2">本岗位</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="3">本部门</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="4">本分部</el-radio></el-col>
+                                                        <el-col :span="24">
+                                                            <el-radio :value="5">指定行政组织</el-radio>
+                                                            <el-tree-select
+                                                                v-if="item.datePower.types == 5"
+                                                                v-model="item.datePower.attribute"
+                                                                :data="orgTree"
+                                                                style="width: 100%"
+                                                                node-key="id"
+                                                                :props="systemMenuTreePropsing"
+                                                                clearable
+                                                                multiple
+                                                                :render-after-expand="false"
+                                                                show-checkbox
+                                                                collapse-tags
+                                                                collapse-tags-tooltip
+                                                            />
+                                                        </el-col>
+                                                        <el-col :span="24"><el-radio :value="6">所有</el-radio></el-col>
+                                                        </el-row>
+                                                    </el-radio-group>
+                                            </el-col>
+                                        </el-row>
+                                    </el-scrollbar>
+                                </td>
+                                
+                            </tr>
+                            
+                        </tbody>
+                    </table>
+
+
+
+
+
+
+
+
+
+
+
+
+
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+        <AddRoleGroup v-if="openRoleGroup" v-model:show="openRoleGroup" :group-info="roleGroupOrInfo" @resthandel="getRoleTree" />
+        <EditRoleGroup v-if="openEditRoleGroup" v-model:show="openEditRoleGroup" :group-info="roleGroupOrInfo" :data="editRoleCont" @resthandel="getRoleTree" />
+    </div>
+</template>
+<style  lang='scss' scoped>
+.roleBox{
+    display: flex;
+    width: 100%;
+    height: calc(100vh - 170px);
+    padding: 15px 20px 0 20px;
+    justify-content: space-between;
+    .roleLeft{
+        width: 350px;
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        .butBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0 10px 10px 10px;
+        }
+        .searchBox{
+            padding: 0 10px 5px 10px;
+        }
+        .treeBox{
+            height: calc(100vh - 330px);
+            
+        }
+    }
+    .roleright{
+        width: calc(100% - 370px);
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        overflow: hidden;
+        :deep .el-tabs__content{
+            padding: 15px 15px  15px  0px;
+        }
+        :deep .el-main{
+            padding: 0 15px;
+        }
+        
+        .userTitleBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0px 0px 15px 0px;
+            border-bottom: 1px solid rgba($color: #000000, $alpha: 0.2);
+        }
+        .userTitleBoxes{
+            display: flex;
+            justify-content: space-between;
+        }
+        .pickButBox{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .scrollBox{
+            margin-top: 5px;
+            height: calc(100vh - 320px);
+        }
+        
+    }
+    .tabsTitle{
+        padding: 0 15px;
+    }
+    .tabsTitleCont{
+        padding: 0 35px;
+    }
+    .treeRoleBox{
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        align-items: center;
+    }
+    .spanButBox{
+        span{
+            padding: 0 5px;
+        }
+    }
+}
+.tree_sapn {
+  padding: 0 10px 0 0;
+}
+
+
+.table_body {
+  background-color: #ffffff;
+  width: 100%;
+  border-collapse: collapse;
+  /*
+       * 设置边框
+       */
+  td,
+  th {
+    border: 1px solid #cccccc;
+    padding: 5px;
+    table {
+      width: 100%;
+      td,
+      th {
+        border: 0px solid #cccccc;
+        padding: 0px;
+      }
+    }
+  }
+}
+
+.appListBox {
+  width: 100%;
+  li {
+    padding: 10px 2px;
+    border-bottom: 1px solid #ececec;
+    cursor: pointer;
+  }
+  li.active {
+    background-color: #a0cfff;
+  }
+}
+.tab_pane_box {
+  height: calc(100vh - 310px);
+  overflow: hidden;
+  overflow-y: auto;
+    .table_body {
+        background-color: #ffffff;
+        width: 100%;
+        border-collapse: collapse;
+        /*
+            * 设置边框
+            */
+        td,
+        th {
+            border: 1px solid #cccccc;
+            padding: 5px;
+            table {
+            width: 100%;
+            td,
+            th {
+                border: 0px solid #cccccc;
+                padding: 0px;
+            }
+            }
+        }
+    }
+}
+.row_head{
+    background-color: #f5f7fa;
+    color: #000000;
+    text-align: center;
+    border: 1px solid #E4E7ED;
+}
+.roe_col_head{
+    padding: 5px 5px;
+}
+.left_right{
+    border-left: 1px solid #E4E7ED;
+    border-right: 1px solid #E4E7ED;
+    border-bottom: 1px solid #E4E7ED;
+}
+.left_line{
+    border-right: 1px solid #E4E7ED;
+}
+.tab_pane_body {
+  height: calc(100vh - 340px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.tab_pane_bodyes {
+  height: calc(100vh - 320px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.tab_pane_bodyLoading {
+  height: calc(100vh - 250px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.appPickPower{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.userBox{
+            width: 100%;
+            min-height: 50px;
+            display: flex;
+            align-items: center;
+            justify-items: space-between;
+            padding: 0 10px;
+            border-bottom: 1px dashed rgba($color: #000000, $alpha: 0.2);
+            div{
+                span{
+                    display: flex;
+                    width: 100%;
+                    padding: 0 5px;
+                    color:rgba($color: #000000, $alpha: 0.6);
+                }
+            }
+}
+</style>
diff --git a/src/views/system/monitor/online/index2.vue b/src/views/system/monitor/online/index2.vue
new file mode 100644
index 0000000..dbe2f5c
--- /dev/null
+++ b/src/views/system/monitor/online/index2.vue
@@ -0,0 +1,823 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-10-21 10:06:51
+@ 备注: 在线人数
+-->
+<script lang='ts' setup>
+import { giveRoleTree,editRoleStatus,getOrgPostTree } from '@/api/role/index'
+import type {RoleListTree,RoleFormInfo,orgAndPostisListTree} from '@/api/role/types'
+import type {  TreeNode,TreeInstance  } from 'element-plus'
+import { Search } from '@element-plus/icons-vue'
+import { orgInfo } from "@/api/hr/org/type";
+import { getOrgTreeList } from "@/api/hr/org/index";
+import { appPowerUnit } from "@/api/system/roleapi/power";
+import type { getSystemPower,AppPowerTree } from "@/api/system/roleapi/types";
+import { appTableBut, appListBut } from "@/utils/workflow/const";
+import {
+  gainAppList,
+  gainAppTableListNew,
+  getMyPeoplceAndSunOrg,
+  getMyPeopleAndSunOrgPost,
+  getPowerPageUser
+} from "@/api/system/roleapi/postrole";
+import {
+  custerAppInfo
+} from "@/api/system/roleapi/types";
+
+
+
+import AddRoleGroup from '@/views/system/monitor/online/roleConfig/addRoleGroup.vue'
+import EditRoleGroup from '@/views/system/monitor/online/roleConfig/editRoleGroup.vue'
+
+const squareUrl = ref<string>(
+  "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png"
+);
+const orgTree = ref<orgInfo[]>([])
+const roleGroupOrInfo = ref(1)
+const searchQuery = ref('')
+const orgWorkRole = ref("org")
+const appSysPick = ref("system")
+const treeRef = ref<TreeInstance>()
+const treeRefOrg = ref<TreeInstance>()
+const treeRefOrgPost = ref<TreeInstance>()
+const roleListdata = ref<RoleListTree[]>([])
+const orgPostisListdata = ref<orgAndPostisListTree[]>([])
+const treeBoxHeight = ref(300)
+const treeBoxHeightOrg = ref(300)
+const roleLeft = ref()
+const systemPowerTree = ref<AppPowerTree[]>([])
+const ownerPeople = ref<any>([])
+
+const props = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+const propsOrg = {
+  value: 'id',
+  label: 'name',
+//   disabled:'status',
+  children: 'child',
+}
+const propsOrgPost = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+const systemPower = ref<getSystemPower>({
+    powerType:"org",
+    appType:"appsystem",
+    appSystem:"system",
+    roleId:"",
+})
+const roleLoading = ref(false)
+const openRoleGroup = ref(false)
+const orgLoading = ref(false)
+const orgPostLoading = ref(false)
+
+const appList = ref<custerAppInfo[]>([]);
+//搜索角色
+const onQueryChanged = (query: string) => {
+  treeRef.value!.filter(query)
+}
+//搜索行政组织
+const onQueryChangedOrg = (query: string) => {
+  treeRefOrg.value!.filter(query)
+}
+const filterMethod = (query: string, node: any) => node.label!.includes(query)
+const filterMethodOrg = (query: string, node: any) => node.label!.includes(query)
+
+//监测赋权组
+watch(()=>systemPower.value.powerType,(val:string)=>{
+    console.log("监测赋权组",val)
+    getSystemPowerSub();
+    switch(val){
+        case "org":
+            getOrgTreeAry();
+            break;
+        case "job":
+            getOrgPostisTree()
+            break;
+        case "role":
+            getRoleTree();
+            break;
+        default:
+    }
+
+    if(systemPower.value.appSystem=="app"){
+        getAppList();
+    }else{
+        getSystemPowerSub();
+    }
+    
+},{
+    deep:true
+})
+//选中角色节点
+const pickRoleTree = (data:any) => {
+    if(data.status && data.types==1){
+        console.log("监测赋权组------->",data)
+    }
+}
+//选择行政组织
+const pickOrgTree = (data:any) => {
+    console.log("监测赋权组------->",data)
+}
+//获取角色树
+const getRoleTree = () => {
+    roleLoading.value = true
+    giveRoleTree().then(({data})=>{
+        console.log("监测赋权组------->",data)
+        if(Array.isArray(data) && data.length>0){
+            systemPower.value.roleId=data[0].id.toString()
+        }
+        roleListdata.value=data;
+        roleLoading.value = false;
+    }).finally(()=>{roleLoading.value = false})
+}
+const editRoleCont = ref<RoleFormInfo>()
+const openEditRoleGroup = ref(false)
+//编辑角色信息
+const editMyInfoIcon = (data:RoleListTree,types:number) => {
+    console.log("编辑角色信息------->",data)
+    console.log("编辑角色信息---types---->",types)
+    switch(types){
+        case 1:
+            editRoleStatusBut(data.id,2)
+            break;
+        case 2:
+            editRoleStatusBut(data.id,1)
+            break;
+        case 3:
+            editRoleCont.value = {
+                id:data.id,
+                name:data.label,
+                type:data.types,
+                superior:data.superior,
+                sort:data.sort
+            }
+            openEditRoleGroup.value = true
+            break;
+        case 4:
+            ElMessageBox.confirm(
+                "您确定要删除此信息吗？一经删除！数据将不可恢复！请慎重操作！",
+                "警告",
+                {
+                    confirmButtonText: '确定删除',
+                    cancelButtonText: '取消删除',
+                    type: 'warning',
+                }
+            ).then(()=>{
+                editRoleStatusBut(data.id,3)
+            })
+            break;            
+        default:
+            break;
+    }
+}
+//编辑角色状态
+const editRoleStatusBut = (id:string|number,types:number) => {
+    // console.log("编辑角色状态--->",id)
+    editRoleStatus({id:id.toString(),status:types}).then((data:any)=>{
+                if(data.code==0){
+                    ElMessage({
+                        message: data.msg,
+                        type: 'success',
+                    })
+                    getRoleTree()
+                }else{
+                    ElMessage({
+                        message: data.msg,
+                        type: 'success',
+                    })
+                }
+            })
+}
+//添加角色组
+const addRoleGroup = (types:number) => {
+    
+    roleGroupOrInfo.value = types
+    openRoleGroup.value = true     
+}
+//获取行政组织树
+const getOrgTreeAry = () => {
+    roleLoading.value = true
+    if(!Array.isArray(orgTree.value) || orgTree.value.length<=0){
+        
+        getOrgTreeList({ orgid: 0 })
+        .then(({ data }) => {
+            if(Array.isArray(data) && data.length>0){
+                systemPower.value.roleId=data[0].id.toString()
+            }
+            orgTree.value = data
+            roleLoading.value = false
+        }).finally(()=>{roleLoading.value = false})
+    }else{
+        roleLoading.value = false
+    }
+    
+}
+//获取行政组织及岗位
+const getOrgPostisTree = () => {
+    orgPostLoading.value=true
+    if(!Array.isArray(orgPostisListdata.value) || orgPostisListdata.value.length<=0){
+        
+        getOrgPostTree({id:"313"}).then(({data})=>{
+            console.log("获取行政组织及岗位--------->",data)
+            if(Array.isArray(data) && data.length>0){
+                systemPower.value.roleId=data[0].id.toString()
+            }
+            orgPostisListdata.value = data
+            orgPostLoading.value=false
+        }).finally(()=>{orgPostLoading.value=false})
+    }else{
+        orgPostLoading.value=true
+    }
+}
+
+//获取平台授权项目
+const getSystemPowerSub = () => {
+    appPowerUnit(systemPower.value).then(({data})=>{
+        console.log("获取平台授权项目------->",data)
+        systemPowerTree.value = data
+    })
+}
+
+const activeAppId = ref<string>("");
+const appTableList = ref<custerAppTablePower[]>([]);
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 14:20:47
+@ 功能: 获取自定义App
+*/
+const getAppList = () => {
+  gainAppList().then((datassssssssssssssssssssssssssssssssssssssssssssssssssssss: any) => {
+    console.log("获取自定义App", data);
+    appList.value = data.data;
+    if (data.data && data.data.length > 0) {
+      if (data.data[0] && data.data[0].signCode) {
+        activeAppId.value = data.data[0].signCode;
+        getAppTableList();
+      }
+    }
+    console.log("获取自定义App", activeAppId.value);
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 16:00:19
+@ 功能: 获取对应App下边的表单
+*/
+const getAppTableList = () => {
+    systemPower.value.roleId = activeAppId.value.toString()
+  gainAppTableListNew({id:activeAppId.value,appType:systemPower.value.appType,powerType:systemPower.value.powerType,roleId:systemPower.value.roleId}).then(
+    (data: any) => {
+      console.log("获取对应App下边的表单", data);
+      if (Array.isArray(data.data)) {
+        appTableList.value = data.data;
+      } else {
+        appTableList.value = [];
+      }
+    }
+  );
+};
+watch(()=>systemPower.value.appSystem,(val:string)=>{
+    if(val=="app"){
+        getAppList();
+    }
+},{
+    immediate:true
+})
+onMounted(()=>{
+    getOrgTreeAry();
+    getSystemPowerSub();
+    console.log("高度-----1---->",roleLeft.value?.offsetHeight)
+    nextTick(()=>{
+        treeBoxHeight.value = roleLeft.value?.offsetHeight - 140
+        treeBoxHeightOrg.value = roleLeft.value?.offsetHeight - 100
+    })
+    
+})
+watch(
+  () => activeAppId.value,
+  (val) => {
+    getAppTableList();
+  },
+  {
+    immediate:true
+  }
+);
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-14 15:01:26
+@ 功能: 选择App数据
+*/
+const pickAppList = (val: custerAppInfo) => {
+  activeAppId.value = val.signCode;
+};
+const systemMenuTreePropsing = {
+  children: "child",
+  label: "name",
+  value: "id",
+};
+
+
+//搜索行政组织岗位
+const onQuedOrg = (query: string) => {
+  treeRefOrgPost.value!.filter(query)
+}
+</script>
+<template>
+    <div class="roleBox">
+        <div ref="roleLeft" class="roleLeft">
+            <el-tabs v-model="systemPower.powerType" class="demo-tabs">
+                <el-tab-pane label="组织" name="org">
+                    <template #label>
+                        <el-text class="tabsTitle">组织</el-text>
+                    </template>
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的行政组织" :suffix-icon="Search" @input="onQueryChangedOrg"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRefOrg"
+                        style="max-width: 350px;"
+                        :data="orgTree"
+                        :props="propsOrg"
+                        :filter-method="filterMethodOrg"
+                        :height="treeBoxHeightOrg"
+                        v-loading="roleLoading"
+                        :highlight-current="true"
+                        :check-on-click-node="true"
+                        :expand-on-click-node="false"
+                          show-checkbox
+                        @node-click="pickOrgTree"
+                    >
+                    </el-tree-v2>
+                </el-tab-pane>
+                <el-tab-pane label="岗位" name="job">
+                    <template #label>
+                        <el-text class="tabsTitle">岗位</el-text>
+                    </template>
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的行政组织" :suffix-icon="Search" @input="onQuedOrg"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRefOrgPost"
+                        style="max-width: 350px;"
+                        :data="orgPostisListdata"
+                        :props="propsOrgPost"
+                        :filter-method="filterMethodOrg"
+                        :height="treeBoxHeightOrg"
+                        v-loading="roleLoading"
+                        :highlight-current="true"
+                        :check-on-click-node="true"
+                        :expand-on-click-node="false"
+                          show-checkbox
+                        @node-click="pickOrgTree"
+                    >
+                    </el-tree-v2>
+                </el-tab-pane>
+                <el-tab-pane label="角色" name="role">
+                    <template #label>
+                        <el-text class="tabsTitle">角色</el-text>
+                    </template>
+                    <div class="butBox">
+                        <el-button type="primary" @click="addRoleGroup(1)">新建角色组</el-button>
+                        <el-button type="primary" @click="addRoleGroup(2)">新建角色</el-button>
+                    </div>
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的角色" :suffix-icon="Search" @input="onQueryChanged"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRef"
+                        style="max-width: 350px;"
+                        :data="roleListdata"
+                        :props="props"
+                        :filter-method="filterMethod"
+                        :height="treeBoxHeight"
+                        v-loading="roleLoading"
+                    
+                        show-checkbox
+                        @node-click="pickRoleTree"
+                    >
+                        <template #default="{ node }" >
+                            <div class="treeRoleBox">
+                                <span>{{ node.label }}</span>
+                                <div class="spanButBox">
+                                    <el-text v-if="node.disabled"  type="warning" size="small" @click.stop="editMyInfoIcon(node.data,1)">禁用</el-text>
+                                    <el-text v-else  type="success" size="small" @click.stop="editMyInfoIcon(node.data,2)">启用</el-text>
+                                    <el-text  type="primary" size="small" @click.stop="editMyInfoIcon(node.data,3)">编辑</el-text>
+                                    <el-text  type="danger" size="small" @click.stop="editMyInfoIcon(node.data,4)">删除</el-text>
+                                </div>
+                            </div>
+                        </template>
+                    </el-tree-v2>
+                </el-tab-pane>
+                <el-tab-pane label="个人" name="person">
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的人" :suffix-icon="Search" @input="onQueryChangedOrg"/>
+                    </div>
+                    <el-scrollbar class="tab_pane_bodyes">
+                                        <div class="userBox" v-for="item in 30" :key="item.id">
+                                            <el-avatar shape="square" :size="size" :src="item.icon?item.icon:squareUrl" />
+                                            <div>
+                                                <el-text type="primary" >{{item.name}}{{ '('+item.code+')' }}</el-text>
+                                                <el-text type="primary" >{{item.orgName}}</el-text>
+                                            </div>
+                                        </div>
+                                        
+                    </el-scrollbar>
+                    <div style="width: 100%; display: flex; justify-content: center; margin-top: 5px;">
+                        <el-pagination
+                            :page-size="19"
+                            :pager-count="7"
+                            layout="prev, pager, next"
+                            :total="2"
+                            
+                        />
+                    </div>
+
+
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+        <div class="roleright">
+            <el-tabs v-model="systemPower.appSystem" class="demo-tabs">
+                <el-tab-pane label="平台" name="system">
+                    <template #label>
+                        <el-text class="tabsTitleCont">平台</el-text>
+                    </template>
+                    
+
+                    
+
+                    <el-table
+
+                                :data="systemPowerTree"
+                                style="width: 100%; height: calc(100vh - 277px)"
+                                :cell-style="{ padding: '10px 0' }"
+                                :header-cell-style="{ background: '#F5F7FA', color: '#909399' }"
+                                border
+                            
+                                row-key="id"
+                    
+                            >
+                                <el-table-column fixed prop="name" label="目录/菜单" width="380" >
+                                    <template #default="scope">
+                                        <span class="tree_sapn">{{ scope.row.name }}</span>
+                                        <el-tag v-if="scope.row.types === 2" type="warning" size="small">目录</el-tag>
+                                        <el-tag v-if="scope.row.types === 1" type="success" size="small">菜单</el-tag>
+                                        <el-tag v-if="scope.row.types === 4" type="danger" size="small">按钮</el-tag>
+                                        <el-tag v-if="scope.row.types === 3" type="info" size="small">外链</el-tag>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="isTrue" label="授权" width="80" align="center" >
+                                    <template #default="scope">
+                                        <el-checkbox v-model="scope.row.isTrue" label=""  />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="buttenPower" label="操作按钮" min-width="380"  >
+                                    <template #header>
+                                        <div class="pickButBox">
+                                            <el-text  >操作按钮</el-text>
+                                            <el-button type="primary" size="small">确定授权</el-button>
+                                        </div>
+                                    </template>
+                                    <template #default="scope">
+                                        <el-checkbox v-for="item in scope.row.buttenPower" :key="item" v-model="scope.row.isTrue" :label="item.name"  />
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+
+
+
+                </el-tab-pane>
+                <el-tab-pane label="应用" name="app">
+                    <template #label>
+                        <el-text class="tabsTitleCont">应用</el-text>
+                    </template>
+
+                    
+                    
+                     <table class="table_body">
+                        <thead>
+                            <tr  v-if="systemPower.powerType == 'role'">
+                                <td align="center" width="20%">应用</td>
+                                <td align="center" width="50%">应用详情</td>
+                            </tr>
+                            <tr v-else>
+                                <td align="center" width="20%">应用</td>
+                                <td width="80%">
+                                    <div  class="appPickPower">
+                                        应用详情
+                                        <el-button type="primary" size="small">确定授权</el-button>
+                                    </div>
+                                </td>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr >
+                                <td valign="top">
+                                    <el-scrollbar class="tab_pane_box">
+                                        <ul class="appListBox">
+                                            <li v-for="item in appList" :key="item"  @click="pickAppList(item)">{{ item.name }}</li>
+                                        </ul>
+                                    </el-scrollbar>
+                                </td>
+                                <td valign="top">
+                                    <el-row class="row_head">
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                                页面
+                                        </el-col>
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                            表单权力
+                                        </el-col>
+                                        <el-col class="roe_col_head left_line" :span="6">
+                                            列表权限
+                                        </el-col>
+                                        <el-col class="roe_col_head" :span="6">
+                                            数据权限
+                                        </el-col>
+                                    </el-row>
+                                    <el-scrollbar class="tab_pane_body">
+                                        <el-row class="left_right" v-for="item in appTableList" :key="item.id">
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                                {{ item.name }}
+                                            </el-col>
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                                
+                                                <el-checkbox-group v-model="item.tablePower">
+                                                    <el-checkbox
+                                                    v-for="city in appTableBut"
+                                                    :key="city.key"
+                                                    :label="city.label"
+                                                    :value="city.value"
+                                                    >
+                                                    {{ city.label }}
+                                                    </el-checkbox>
+                                                </el-checkbox-group>
+                                            </el-col>
+                                            <el-col  class="roe_col_head left_line" :span="6">
+                                              
+                                               <el-checkbox-group v-if="item.istIsTrue" v-model="item.listPower">
+                                                    <el-checkbox
+                                                        v-for="city in appListBut"
+                                                        :key="city.key"
+                                                        :label="city.label"
+                                                        :value="city.value"
+                                                        >
+                                                        {{ city.label }}
+                                                        </el-checkbox>
+                                                    </el-checkbox-group>
+                                            </el-col>
+                                            <el-col  class="roe_col_head" :span="6">
+                                                
+                                                 <el-radio-group
+                                                        v-model="item.datePower.types"
+                                                        @change="pickAppDataPower(item.datePower)"
+                                                    >
+                                                        <el-row>
+                                                        <el-col :span="24"><el-radio :value="1">本人</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="2">本岗位</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="3">本部门</el-radio></el-col>
+                                                        <el-col :span="24"><el-radio :value="4">本分部</el-radio></el-col>
+                                                        <el-col :span="24">
+                                                            <el-radio :value="5">指定行政组织</el-radio>
+                                                            <el-tree-select
+                                                                v-if="item.datePower.types == 5"
+                                                                v-model="item.datePower.attribute"
+                                                                :data="orgTree"
+                                                                style="width: 100%"
+                                                                node-key="id"
+                                                                :props="systemMenuTreePropsing"
+                                                                clearable
+                                                                multiple
+                                                                :render-after-expand="false"
+                                                                show-checkbox
+                                                                collapse-tags
+                                                                collapse-tags-tooltip
+                                                            />
+                                                        </el-col>
+                                                        <el-col :span="24"><el-radio :value="6">所有</el-radio></el-col>
+                                                        </el-row>
+                                                    </el-radio-group>
+                                            </el-col>
+                                        </el-row>
+                                    </el-scrollbar>
+                                </td>
+                                
+                            </tr>
+                            
+                        </tbody>
+                    </table>
+
+
+
+
+
+
+
+
+
+
+
+
+
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+        <AddRoleGroup v-if="openRoleGroup" v-model:show="openRoleGroup" :group-info="roleGroupOrInfo" @resthandel="getRoleTree" />
+        <EditRoleGroup v-if="openEditRoleGroup" v-model:show="openEditRoleGroup" :group-info="roleGroupOrInfo" :data="editRoleCont" @resthandel="getRoleTree" />
+    </div>
+</template>
+<style  lang='scss' scoped>
+.roleBox{
+    display: flex;
+    width: 100%;
+    height: calc(100vh - 170px);
+    padding: 15px 20px 0 20px;
+    justify-content: space-between;
+    .roleLeft{
+        width: 350px;
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        .butBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0 10px 10px 10px;
+        }
+        .searchBox{
+            padding: 0 10px 5px 10px;
+        }
+        .treeBox{
+            height: calc(100vh - 330px);
+            
+        }
+    }
+    .roleright{
+        width: calc(100% - 370px);
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        overflow: hidden;
+        :deep .el-tabs__content{
+            padding: 15px 15px  15px  0px;
+        }
+        :deep .el-main{
+            padding: 0 15px;
+        }
+        
+        .userTitleBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0px 0px 15px 0px;
+            border-bottom: 1px solid rgba($color: #000000, $alpha: 0.2);
+        }
+        .userTitleBoxes{
+            display: flex;
+            justify-content: space-between;
+        }
+        .pickButBox{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .scrollBox{
+            margin-top: 5px;
+            height: calc(100vh - 320px);
+        }
+        
+    }
+    .tabsTitle{
+        padding: 0 15px;
+    }
+    .tabsTitleCont{
+        padding: 0 35px;
+    }
+    .treeRoleBox{
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        align-items: center;
+    }
+    .spanButBox{
+        span{
+            padding: 0 5px;
+        }
+    }
+}
+.tree_sapn {
+  padding: 0 10px 0 0;
+}
+
+
+.table_body {
+  background-color: #ffffff;
+  width: 100%;
+  border-collapse: collapse;
+  /*
+       * 设置边框
+       */
+  td,
+  th {
+    border: 1px solid #cccccc;
+    padding: 5px;
+    table {
+      width: 100%;
+      td,
+      th {
+        border: 0px solid #cccccc;
+        padding: 0px;
+      }
+    }
+  }
+}
+
+.appListBox {
+  width: 100%;
+  li {
+    padding: 10px 2px;
+    border-bottom: 1px solid #ececec;
+    cursor: pointer;
+  }
+  li.active {
+    background-color: #a0cfff;
+  }
+}
+.tab_pane_box {
+  height: calc(100vh - 310px);
+  overflow: hidden;
+  overflow-y: auto;
+    .table_body {
+        background-color: #ffffff;
+        width: 100%;
+        border-collapse: collapse;
+        /*
+            * 设置边框
+            */
+        td,
+        th {
+            border: 1px solid #cccccc;
+            padding: 5px;
+            table {
+            width: 100%;
+            td,
+            th {
+                border: 0px solid #cccccc;
+                padding: 0px;
+            }
+            }
+        }
+    }
+}
+.row_head{
+    background-color: #f5f7fa;
+    color: #000000;
+    text-align: center;
+    border: 1px solid #E4E7ED;
+}
+.roe_col_head{
+    padding: 5px 5px;
+}
+.left_right{
+    border-left: 1px solid #E4E7ED;
+    border-right: 1px solid #E4E7ED;
+    border-bottom: 1px solid #E4E7ED;
+}
+.left_line{
+    border-right: 1px solid #E4E7ED;
+}
+.tab_pane_body {
+  height: calc(100vh - 340px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.tab_pane_bodyes {
+  height: calc(100vh - 320px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.appPickPower{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.userBox{
+            width: 100%;
+            height: 50px;
+            display: flex;
+            align-items: center;
+            justify-items: space-between;
+            padding: 0 10px;
+            border-bottom: 1px dashed rgba($color: #000000, $alpha: 0.2);
+            div{
+                span{
+                    display: flex;
+                    width: 100%;
+                    padding: 0 5px;
+                    color:rgba($color: #000000, $alpha: 0.6);
+                }
+            }
+}
+</style>
diff --git a/src/views/system/monitor/online/index copy.vue b/src/views/system/monitor/online/index_20251112.vue
similarity index 100%
rename from src/views/system/monitor/online/index copy.vue
rename to src/views/system/monitor/online/index_20251112.vue
diff --git a/src/views/system/monitor/online/page.vue b/src/views/system/monitor/online/page.vue
new file mode 100644
index 0000000..bce0bb3
--- /dev/null
+++ b/src/views/system/monitor/online/page.vue
@@ -0,0 +1,283 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-10-21 10:06:51
+@ 备注: 在线人数
+-->
+<script lang='ts' setup>
+
+import {
+  getMyPeoplceAndSunOrg
+} from "@/api/system/roleapi/postrole";
+import type { LoadFunction } from 'element-plus'
+
+interface Tree {
+  name: string
+  leaf?: boolean
+}
+
+const props = {
+  label: 'name',
+  children: 'zones',
+  isLeaf: 'isLeaf',
+}
+let time = 0
+const loadNode: LoadFunction<Tree> = (node, resolve, reject) => {
+    console.log("node============>",node)
+     console.log("resolve===>",resolve)
+  if (node.level === 0) {
+    getMyPeoplceAndSunOrg({id:"313",level:node.level}).then((res) => {
+        console.log("res================>",res)
+        resolve(res.data)
+    })
+  } 
+
+  if (node.level > 0){
+    getMyPeoplceAndSunOrg({id:node.data.id.toString(),level:1}).then((res) => {
+        console.log("res=========1=======>",res.data) 
+        if(res.data && Array.isArray(res.data) && res.data.length > 0){
+            resolve(res.data)
+        }else{
+            resolve([])
+        }
+    }).catch(() => {
+        return reject()
+    })
+  }
+
+
+
+//   time++
+//   if (node.level > 0){
+//     setTimeout(() => {
+
+//         if (time > 3) {
+//             console.log("node.id============>",node.id)
+//             console.log("node.level============>",node.level)
+//             getMyPeoplceAndSunOrg({id:node.data.id.toString(),level:1}).then((res) => {
+//                 console.log("res=========1=======>",res.data)
+//                 // resolve(res.data.data?.map((item: any) => ({
+//                 //     name: item.orgName,
+//                 //     id: item.orgId,
+//                 //     isLeaf: item.isLeaf,
+//                 //     zones: []
+//                 // })) || [])
+//                 if(res.data && Array.isArray(res.data) && res.data.length > 0){
+//                     resolve(res.data)
+//                 }else{
+//                     resolve([])
+//                 }
+//             })
+//         }else{
+//             return reject()
+//         }
+//     }, 3000)
+//   }
+}
+//选择行政组织
+const pickOrgTree = (data:any) => {
+    console.log("监测赋权组------->",data)
+}
+</script>
+<template>
+    <div class="roleBox">
+        <el-tree
+            style="max-width: 100%"
+            :props="props"
+            :load="loadNode"
+            :highlight-current="true"
+            :expand-on-click-node="false"
+            node-key="id"
+            lazy
+            @node-click="pickOrgTree"
+        />
+    </div>
+</template>
+<style  lang='scss' scoped>
+.roleBox{
+    display: flex;
+    width: 100%;
+    height: calc(100vh - 170px);
+    padding: 15px 20px 0 20px;
+    justify-content: space-between;
+    .roleLeft{
+        width: 350px;
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        .butBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0 10px 10px 10px;
+        }
+        .searchBox{
+            padding: 0 10px 5px 10px;
+        }
+        .treeBox{
+            height: calc(100vh - 330px);
+            
+        }
+    }
+    .roleright{
+        width: calc(100% - 370px);
+        height: calc(100vh - 185px);
+        background-color: #FFFFFF;
+        overflow: hidden;
+        :deep .el-tabs__content{
+            padding: 15px 15px  15px  0px;
+        }
+        :deep .el-main{
+            padding: 0 15px;
+        }
+        
+        .userTitleBox{
+            display: flex;
+            justify-content: space-between;
+            padding: 0px 0px 15px 0px;
+            border-bottom: 1px solid rgba($color: #000000, $alpha: 0.2);
+        }
+        .userTitleBoxes{
+            display: flex;
+            justify-content: space-between;
+        }
+        .pickButBox{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .scrollBox{
+            margin-top: 5px;
+            height: calc(100vh - 320px);
+        }
+        
+    }
+    .tabsTitle{
+        padding: 0 15px;
+    }
+    .tabsTitleCont{
+        padding: 0 35px;
+    }
+    .treeRoleBox{
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        align-items: center;
+    }
+    .spanButBox{
+        span{
+            padding: 0 5px;
+        }
+    }
+}
+.tree_sapn {
+  padding: 0 10px 0 0;
+}
+
+
+.table_body {
+  background-color: #ffffff;
+  width: 100%;
+  border-collapse: collapse;
+  /*
+       * 设置边框
+       */
+  td,
+  th {
+    border: 1px solid #cccccc;
+    padding: 5px;
+    table {
+      width: 100%;
+      td,
+      th {
+        border: 0px solid #cccccc;
+        padding: 0px;
+      }
+    }
+  }
+}
+
+.appListBox {
+  width: 100%;
+  li {
+    padding: 10px 2px;
+    border-bottom: 1px solid #ececec;
+    cursor: pointer;
+  }
+  li.active {
+    background-color: #a0cfff;
+  }
+}
+.tab_pane_box {
+  height: calc(100vh - 310px);
+  overflow: hidden;
+  overflow-y: auto;
+    .table_body {
+        background-color: #ffffff;
+        width: 100%;
+        border-collapse: collapse;
+        /*
+            * 设置边框
+            */
+        td,
+        th {
+            border: 1px solid #cccccc;
+            padding: 5px;
+            table {
+            width: 100%;
+            td,
+            th {
+                border: 0px solid #cccccc;
+                padding: 0px;
+            }
+            }
+        }
+    }
+}
+.row_head{
+    background-color: #f5f7fa;
+    color: #000000;
+    text-align: center;
+    border: 1px solid #E4E7ED;
+}
+.roe_col_head{
+    padding: 5px 5px;
+}
+.left_right{
+    border-left: 1px solid #E4E7ED;
+    border-right: 1px solid #E4E7ED;
+    border-bottom: 1px solid #E4E7ED;
+}
+.left_line{
+    border-right: 1px solid #E4E7ED;
+}
+.tab_pane_body {
+  height: calc(100vh - 340px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.tab_pane_bodyes {
+  height: calc(100vh - 320px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+.appPickPower{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.userBox{
+            width: 100%;
+            height: 50px;
+            display: flex;
+            align-items: center;
+            justify-items: space-between;
+            padding: 0 10px;
+            border-bottom: 1px dashed rgba($color: #000000, $alpha: 0.2);
+            div{
+                span{
+                    display: flex;
+                    width: 100%;
+                    padding: 0 5px;
+                    color:rgba($color: #000000, $alpha: 0.6);
+                }
+            }
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
index dc6670c..8e2c7d4 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
@@ -1,7 +1,7 @@
 <!--
 @ 作者: 秦东
 @ 时间: 2024-06-12 10:58:03
-@ 备注: App表单。有无流程处理
+@ 备注: App表单。有无流程处理 
 -->
 <script lang="ts" setup>
 import { nodeFlow, conditionInfo, nodelPeoples,nodePoweInfo } from "@/api/taskapi/types";
diff --git a/vite.config.ts.timestamp-1762732876054-97f8b5f7ef739.mjs b/vite.config.ts.timestamp-1762732876054-97f8b5f7ef739.mjs
new file mode 100644
index 0000000..6ffe830
--- /dev/null
+++ b/vite.config.ts.timestamp-1762732876054-97f8b5f7ef739.mjs
@@ -0,0 +1,215 @@
+// vite.config.ts
+import vue from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import { loadEnv, defineConfig } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite/dist/node/index.js";
+import AutoImport from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-auto-import/dist/vite.js";
+import Components from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/vite.mjs";
+import { ElementPlusResolver } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/resolvers.mjs";
+import Icons from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/vite.mjs";
+import IconsResolver from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/resolver.mjs";
+import { createSvgIconsPlugin } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import UnoCSS from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unocss/dist/vite.mjs";
+import { terser } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/rollup-plugin-terser/rollup-plugin-terser.mjs";
+import path from "path";
+var __vite_injected_original_dirname = "E:\\f_pang\\object\\my_object_html\\ShutongInterconnectedChemicalCloudPlatform";
+var pathSrc = path.resolve(__vite_injected_original_dirname, "src");
+var vite_config_default = defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    resolve: {
+      alias: {
+        "@": pathSrc
+      }
+    },
+    css: {
+      // CSS 预处理器
+      preprocessorOptions: {
+        //define global scss variable
+        scss: {
+          javascriptEnabled: true,
+          additionalData: `
+            @use "@/styles/variables.scss" as *;
+          `
+        }
+      }
+    },
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      // 运行是否自动打开浏览器
+      proxy: {
+        // 反向代理解决跨域
+        [env.VITE_APP_BASE_API]: {
+          target: env.VITE_APP_BASE_URL,
+          // 线上接口地址
+          // target: "http://vapi.youlai.tech", // 线上接口地址
+          // target: 'http://localhost:8989',  // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot
+          changeOrigin: true,
+          rewrite: (path2) => path2.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+          // 替换 /dev-api 为 target 接口地址
+        }
+        // '/dev-api/kpiapi': {
+        //   target: 'http://127.0.0.1:6666',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/kpiapi'), ""),
+        // },
+        // '/dev-api/systemapi': {
+        //   target: 'http://127.0.0.1:17777',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/systemapi'), ""),
+        // },
+        // '/dev-api/hrapi': {
+        //   target: 'http://127.0.0.1:39168',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/hrapi'), ""),
+        // },
+        // '/dev-api/api': {
+        //   target: 'http://127.0.0.1:8888',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/api'), ""),
+        // },
+        // '/dev-api/javasys': {
+        //   target: 'http://172.20.2.87:8111',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys'), ""),
+        // },
+        // '/dev-api/javasys/lowCode ': {
+        //   target: 'http://172.20.2.87:8112',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys/lowCode '), ""),
+        // }
+      }
+    },
+    plugins: [
+      vue(),
+      UnoCSS({
+        /* options */
+      }),
+      AutoImport({
+        // 自动导入 Vue 相关函数，如：ref, reactive, toRef 等
+        imports: ["vue", "@vueuse/core"],
+        //ignore: ['h'], // 自动添加 import { h } from '/node_modules/.vite/deps/vue.js 代码问题处理
+        eslintrc: {
+          enabled: false,
+          //  Default `false`
+          filepath: "./.eslintrc-auto-import.json",
+          // Default `./.eslintrc-auto-import.json`
+          globalsPropValue: true
+          // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')
+        },
+        resolvers: [
+          // 自动导入 Element Plus 相关函数，如：ElMessage, ElMessageBox... (带样式)
+          ElementPlusResolver(),
+          // 自动导入图标组件
+          IconsResolver({})
+        ],
+        vueTemplate: true,
+        // 是否在 vue 模板中自动导入
+        dts: path.resolve(pathSrc, "types", "auto-imports.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Components({
+        resolvers: [
+          // 自动注册图标组件
+          IconsResolver({
+            enabledCollections: ["ep"]
+            //@iconify-json/ep 是 Element Plus 的图标库
+          }),
+          // 自动导入 Element Plus 组件
+          ElementPlusResolver()
+        ],
+        dts: path.resolve(pathSrc, "types", "components.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Icons({
+        // 自动安装图标库
+        autoInstall: true
+      }),
+      createSvgIconsPlugin({
+        // 指定需要缓存的图标文件夹
+        iconDirs: [path.resolve(pathSrc, "assets/icons")],
+        // 指定symbolId格式
+        symbolId: "icon-[dir]-[name]"
+      })
+    ],
+    build: {
+      terserOptions: {
+        compress: {
+          drop_console: true
+          // 关闭所有的 console.log 打印
+        }
+      },
+      rollupOptions: {
+        plugins: [
+          terser({
+            compress: {
+              drop_console: true
+              // 关闭所有的 console.log 打印
+            }
+          })
+        ]
+      }
+    },
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "element-plus/es/components/form/style/css",
+        "element-plus/es/components/form-item/style/css",
+        "element-plus/es/components/button/style/css",
+        "element-plus/es/components/input/style/css",
+        "element-plus/es/components/input-number/style/css",
+        "element-plus/es/components/switch/style/css",
+        "element-plus/es/components/upload/style/css",
+        "element-plus/es/components/menu/style/css",
+        "element-plus/es/components/col/style/css",
+        "element-plus/es/components/icon/style/css",
+        "element-plus/es/components/row/style/css",
+        "element-plus/es/components/tag/style/css",
+        "element-plus/es/components/dialog/style/css",
+        "element-plus/es/components/loading/style/css",
+        "element-plus/es/components/radio/style/css",
+        "element-plus/es/components/radio-group/style/css",
+        "element-plus/es/components/popover/style/css",
+        "element-plus/es/components/scrollbar/style/css",
+        "element-plus/es/components/tooltip/style/css",
+        "element-plus/es/components/dropdown/style/css",
+        "element-plus/es/components/dropdown-menu/style/css",
+        "element-plus/es/components/dropdown-item/style/css",
+        "element-plus/es/components/sub-menu/style/css",
+        "element-plus/es/components/menu-item/style/css",
+        "element-plus/es/components/divider/style/css",
+        "element-plus/es/components/card/style/css",
+        "element-plus/es/components/link/style/css",
+        "element-plus/es/components/breadcrumb/style/css",
+        "element-plus/es/components/breadcrumb-item/style/css",
+        "element-plus/es/components/table/style/css",
+        "element-plus/es/components/tree-select/style/css",
+        "element-plus/es/components/table-column/style/css",
+        "element-plus/es/components/select/style/css",
+        "element-plus/es/components/option/style/css",
+        "element-plus/es/components/pagination/style/css",
+        "element-plus/es/components/tree/style/css",
+        "element-plus/es/components/alert/style/css",
+        "@vueuse/core",
+        "path-to-regexp",
+        "echarts",
+        "@wangeditor/editor",
+        "@wangeditor/editor-for-vue",
+        "vue-i18n"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\";const __vite_injected_original_filename = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/vite.config.ts\";import vue from \"@vitejs/plugin-vue\";\r\n\r\nimport { UserConfig, ConfigEnv, loadEnv, defineConfig } from \"vite\";\r\n\r\nimport AutoImport from \"unplugin-auto-import/vite\";\r\nimport Components from \"unplugin-vue-components/vite\";\r\nimport { ElementPlusResolver } from \"unplugin-vue-components/resolvers\";\r\n\r\nimport Icons from \"unplugin-icons/vite\";\r\nimport IconsResolver from \"unplugin-icons/resolver\";\r\n\r\nimport { createSvgIconsPlugin } from \"vite-plugin-svg-icons\";\r\n\r\nimport UnoCSS from \"unocss/vite\";\r\n\r\nimport { terser } from 'rollup-plugin-terser';\r\n\r\nimport path from \"path\";\r\nconst pathSrc = path.resolve(__dirname, \"src\");\r\n\r\nexport default defineConfig(({ mode }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    resolve: {\r\n      alias: {\r\n        \"@\": pathSrc,\r\n      },\r\n    },\r\n    css: {\r\n      // CSS \u9884\u5904\u7406\u5668\r\n      preprocessorOptions: {\r\n        //define global scss variable\r\n        scss: {\r\n          javascriptEnabled: true,\r\n          additionalData: `\r\n            @use \"@/styles/variables.scss\" as *;\r\n          `,\r\n        },\r\n      },\r\n    },\r\n    server: {\r\n      host: \"0.0.0.0\",\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true, // \u8FD0\u884C\u662F\u5426\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\r\n      proxy: {\r\n        // \u53CD\u5411\u4EE3\u7406\u89E3\u51B3\u8DE8\u57DF\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: env.VITE_APP_BASE_URL, // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: \"http://vapi.youlai.tech\", // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: 'http://localhost:8989',  // \u672C\u5730\u63A5\u53E3\u5730\u5740 , \u540E\u7AEF\u5DE5\u7A0B\u4ED3\u5E93\u5730\u5740\uFF1Ahttps://gitee.com/youlaiorg/youlai-boot\r\n          changeOrigin: true,\r\n          rewrite: (path) =>\r\n            path.replace(new RegExp(\"^\" + env.VITE_APP_BASE_API), \"\"), // \u66FF\u6362 /dev-api \u4E3A target \u63A5\u53E3\u5730\u5740\r\n        },\r\n        // '/dev-api/kpiapi': {\r\n        //   target: 'http://127.0.0.1:6666',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/kpiapi'), \"\"),\r\n        // },\r\n\r\n        // '/dev-api/systemapi': {\r\n        //   target: 'http://127.0.0.1:17777',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/systemapi'), \"\"),\r\n        // },\r\n        // '/dev-api/hrapi': {\r\n        //   target: 'http://127.0.0.1:39168',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/hrapi'), \"\"),\r\n        // },\r\n        // '/dev-api/api': {\r\n        //   target: 'http://127.0.0.1:8888',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/api'), \"\"),\r\n        // },\r\n        // '/dev-api/javasys': {\r\n        //   target: 'http://172.20.2.87:8111',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys'), \"\"),\r\n        // },\r\n        // '/dev-api/javasys/lowCode ': {\r\n        //   target: 'http://172.20.2.87:8112',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys/lowCode '), \"\"),\r\n        // }\r\n      },\r\n    },\r\n\r\n    plugins: [\r\n\r\n      vue(),\r\n      UnoCSS({\r\n        /* options */\r\n      }),\r\n      AutoImport({\r\n        // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1Aref, reactive, toRef \u7B49\r\n        imports: [\"vue\", \"@vueuse/core\"],\r\n        //ignore: ['h'], // \u81EA\u52A8\u6DFB\u52A0 import { h } from '/node_modules/.vite/deps/vue.js \u4EE3\u7801\u95EE\u9898\u5904\u7406\r\n        eslintrc: {\r\n          enabled: false, //  Default `false`\r\n          filepath: \"./.eslintrc-auto-import.json\", // Default `./.eslintrc-auto-import.json`\r\n          globalsPropValue: true, // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')\r\n        },\r\n        resolvers: [\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1AElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n          ElementPlusResolver(),\r\n          // \u81EA\u52A8\u5BFC\u5165\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({}),\r\n        ],\r\n        vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n        dts: path.resolve(pathSrc, \"types\", \"auto-imports.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Components({\r\n        resolvers: [\r\n          // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({\r\n            enabledCollections: [\"ep\"], //@iconify-json/ep \u662F Element Plus \u7684\u56FE\u6807\u5E93\r\n          }),\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n          ElementPlusResolver(),\r\n        ],\r\n        dts: path.resolve(pathSrc, \"types\", \"components.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Icons({\r\n        // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n        autoInstall: true,\r\n      }),\r\n\r\n      createSvgIconsPlugin({\r\n        // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n        iconDirs: [path.resolve(pathSrc, \"assets/icons\")],\r\n        // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n        symbolId: \"icon-[dir]-[name]\",\r\n      }),\r\n    ],\r\n    build: {\r\n      terserOptions: {\r\n        compress: {\r\n          drop_console: true, // \u5173\u95ED\u6240\u6709\u7684 console.log \u6253\u5370\r\n        },\r\n      },\r\n      rollupOptions: {\r\n        plugins: [\r\n          terser({\r\n            compress: {\r\n              drop_console: true, // \u5173\u95ED\u6240\u6709\u7684 console.log \u6253\u5370\r\n            },\r\n          }),\r\n        ],\r\n      },\r\n    },\r\n    optimizeDeps: {\r\n      include: [\r\n        \"vue\",\r\n        \"vue-router\",\r\n        \"pinia\",\r\n        \"axios\",\r\n        \"element-plus/es/components/form/style/css\",\r\n        \"element-plus/es/components/form-item/style/css\",\r\n        \"element-plus/es/components/button/style/css\",\r\n        \"element-plus/es/components/input/style/css\",\r\n        \"element-plus/es/components/input-number/style/css\",\r\n        \"element-plus/es/components/switch/style/css\",\r\n        \"element-plus/es/components/upload/style/css\",\r\n        \"element-plus/es/components/menu/style/css\",\r\n        \"element-plus/es/components/col/style/css\",\r\n        \"element-plus/es/components/icon/style/css\",\r\n        \"element-plus/es/components/row/style/css\",\r\n        \"element-plus/es/components/tag/style/css\",\r\n        \"element-plus/es/components/dialog/style/css\",\r\n        \"element-plus/es/components/loading/style/css\",\r\n        \"element-plus/es/components/radio/style/css\",\r\n        \"element-plus/es/components/radio-group/style/css\",\r\n        \"element-plus/es/components/popover/style/css\",\r\n        \"element-plus/es/components/scrollbar/style/css\",\r\n        \"element-plus/es/components/tooltip/style/css\",\r\n        \"element-plus/es/components/dropdown/style/css\",\r\n        \"element-plus/es/components/dropdown-menu/style/css\",\r\n        \"element-plus/es/components/dropdown-item/style/css\",\r\n        \"element-plus/es/components/sub-menu/style/css\",\r\n        \"element-plus/es/components/menu-item/style/css\",\r\n        \"element-plus/es/components/divider/style/css\",\r\n        \"element-plus/es/components/card/style/css\",\r\n        \"element-plus/es/components/link/style/css\",\r\n        \"element-plus/es/components/breadcrumb/style/css\",\r\n        \"element-plus/es/components/breadcrumb-item/style/css\",\r\n        \"element-plus/es/components/table/style/css\",\r\n        \"element-plus/es/components/tree-select/style/css\",\r\n        \"element-plus/es/components/table-column/style/css\",\r\n        \"element-plus/es/components/select/style/css\",\r\n        \"element-plus/es/components/option/style/css\",\r\n        \"element-plus/es/components/pagination/style/css\",\r\n        \"element-plus/es/components/tree/style/css\",\r\n        \"element-plus/es/components/alert/style/css\",\r\n        \"@vueuse/core\",\r\n\r\n        \"path-to-regexp\",\r\n        \"echarts\",\r\n        \"@wangeditor/editor\",\r\n        \"@wangeditor/editor-for-vue\",\r\n        \"vue-i18n\",\r\n      ],\r\n    },\r\n  };\r\n});\r\n"],
  "mappings": ";AAA0Z,OAAO,SAAS;AAE1a,SAAgC,SAAS,oBAAoB;AAE7D,OAAO,gBAAgB;AACvB,OAAO,gBAAgB;AACvB,SAAS,2BAA2B;AAEpC,OAAO,WAAW;AAClB,OAAO,mBAAmB;AAE1B,SAAS,4BAA4B;AAErC,OAAO,YAAY;AAEnB,SAAS,cAAc;AAEvB,OAAO,UAAU;AAjBjB,IAAM,mCAAmC;AAkBzC,IAAM,UAAU,KAAK,QAAQ,kCAAW,KAAK;AAE7C,IAAO,sBAAQ,aAAa,CAAC,EAAE,KAAK,MAA6B;AAC/D,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA,IACL,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAK;AAAA,MACP;AAAA,IACF;AAAA,IACA,KAAK;AAAA;AAAA,MAEH,qBAAqB;AAAA;AAAA,QAEnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,UACnB,gBAAgB;AAAA;AAAA;AAAA,QAGlB;AAAA,MACF;AAAA,IACF;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,UAGZ,cAAc;AAAA,UACd,SAAS,CAACA,UACRA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA;AAAA,QAC5D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAsCF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MAEP,IAAI;AAAA,MACJ,OAAO;AAAA;AAAA,MAEP,CAAC;AAAA,MACD,WAAW;AAAA;AAAA,QAET,SAAS,CAAC,OAAO,cAAc;AAAA;AAAA,QAE/B,UAAU;AAAA,UACR,SAAS;AAAA;AAAA,UACT,UAAU;AAAA;AAAA,UACV,kBAAkB;AAAA;AAAA,QACpB;AAAA,QACA,WAAW;AAAA;AAAA,UAET,oBAAoB;AAAA;AAAA,UAEpB,cAAc,CAAC,CAAC;AAAA,QAClB;AAAA,QACA,aAAa;AAAA;AAAA,QACb,KAAK,KAAK,QAAQ,SAAS,SAAS,mBAAmB;AAAA;AAAA,MACzD,CAAC;AAAA,MAED,WAAW;AAAA,QACT,WAAW;AAAA;AAAA,UAET,cAAc;AAAA,YACZ,oBAAoB,CAAC,IAAI;AAAA;AAAA,UAC3B,CAAC;AAAA;AAAA,UAED,oBAAoB;AAAA,QACtB;AAAA,QACA,KAAK,KAAK,QAAQ,SAAS,SAAS,iBAAiB;AAAA;AAAA,MACvD,CAAC;AAAA,MAED,MAAM;AAAA;AAAA,QAEJ,aAAa;AAAA,MACf,CAAC;AAAA,MAED,qBAAqB;AAAA;AAAA,QAEnB,UAAU,CAAC,KAAK,QAAQ,SAAS,cAAc,CAAC;AAAA;AAAA,QAEhD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAAA,IACA,OAAO;AAAA,MACL,eAAe;AAAA,QACb,UAAU;AAAA,UACR,cAAc;AAAA;AAAA,QAChB;AAAA,MACF;AAAA,MACA,eAAe;AAAA,QACb,SAAS;AAAA,UACP,OAAO;AAAA,YACL,UAAU;AAAA,cACR,cAAc;AAAA;AAAA,YAChB;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAAA,IACA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QAEA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path"]
}
