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 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=AE=BE=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"]
}


From e565863d1416e72fb86c8fef03dab2fb49737f58 Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Mon, 1 Dec 2025 13:32:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=8F=8A=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/roleapi/postrole.ts            |   30 +
 src/api/system/roleapi/power.ts               |   12 +
 src/api/system/roleapi/types.ts               |    6 +
 src/api/user/types.ts                         |    2 +
 .../workflow/dialog/errorDialog.vue           |    2 +-
 .../workflow/drwer/approverDrawer.vue         |    1 +
 src/directive/index.ts                        |    2 +
 src/directive/permission/button.ts            |   23 +
 src/store/modules/user.ts                     |    7 +-
 src/utils/workflow/index.ts                   |   18 +-
 src/views/hr/archives/index.vue               | 1567 ++---------------
 src/views/hr/archives/index_251128.vue        | 1465 +++++++++++++++
 src/views/system/monitor/online/index.vue     | 1060 ++++++++++-
 src/views/system/monitor/online/index2.vue    |    6 +-
 .../online/roleConfig/setRolePeople.vue       |  308 ++++
 .../appPage/appPageForm/pageFlow.vue          |    4 +-
 .../taskmanagement/edittaskcustomerform.vue   |  248 ---
 .../taskplatform/taskmanagement/flowStep.vue  |    5 +-
 ...s.timestamp-1763685117626-b9e83b063ec3.mjs |  215 +++
 19 files changed, 3298 insertions(+), 1683 deletions(-)
 create mode 100644 src/directive/permission/button.ts
 create mode 100644 src/views/hr/archives/index_251128.vue
 create mode 100644 src/views/system/monitor/online/roleConfig/setRolePeople.vue
 delete mode 100644 src/views/taskplatform/taskmanagement/edittaskcustomerform.vue
 create mode 100644 vite.config.ts.timestamp-1763685117626-b9e83b063ec3.mjs

diff --git a/src/api/system/roleapi/postrole.ts b/src/api/system/roleapi/postrole.ts
index a2e7874..d4f2c85 100644
--- a/src/api/system/roleapi/postrole.ts
+++ b/src/api/system/roleapi/postrole.ts
@@ -150,3 +150,33 @@ export function getPowerPageUser(data?: any){
 	  data:data
 	});
 }
+/**
+ * 授权
+ */
+export function systemAppAuthorization(data?: any){
+	return request({
+	  url: '/systemapi/authorize/systemAppAuthorization',
+	  method: 'post',
+	  data:data
+	});
+}
+/**
+ * 获取角色使用人
+ */
+export function getRolePeople(data?: any){
+	return request({
+	  url: '/systemapi/authorize/getRolePeople',
+	  method: 'post',
+	  data:data
+	});
+}
+/**
+ * 保存角色使用人
+ */
+export function savePickRoleMan(data?: any){
+	return request({
+	  url: '/systemapi/authorize/savePickRoleMan',
+	  method: 'post',
+	  data:data
+	});
+}
diff --git a/src/api/system/roleapi/power.ts b/src/api/system/roleapi/power.ts
index d629c11..6a3037c 100644
--- a/src/api/system/roleapi/power.ts
+++ b/src/api/system/roleapi/power.ts
@@ -11,3 +11,15 @@ import { getSystemPower } from "./types";
       data:data
     });
 }
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-28 10:24:09
+@ 功能: 授权行政组织书
+*/
+export function authorizeOrgTree(data?: getSystemPower){
+    return request({
+      url: '/systemapi/hr/authorizeOrgTree',
+      method: 'post',
+      data:data
+    });
+}
diff --git a/src/api/system/roleapi/types.ts b/src/api/system/roleapi/types.ts
index 630c9af..ffb55ce 100644
--- a/src/api/system/roleapi/types.ts
+++ b/src/api/system/roleapi/types.ts
@@ -292,6 +292,7 @@ export interface getSystemPower{
     appType:string;
 	appSystem:string;
     roleId:string;
+	isPick?:boolean;
 }
 
 
@@ -322,3 +323,8 @@ export interface VisibleRangeInfo  {
 	types:number;
 	val:string;
 }
+
+//搜索
+export interface searchUser extends setupPage{
+	name?:string;
+}
diff --git a/src/api/user/types.ts b/src/api/user/types.ts
index 613ad6e..4535199 100644
--- a/src/api/user/types.ts
+++ b/src/api/user/types.ts
@@ -6,6 +6,8 @@ export interface UserInfo {
   avatar: string;
   roles: string[];
   perms: string[];
+  allPowerConfig: any;
+  userInfoCont: any;
 }
 
 /**
diff --git a/src/components/workflow/dialog/errorDialog.vue b/src/components/workflow/dialog/errorDialog.vue
index 800d639..dda748c 100644
--- a/src/components/workflow/dialog/errorDialog.vue
+++ b/src/components/workflow/dialog/errorDialog.vue
@@ -32,7 +32,7 @@ let visibleDialog = computed({
 			<div class="ant-confirm-content">
 				<div>
 					<p class="error-modal-desc">以下内容不完善，需进行修改</p>
-					<div class="error-modal-list">
+					<div class="error-modal-list">{{list}}
 						<div v-for="(item,index) in list" :key="index" class="error-modal-item">
 							<div class="error-modal-item-label">流程设计</div>
 							<div class="error-modal-item-content">{{item.name}} 未选择{{item.type}}</div>
diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue
index fcb8b41..e6b374f 100644
--- a/src/components/workflow/drwer/approverDrawer.vue
+++ b/src/components/workflow/drwer/approverDrawer.vue
@@ -309,6 +309,7 @@ const saveApprover = () => {
     formData: JSON.stringify(formData.value),
     formPower: JSON.stringify(formData.value.purview),
   };
+  console.log("sendInfo----------------->", sendInfo);
   // console.log("sendInfo", sendInfo);
   setFlowFormKeyPower(sendInfo);
   closeDrawer();
diff --git a/src/directive/index.ts b/src/directive/index.ts
index 960fa44..402558f 100644
--- a/src/directive/index.ts
+++ b/src/directive/index.ts
@@ -1,9 +1,11 @@
 import type { App } from 'vue';
 
 import { hasPerm } from './permission';
+import { hasButton } from './permission/button';
 
 // 全局注册 directive
 export function setupDirective(app: App<Element>) {
   // 使 v-hasPerm 在所有组件中都可用
   app.directive('hasPerm', hasPerm);
+  app.directive('hasButton', hasButton);
 }
diff --git a/src/directive/permission/button.ts b/src/directive/permission/button.ts
new file mode 100644
index 0000000..d57d71c
--- /dev/null
+++ b/src/directive/permission/button.ts
@@ -0,0 +1,23 @@
+import { Directive, DirectiveBinding } from 'vue';
+import { useUserStore } from "@/store/modules/user";
+
+/**
+ * 按钮权限
+ */
+export const hasButton: Directive = {
+  mounted(el: HTMLElement, binding: DirectiveBinding) {
+    const userStore = useUserStore();
+    // const { value,oldValue } = binding;
+    // console.log("按钮权限",el,"-->",binding,"-->",value,"-->",oldValue,"-->",userStore.myPower);
+    console.log("按钮权限",el,"-->",binding,"-->","-->",userStore.myPower);
+    // if (value) {
+    //     const requiredPerms = value; // DOM绑定需要的按钮权限标识
+    //     const hasPerm = userStore.myPower.menuIdAry.some((perm: any) => {
+    //         return requiredPerms.includes(perm);
+    //     });
+    //     if (!hasPerm) {
+    //         el.parentNode?.removeChild(el);
+    //     }
+    // }
+  }
+}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 061a0fc..f8db4d3 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -22,6 +22,7 @@ export const useUserStore = defineStore("user", () => {
   const perms = ref<Array<string>>([]); // 用户权限编码集合 → 判断按钮权限
   const userKey = useStorage("userKey", "");
   const userToken = useStorage("userToken", "");
+  const myPower = ref<any>("");
 
 	const userInfoCont = ref<any>("");
   /**
@@ -95,7 +96,7 @@ export const useUserStore = defineStore("user", () => {
       //   });
 			getUserInfoIng()
 					.then(({data})=>{
-					//	console.log("获取用户信息：角色必须是非null数组！",data);
+						console.log("获取用户信息：角色必须是非null数组！",data);
 						// debugger;
 						if (!data) {
 							return reject("验证失败，请重新登录。");
@@ -108,6 +109,8 @@ export const useUserStore = defineStore("user", () => {
 						roles.value = data.roles;
 						perms.value = data.perms;
 						userInfoCont.value = data
+            myPower.value = data.allPowerConfig
+            console.log("myPower.value",myPower.value);
 						resolve(data);
 					})
 					.catch((error:any) => {
@@ -139,6 +142,7 @@ export const useUserStore = defineStore("user", () => {
 		userKey.value = "";
 		userToken.value = "";
 		userInfoCont.value = ""
+    myPower.value = ""
     avatar.value = "";
     roles.value = [];
     perms.value = [];
@@ -152,6 +156,7 @@ export const useUserStore = defineStore("user", () => {
     avatar,
     roles,
     perms,
+		myPower,
     login,
     getInfo,
     logout,
diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts
index cbd8b0b..e696a58 100644
--- a/src/utils/workflow/index.ts
+++ b/src/utils/workflow/index.ts
@@ -62,8 +62,10 @@ All.prototype = {
 		console.log("setApproverStr---签字解析--->",nodeConfig);
         if (nodeConfig.settype == 1) {
             if (nodeConfig.nodeUserList.length == 1) {
+                nodeConfig.error = false;
                 return nodeConfig.nodeUserList[0].name
             } else if (nodeConfig.nodeUserList.length > 1) {
+                nodeConfig.error = false;
                 if (nodeConfig.examineMode == 1) {
                     return this.arrToStr(nodeConfig.nodeUserList)
                 } else if (nodeConfig.examineMode == 2) {
@@ -78,14 +80,18 @@ All.prototype = {
 			
             let level = nodeConfig.directorLevel == 1 ? '直接主管' : '第' + nodeConfig.directorLevel + '级主管'
             if (nodeConfig.examineMode == 1) {
+                nodeConfig.error = false;
                 return level
             } else if (nodeConfig.examineMode == 2) {
+                nodeConfig.error = false;
                 return level + "会签"
             }else if (nodeConfig.examineMode == 3) {
+                nodeConfig.error = false;
 				return level + + "或签"
 			}
         } else if (nodeConfig.settype == 3) {
 			// console.log("nodeConfig==会签==>",nodeConfig)
+            nodeConfig.error = false;
 			if (nodeConfig.nodeUserList.length == 1) {
 				return nodeConfig.nodeUserList[0].name
 			}else{
@@ -94,9 +100,11 @@ All.prototype = {
 		} else if (nodeConfig.settype == 4) {
 			// console.log("nodeConfig.selectRange",nodeConfig.selectRange,nodeConfig.nodeUserList);
             if (nodeConfig.selectRange == 1) {
+                nodeConfig.error = false;
                 return "发起人自选"
             } else {
                 if (nodeConfig.nodeUserList.length > 0) {
+                    nodeConfig.error = false;
                     if (nodeConfig.selectRange == 2) {
                         return "发起人从指定成员中自选"
                     } else {
@@ -107,15 +115,19 @@ All.prototype = {
                 }
             }
         } else if (nodeConfig.settype == 5) {
+            nodeConfig.error = false;
             return "发起人自己"
         } else if (nodeConfig.settype == 6) {
+            nodeConfig.error = false;
 			// console.log("nodeConfig==直接主管==>",nodeConfig)
             return '从直接主管到通讯录中级别最高的第' + nodeConfig.examineEndDirectorLevel + '个层级主管'
         }else if (nodeConfig.settype == 7){
+            nodeConfig.error = false;
 			return "指定前置审批为本节点设置审批人"
 		}else if (nodeConfig.settype == 8){
 			// console.log("checkedFormList--1111->",nodeConfig)
 			if(nodeConfig.nodeUserList.length > 0){
+                nodeConfig.error = false;
 				if (nodeConfig.examineMode == 1) {
 					return nodeConfig.nodeUserList[0].name + "依次审批"
 				} else if (nodeConfig.examineMode == 2) {
@@ -138,7 +150,7 @@ All.prototype = {
                         strVal += item.outcomeName;
                     })
                 }
-
+                 nodeConfig.error = false;
 				if (nodeConfig.examineMode == 1) {
 					return strVal + "依次审批"
 				} else if (nodeConfig.examineMode == 2) {
@@ -146,8 +158,10 @@ All.prototype = {
 				}else if (nodeConfig.examineMode == 3) {
 					return strVal + "或签"
 				}
+               
 			}else{
                 if(nodeConfig.matrix && nodeConfig.matrix.outcomeName){
+                     nodeConfig.error = false;
                     let strVal = nodeConfig.matrix.outcomeName
                     if (nodeConfig.examineMode == 1) {
                         return strVal + "依次审批"
@@ -156,11 +170,13 @@ All.prototype = {
                     }else if (nodeConfig.examineMode == 3) {
                         return strVal + "或签"
                     }
+                   
                 }
             }
 			
 			
 		}else if (nodeConfig.settype == 10){
+            nodeConfig.error = false;
 			return "指定部门负责人"
 		}
     },
diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue
index 921f7c4..9f44a36 100644
--- a/src/views/hr/archives/index.vue
+++ b/src/views/hr/archives/index.vue
@@ -1,687 +1,46 @@
 <!--
 @ 作者: 秦东
-@ 时间: 2023-06-03 15:12:26
-@ 备注: 人员管理
+@ 时间: 2025-11-28 10:11:16
+@ 备注: 人员列表
 -->
-<script lang="ts" setup>
-import { orgInfo, msgAry } from "@/api/hr/org/type";
-import {
-  getOrgTreeList,
-  gainUserInfoDownTemplateList,
-  uploadUserTemplate,
-  editUserTempr,
-  gainUserTemplateInfo,
-  editUserTemplateInfo,
-  gainTempleateOrgList,
-  teamcontlist,
-  jiechuUserLock,
-} from "@/api/hr/org/index";
-import { archivesCont, searchCriteriaForPeople } from "@/api/hr/people/type";
+<script lang='ts' setup>
 import { emptypeOptions } from "@/api/hr/people/datacont";
+import { orgInfo } from "@/api/hr/org/type";
+import { authorizeOrgTree } from '@/api/system/roleapi/power'
 import {
-  getArchivesListPage,
-  analysisRedisExelect,
-  analysisRedisOrgExelect,
-  downLoadNineTestPage,
-  anaRedisOrgStaffExc,
-} from "@/api/hr/people/index";
-import UserRole from "@/assets/icons/user.svg";
-import { UploadFilled } from "@element-plus/icons-vue";
-
-import { uploadUrl } from "@/api/DesignForm";
-
-/**
- * 引入页面
- */
-import ArchivesContPage from "@/views/hr/archives/archivescont.vue";
-import XingGeFengXi from "@/views/hr/archives/downpage/xingGeFengXi.vue";
-
-import { ElScrollbar as ElScrollbarType } from "element-plus";
-
-import { json2string } from "@/utils/DesignForm/form";
-
-const innerRef = ref<HTMLDivElement>();
-const scrollbarRef = ref<InstanceType<typeof ElScrollbarType>>();
-
-const downloadUrl =
-  import.meta.env.VITE_APP_BASE_API + "/systemapi/rongxin/downLoadNineTestPage";
-
-const handleClick = () => {
-  nextTick(() => {
-    // console.log("滚动条长度",innerRef.value!.clientHeight)
-    if (innerRef.value!.clientHeight > 300) {
-      scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight);
-    }
-  });
-};
-
-const direction = ref("rtl");
-// const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFiles"
-const uploadFFurl =
-  import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFilesRedis";
-const uploadFFurlStaff =
-  import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/upLoadPeopelMerits";
+  teamcontlist
+} from "@/api/hr/org/index";
 
-const searchOrgFormRef = ref(ElForm);
 const orgTreeRef = ref(ElTree); //行政组织树
 const orgTreeLoading = ref(false); //加载行政组织树
 const orgTreeList = ref<orgInfo[]>(); //行政组织树数据
-
-const orgTreeListNew = ref<any[]>([]); //行政组织树数据
-
+const tiemList = ref([]); //班组列表
 const orgTreeProps = {
   children: "child",
   label: "name",
 }; //行政组织树对照值
-const peopleList = ref<archivesCont[]>(); //人员列表
-const peoplecont = ref<archivesCont>(); //个人信息
-const tableLoading = ref(false); //加载数据列表
-const total = ref(0); //总记录数
-const searchArchiveQuery = reactive<searchCriteriaForPeople>({
-  page: 1,
-  pagesize: 13,
-});
-// const progressSize = 0
-const progressSize = ref(0);
-const archivesBox = ref(false); //详情弹窗
-/**用工关系（1:临时工 , 2:编外人员 ;3:实习&实习生;4：试用员工；5：待分配；6：待岗；7：临时调入；8：正式员工；9：长期病假；10：停薪留职；11：退休；12：辞职；13：辞退；14：离职）',
-  `company` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '入职公司',
- * 获取行政组织数据
- */
-function haveOrgTreeInfo() {
-  orgTreeLoading.value = true;
-  getOrgTreeList({})
-    .then(({ data }) => {
-      orgTreeList.value = data;
-    })
-    .finally(() => {
-      orgTreeLoading.value = false;
-    });
-}
-/**
- * 选中行政组织树节点
- */
-const handleOrgTreeNodeClick = (data: orgInfo) => {
-  // console.log(data)
-  searchArchiveQuery.adminorg = data.id;
-  getArchivesPage();
-};
-/**
- * 重置选中行政组织
- */
-function resetChecked() {
-  orgTreeRef.value!.setCheckedKeys([], false);
-  searchArchiveQuery.adminorg = 0;
-}
-/**
- * 重置搜索框
- */
-function resetArcFormQuery() {
-  searchOrgFormRef.value.resetFields();
-  searchArchiveQuery.emptype = [];
-  resetChecked();
-  getArchivesPage();
-}
-/**
- * 获取人员列表
- */
-function getArchivesPage() {
-  tableLoading.value = true;
-  getArchivesListPage(searchArchiveQuery)
-    .then(({ data }) => {
-      peopleList.value = data.list;
-      total.value = data.total;
-    })
-    .finally(() => {
-      tableLoading.value = false;
-    });
-}
-/**
- * 新增员工
- */
-function addPeopleDialog() {}
-/**
- * 查看详情
- */
-function lookPeopleCont(cont: archivesCont) {
-  peoplecont.value = cont;
-  archivesBox.value = true;
-}
-/**
- * 更新个人信息
- */
-function updateMyCont(cont: archivesCont) {
-  peoplecont.value = cont;
-}
-//批量导入数据相关操作
-const piLiangBox = ref(false);
-const orgListTemp = ref<any>([]);
-//打开批量导入面板
-const openPiliangBox = () => {
-  haveOrgList();
-  piLiangBox.value = true;
-};
-
-//获取行政组织
-const haveOrgList = () => {
-  gainTempleateOrgList().then((data: any) => {
-    console.log("打开批量导入面板", data);
-    orgListTemp.value = data.data;
-  });
-
-  orgTreeListNew.value
-};
-
-let jiBuQiVal = 0;
-//关闭导入
-const handleOpenClose = () => {
-  piLiangBox.value = false;
-  peopleListAry.value = [];
-  progressSize.value = 0;
-  peopleMsg.value = [];
-  jiBuQiVal = 0;
-};
-const excelLoading = ref(false);
-const excelJiexi = ref(false);
-const logList = ref<any>([]);
-/**
- * Excel文件change事件
- *
- * @param file
- */
-function handleExcelChange(file: UploadFile) {
-  excelLoading.value = true;
-  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
-    ElMessage.warning("上传Excel只能为xlsx、xls格式");
-    excelLoading.value = false;
-    return false;
-  }
-}
-
-function handleExcelChangeTemp(file: UploadFile) {
-  excelLoading.value = true;
-  if (tempForm.orgId == 0 || tempForm.orgId == "") {
-    ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
-    excelLoading.value = false;
-    return false;
-  }
-  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
-    ElMessage.warning("上传Excel只能为xlsx、xls格式");
-    excelLoading.value = false;
-    return false;
-  }
-}
-
-function handleExcelChangeTempStaff(file: UploadFile) {
-  excelLoading.value = true;
-  if (stafftempForm.orgId == 0 || stafftempForm.orgId == "") {
-    ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
-    excelLoading.value = false;
-    return false;
-  }
-  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
-    ElMessage.warning("上传Excel只能为xlsx、xls格式");
-    excelLoading.value = false;
-    return false;
-  }
-}
-
-let peopleListAry = new Array();
-const peopleMsg = ref<string[]>([]);
-const meritsYearIng = ref<any>();
-const rewPunYearsIng = ref<any>();
-const redisListKey = ref<string>();
-const totalNum = ref<number>();
-/**
-@ 作者: 秦东
-@ 时间: 2024-02-03 14:04:48
-@ 功能: 上传成功
-*/
-const uploadTrue = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-  excelLoading.value = false;
-  console.log("response", response);
-  // console.log("uploadFile",uploadFile);
-  // console.log("uploadFiles",uploadFiles);
-  peopleListAry.push("文件上传成功！开始解析数据并写入数据库！");
-  peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！");
-  // peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
-  // console.log("上传成功",response.code)
-  if (response.code == 0) {
-    jiBuQiVal = 0;
-    progressSize.value = 0;
-    excelJiexi.value = true;
-    meritsYearIng.value = response.data.meritsYearIng;
-    rewPunYearsIng.value = response.data.rewPunYearsIng;
-    redisListKey.value = response.data.redisListKey;
-    totalNum.value = response.data.totalNum;
-    // console.log("上传成功===>", staffChengji);
-    insetPeopleCont();
-  }
-};
-const uploadError = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-  excelLoading.value = true;
-  // console.log("1response",response);
-  // console.log("1uploadFile",uploadFile);
-  // console.log("1uploadFiles",uploadFiles);
-  let msgAry = new Array();
-  msgAry.push(
-    "响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"
-  );
-  // errorMsg = ["响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"]
-  peopleListAry.value = msgAry;
-};
-
-const excelUpload = ref<any>();
-const excelUploadStaff = ref<any>();
-
-const insetPeopleCont = () => {
-  console.log("启动数据写入数据库===============》", jiBuQiVal, totalNum.value);
-  if (jiBuQiVal < totalNum.value) {
-    let sendData = {
-      meritsYearIng: meritsYearIng.value,
-      rewPunYearsIng: rewPunYearsIng.value,
-      redisListKey: redisListKey.value,
-      number: jiBuQiVal,
-      orgId: tempForm.orgId.toString(),
-    };
-    console.log("启动数据写入数据库", sendData);
-    analysisRedisOrgExelect(sendData).then((data: any) => {
-      // console.log("启动数据写入11111数据库",data,data.data.msgStr)
-      peopleMsg.value.push(data.data.msgStr);
-      jiBuQiVal++;
-      // if (jibuq+ 1 >= totalNum.value){
-
-      // }
-      progressSize.value = Math.round((jiBuQiVal / totalNum.value) * 10000) / 100;
-      insetPeopleCont();
-      nextTick(() => {
-        handleClick();
-      });
-    });
-  } else {
-    excelJiexi.value = false;
-    progressSize.value = 100;
-    excelUpload.value.clearFiles();
-  }
-};
-
-//启动数据写入数据库
-const writeDataBase = () => {
-  let jibuq = 0;
-  for (let i = 0; i < totalNum.value; i++) {
-    let sendData = {
-      meritsYearIng: meritsYearIng.value,
-      rewPunYearsIng: rewPunYearsIng.value,
-      redisListKey: redisListKey.value,
-      number: i,
-    };
-    // console.log("启动数据写入数据库",sendData)
-    analysisRedisOrgExelect(sendData).then((data: any) => {
-      // console.log("启动数据写入11111数据库",data)
-      peopleMsg.value.push(data.data.msgStr);
-      jibuq++;
-      if (jibuq + 1 >= totalNum.value) {
-        excelJiexi.value = false;
-      }
-      nextTick(() => {
-        handleClick();
-      });
-    });
-  }
-};
-//加载数据
-onMounted(() => {
-  haveOrgTreeInfo();
-  getArchivesPage();
-  scrollToBottom();
-  gainTimeList();
-});
-
-const ruleForm = reactive({
-  id: "",
-  orgId: "",
-  fileName: "",
-  filePath: "",
-  fileUrl: "",
-});
-const tempForm = reactive({
-  orgId: 313,
-});
-const stafftempForm = reactive({
-  orgId: 0,
-});
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-24 08:51:41
-@ 功能: 打开导入模板下载页面
-*/
-const search = reactive({
-  page: 1,
-  pagesize: 20,
-});
-const downImportTemOpen = ref(false);
-const downTemplate = ref();
-const openImportTemplate = () => {
-  downImportTemOpen.value = true;
-  temList();
-};
-const totalVal = ref(0);
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-24 13:33:41
-@ 功能: 获取导入模版下载列表
-*/
-const temList = () => {
-  gainUserInfoDownTemplateList(search).then((data: any) => {
-    console.log("获取导入模版下载列表---<", data);
-    downTemplate.value = data.data.list;
-    totalVal.value = data.data.total;
-  });
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-24 08:58:11
-@ 功能: 关闭抽屉
-*/
-const handleClose = () => {
-  downImportTemOpen.value = false;
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-24 14:14:37
-@ 功能: 上传新模版
-*/
-const isNewAddTem = ref(false);
-const setUpNewTemplate = () => {
-  isNewAddTem.value = true;
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-24 14:22:09
-@ 功能: 关闭上传导入模版弹窗
-*/
-const tempOpenClose = () => {
-  isNewAddTem.value = false;
-};
-const orgTreePropsBut = {
-  children: "child",
-  value: "id",
-  label: "name",
-}; //行政组织树对照值
 
-/**
-@ 作者: 秦东
-@ 时间: 2024-04-19 13:13:18
-@ 功能: 表单验证规则
-*/
-const dataFormRules = reactive({
-  orgId: [{ required: true, message: "请选择行政组织", trigger: "blur" }],
-  fileName: [{ required: true, message: "请上传模版文件", trigger: "blur" }],
-});
-
-const excelUploadUs = ref();
-
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-24 14:42:34
-@ 功能: 保存上传模版信息
-*/
-const addTemLoading = ref(false);
-const ruleFormRef = ref<any>();
-
-const saveTemp = () => {
-  addTemLoading.value = true;
-  ruleFormRef.value.validate((valid: any) => {
-    if (valid) {
-      ruleForm.orgId = ruleForm.orgId.toString();
-      console.log("上传传输信息--->", ruleForm);
-      if (ruleForm.id == 0 || ruleForm.id == "") {
-        uploadUserTemplate(ruleForm)
-          .then((data: any) => {
-            console.log("上传传输信息-1-->", data);
-            temList();
-            tempOpenClose();
-          })
-          .finally(() => {
-            addTemLoading.value = false;
-          });
-      } else {
-        editUserTemplateInfo(ruleForm)
-          .then((data: any) => {
-            console.log("上传传输信息-2-->", data);
-            temList();
-            tempOpenClose();
-          })
-          .finally(() => {
-            addTemLoading.value = false;
-          });
-      }
-    } else {
-      addTemLoading.value = false;
+const searchInfo = reactive({
+    orgId:"",
+    name:"",
+    employ:"",
+    team:"",
+    joinTime:""
+})
+
+const getOrgPowerTrue =  () => {
+    orgTreeLoading.value = true
+    let sendInfo = {
+        menuId:"50"
     }
-  });
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-24 14:46:32
-@ 功能: 文件上传成功
-*/
-const uploadTrueUs = (
-  response: any,
-  uploadFile: UploadFile,
-  uploadFiles: UploadFiles
-) => {
-  // console.log("response",response);
-  // console.log("uploadFile",uploadFile);
-  // console.log("uploadFiles",uploadFiles);
-  excelLoading.value = false;
-  ruleForm.fileName = uploadFile.name;
-  ruleForm.filePath = response.data.physicspath;
-  ruleForm.fileUrl = response.data.url;
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-26 11:08:00
-@ 功能: 编辑下载模版状态
-*/
-const delUserTemp = (val: any, status: number) => {
-  // console.log("编辑下载模版状态------1------->",val);
-  // console.log("编辑下载模版状态------2------->",status);
-  let sendVal = {
-    id: val.id.toString(),
-    status: status,
-  };
-  editUserTempr(sendVal).then((data: any) => {
-    ElMessage.success(data.msg);
-    temList();
-  });
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-26 11:45:44
-@ 功能: 编辑下载文件
-*/
-const editUserTemp = (val: any) => {
-  ruleForm.id = val.id.toString();
-  ruleForm.orgId = val.orgId;
-  ruleForm.fileName = val.fileName;
-  ruleForm.filePath = val.filePath;
-  ruleForm.fileUrl = val.fileUrl;
-  console.log("编辑下载文件---->", ruleForm);
-  isNewAddTem.value = true;
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-08-26 13:36:12
-@ 功能: 关闭上传弹窗
-*/
-const closeUploadTemp = () => {
-  tempForm.orgId = 313;
-  progressSize.value = 0;
-  piLiangBox.value = false;
-  peopleMsg.value = [];
-};
-
-const myScrollbar = ref<any>(null);
-
-//滚动面板自动滑动到底部
-const scrollToBottom = () => {
-  if (myScrollbar.value) {
-    const container = myScrollbar.value.$el.querySelector(".el-scrollbar__wrap");
-    container.style.scrollBehavior = "smooth"; // 添加平滑滚动效果
-    container.scrollTop = container.scrollHeight;
-  }
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-09-13 09:18:25
-@ 功能: 下团队角色分析表
-*/
-const downLoadTeamTable = () => {
-  downLoadNineTestPage(searchArchiveQuery).then(({ data }) => {
-    console.log("下团队角色分析表", data);
-  });
-};
-const openSetup = ref(false);
-/**
-@ 作者: 秦东
-@ 时间: 2024-09-19 09:57:42
-@ 功能: 设置相关操作
-*/
-const setupClick = () => {
-  openSetup.value = true;
-  haveOrgList();
-  temList();
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-09-19 10:12:29
-@ 功能: 关闭设置
-*/
-const closeSetup = () => {
-  openSetup.value = false;
-};
-const setupActiveName = ref("1");
-watch(
-  () => setupActiveName.value,
-  (val: any) => {
-    console.log("切换选项", val);
-  }
-);
-/**
-@ 作者: 秦东
-@ 时间: 2024-09-19 13:12:29
-@ 功能: 下载性格分析表
-*/
-const openTableType = ref(false);
-const downTableType = ref("10000003");
-const downClassType = ref(1);
-const selectDownTiaojian = (val: string) => {
-  downTableType.value = val;
-  openTableType.value = true;
-  downClassType.value = 1;
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-09-19 13:23:09
-@ 功能: 关闭下载页面
-*/
-const closeXigePage = () => {
-  openTableType.value = false;
-};
-/**
-@ 作者: 秦东
-@ 时间: 2024-09-19 13:55:09
-@ 功能: 性格类型
-*/
-const characterList = reactive([
-  {
-    label: "性格色彩",
-    code: "10000001",
-  },
-  {
-    label: "DISC性格特质",
-    code: "10000002",
-  },
-  {
-    label: "九型人格特质",
-    code: "10000003",
-  },
-]);
-const downStatistics = (val: any) => {
-  console.log("下载数据嗖嗖嗖--->", val);
-  downTableType.value = val.code;
-  openTableType.value = true;
-  downClassType.value = 2;
-};
-
-//上传绩效成绩解析
-const staffChengji = reactive({
-  orgId: "",
-  redisListKey: "",
-  total: "",
-  years: "",
-  levels: "",
-  number: 0,
-});
-
-/**
-@ 作者: 秦东
-@ 时间: 2024-02-03 14:04:48
-@ 功能: 上传成功
-*/
-const uploadTrueStaff = (
-  response: any,
-  uploadFile: UploadFile,
-  uploadFiles: UploadFiles
-) => {
-  excelLoading.value = false;
-  // console.log("response",response);
-  // console.log("uploadFile",uploadFile);
-  // console.log("uploadFiles",uploadFiles);
-  peopleListAry.push("文件上传成功！开始解析数据并写入数据库！");
-  peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！");
-  // peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
-  console.log("上传成功", response.code);
-  if (response.code == 0) {
-    jiBuQiVal = 0;
-    progressSize.value = 0;
-    excelJiexi.value = true;
-    staffChengji.orgId = response.data.orgId;
-    staffChengji.redisListKey = response.data.redisListKey;
-    staffChengji.total = response.data.total;
-    staffChengji.years = response.data.years;
-    staffChengji.levels = response.data.levels;
-    console.log("上传成功===>", staffChengji);
-    insetPeopleContStall();
-  }
-};
-//解析数据上传
-const insetPeopleContStall = () => {
-  // console.log("启动数据写入数据库",jiBuQiVal,totalNum.value)
-  if (jiBuQiVal < staffChengji.total) {
-    staffChengji.number = jiBuQiVal;
-    // console.log("启动数据写入数据库",sendData)
-    anaRedisOrgStaffExc(staffChengji).then((data: any) => {
-      console.log("启动数据写入11111数据库", data, data.data);
-      peopleMsg.value.push(data.data.msgStr);
-      jiBuQiVal++;
-      // if (jibuq+ 1 >= totalNum.value){
-
-      // }
-      progressSize.value = Math.round((jiBuQiVal / staffChengji.total) * 10000) / 100;
-      insetPeopleContStall();
-      nextTick(() => {
-        // handleClick();
-      });
-    });
-  } else {
-    excelJiexi.value = false;
-    progressSize.value = 100;
-    excelUploadStaff.value.clearFiles();
-  }
-};
-const tiemList = ref([]);
+    authorizeOrgTree(sendInfo).then((res) => {
+        console.log(res)
+        orgTreeList.value = res.data
+        orgTreeLoading.value = false
+    }).finally(() => {
+        orgTreeLoading.value = false
+    })
+}
 /**
 @ 作者: 秦东
 @ 时间: 2025-01-14 10:27:12
@@ -697,769 +56,145 @@ const gainTimeList = () => {
     tiemList.value = data.data.list;
   });
 };
-//清楚锁定
-const unLockUSer = (val: any) => {
-  console.log("解说-jiechuUserLock--》", val);
-  jiechuUserLock({ userId: val.number }).then((res: any) => {
-    getArchivesPage();
-  });
-};
-const ruleFormRefLock = ref(null);
-const ubLockPage = ref(false);
-const unLockForm = reactive({
-  numText: "",
-});
-const closeLock = () => {
-  ubLockPage.value = false;
-};
-const openUnlico = () => {
-  ubLockPage.value = true;
-};
-const resetForm = () => {
-  closeLock();
-  ruleFormRefLock.value.resetFields();
-};
-const editTitleRules = reactive({
-  numText: [
-    { required: true, message: "请输入工号；以英文逗号隔开(,)", trigger: "blur" },
-  ],
-});
-var butLoad = ref(false);
-//提交数据
-const picksubus = () => {
-  butLoad.value = true;
-  ruleFormRefLock.value.validate((isValid: boolean) => {
-    if (isValid) {
-      jiechuUserLock({ userId: unLockForm.numText })
-        .then((res: any) => {
-          butLoad.value = false;
-          getArchivesPage();
-        })
-        .finally(() => {
-          butLoad.value = false;
-        });
-    } else {
-      butLoad.value = false;
-    }
-  });
-};
-
-const systemMenuTreeProps = {
-  children: "child",
-  label: "name",
-	value:"id"
+const resetChecked = () => {
+    orgTreeRef.value.setCheckedKeys([])
 }
+/**
+ * 选中行政组织树节点
+ */
+const handleOrgTreeNodeClick = (data: orgInfo) => {
+  // console.log(data)
+  searchInfo.orgId = data.id;
+//   getArchivesPage();
+};
+onMounted(() => {
+    getOrgPowerTrue();
+    gainTimeList();
+})
 </script>
 <template>
-  <div class="app-container">
+  <div class="app-content">
     <el-container>
-      <el-aside width="300px" style="border-right: solid 1px #f0f0f0">
-        <el-card :body-style="{ height: '100%', padding: '0px 5px' }">
-          <el-button
-            type="primary"
-            style="width: 100%; margin: 10px 0"
-            @click="resetChecked"
-            >查看全部</el-button
-          >
-          <el-tree
-            ref="orgTreeRef"
-            v-loading="orgTreeLoading"
-            node-key="id"
-            class="orgTree"
-            :data="orgTreeList"
-            :props="orgTreeProps"
-            :expand-on-click-node="false"
-            :check-on-click-node="true"
-            :check-strictly="true"
-            :default-expand-all="false"
-            @node-click="handleOrgTreeNodeClick"
-          />
-        </el-card>
-      </el-aside>
-      <el-main style="padding: 0">
-        <div style="padding: 20px 0 0 0; margin: 0">
-          <el-form
-            ref="searchOrgFormRef"
-            :model="searchArchiveQuery"
-            :inline="true"
-            style="margin-left: 20px"
-          >
-            <el-form-item label="工号 / 姓名" prop="keywords">
-              <el-input
-                v-model="searchArchiveQuery.keywords"
-                placeholder="请输入工号 / 姓名"
-                clearable
-              />
-            </el-form-item>
-            <el-form-item label="用工关系" prop="number">
-              <el-select
-                v-model="searchArchiveQuery.emptype"
-                multiple
-                clearable
-                collapse-tags
-                placeholder="用工关系"
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="item in emptypeOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="班组" prop="number">
-              <el-select
-                v-model="searchArchiveQuery.teamid"
-                clearable
-                collapse-tags
-                placeholder="员工班组"
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="item in tiemList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="当班日期" prop="number">
-              <el-date-picker
-                v-model="searchArchiveQuery.days"
-                type="date"
-                placeholder="Pick a Date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-              />
-            </el-form-item>
-
-            <el-form-item label="" prop="number">
-              <el-button type="primary" @click="getArchivesPage">
-                <template #icon><i-ep-search /></template>
-                搜索
-              </el-button>
-              <el-button @click="resetArcFormQuery">
-                <template #icon><i-ep-refresh /></template>
-                重置
-              </el-button>
-            </el-form-item>
-          </el-form>
-
-          <el-card shadow="never" style="padding: 0">
-            <div style="margin-bottom: 15px">
-              <el-space wrap>
-                <el-button
-                  v-hasPerm="['215437071358111744']"
-                  type="primary"
-                  @click="addPeopleDialog()"
-                >
-                  <template #icon><i-ep-plus /></template>新增
-                </el-button>
+        <el-aside width="300px" style="padding: 10px 10px">
+            <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 5px' }">
                 <el-button
-                  v-hasPerm="['215437153071542272']"
-                  plain
-                  type="primary"
-                  @click="openPiliangBox"
-                >
-                  <el-icon><MessageBox /></el-icon>
-                  批量导入数据
-                </el-button>
-                <el-button
-                  v-if="false"
-                  v-hasPerm="['287868103478489088']"
-                  plain
-                  type="primary"
-                  @click="openImportTemplate"
-                >
-                  <el-icon><Download /></el-icon>
-                  导入模板下载
-                </el-button>
-
-                <el-link
-                  type="primary"
-                  v-if="false"
-                  :underline="false"
-                  :href="
-                    downloadUrl +
-                    '?keywords=' +
-                    searchArchiveQuery.keywords +
-                    '&adminorg=' +
-                    searchArchiveQuery.adminorg +
-                    '&emptype=' +
-                    json2string(searchArchiveQuery.emptype)
-                  "
-                  target="_blank"
-                  ><el-button v-hasPerm="['287868103478489088']" plain type="primary">
-                    <el-icon><Download /></el-icon>
-                    下载团队角色分析表
-                  </el-button></el-link
-                >
-
-                <el-button type="success" @click="setupClick">
-                  <el-icon><Setting /></el-icon>
-                  设置
-                </el-button>
-                <el-button type="warning" @click="openUnlico">
-                  <el-icon><Unlock /></el-icon>
-
-                  批量解锁
-                </el-button>
-              </el-space>
-            </div>
-            <el-table
-              v-loading="tableLoading"
-              highlight-current-row
-              stripe
-              :data="peopleList"
-              :header-cell-style="{ background: '#F5F7FA' }"
-            >
-              <el-table-column fixed label="照片" width="60" align="center">
-                <template #default="scope">
-                  <el-avatar
-                    v-if="scope.row.icon != ''"
-                    shape="square"
-                    :size="30"
-                    :src="scope.row.icon"
-                  />
-                  <el-avatar
-                    v-else-if="scope.row.iconphoto != ''"
-                    shape="square"
-                    :size="30"
-                    :src="scope.row.iconphoto"
-                  />
-                  <el-avatar v-else shape="square" :size="30" :src="UserRole" />
-                </template>
-              </el-table-column>
-              <el-table-column fixed label="姓名" prop="name" width="150">
-                <template #default="scope">
-                  {{ scope.row.name }}
-                  <el-tag v-if="scope.row.personincharge == 1" type="danger"
-                    >负责人</el-tag
-                  >
-                </template>
-              </el-table-column>
-              <el-table-column
-                fixed
-                label="工号"
-                prop="number"
-                width="120"
-                align="center"
-              />
-              <el-table-column fixed label="归属行政组织">
-                <template #default="scope">
-                  <el-text class="mx-1">{{ scope.row.companyname }}</el-text>
-                  <el-text v-if="scope.row.maindeparmentname" class="mx-1">
-                    <span v-if="scope.row.companyname"> / </span
-                    >{{ scope.row.maindeparmentname }}</el-text
-                  >
-                  <el-text v-if="scope.row.sunmaindeparmentname" class="mx-1">
-                    <span v-if="scope.row.maindeparmentname"> / </span
-                    >{{ scope.row.sunmaindeparmentname }}</el-text
-                  >
-                </template>
-              </el-table-column>
-              <el-table-column
-                fixed
-                label="岗位"
-                prop="positionname"
-                width="120"
-                align="center"
-              />
-              <el-table-column fixed label="联系方式" prop="mobilephone" width="120" />
-              <el-table-column fixed label="居住地" prop="currentresidence" />
-              <el-table-column fixed="right" align="center" label="操作" width="120">
-                <template #default="scope">
-                  <el-button
-                    v-hasPerm="['275256219474604032']"
                     type="primary"
-                    link
-                    size="small"
-                    v-if="scope.row.isShowTrue == 1"
-                    @click.stop="unLockUSer(scope.row)"
-                  >
-                    <!-- <i-ep-view /> -->
-                    清除信息锁定
-                  </el-button>
-                  <el-button
-                    v-hasPerm="['275256219474604032']"
-                    type="primary"
-                    link
-                    size="small"
-                    @click.stop="lookPeopleCont(scope.row)"
-                  >
-                    <!-- <i-ep-view /> -->
-                    查看详情
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <pagination
-              v-if="total > 0"
-              v-model:total="total"
-              v-model:page="searchArchiveQuery.page"
-              v-model:limit="searchArchiveQuery.pagesize"
-              @pagination="getArchivesPage"
-            />
-          </el-card>
-          <ArchivesContPage
-            v-model:isShow="archivesBox"
-            :archivesdata="peoplecont"
-            @updatemyconting="updateMyCont"
-            @getarchivespageclick="getArchivesPage"
-          />
-        </div>
-      </el-main>
-      <!--上传导入数据-->
-      <el-dialog
-        v-model="piLiangBox"
-        title="批量导入人员信息"
-        width="800"
-        :before-close="closeUploadTemp"
-      >
-        <el-row v-loading="excelLoading" element-loading-text="文档上传中，请稍候..." >
-          <el-col :span="24">
-            <el-form :model="tempForm" label-width="auto" style="max-width: 100%">
-              <el-form-item label="请选择上传那个公司的人员信息">
-                
-                <el-tree-select
-                  v-model="tempForm.orgId"
-                  :data="orgTreeList"
-                  check-strictly
-                  :render-after-expand="false"
-                  :props="systemMenuTreeProps" 
-                  style="width: 240px"
-                />
-
-              </el-form-item>
-            </el-form>
-          </el-col>
-          <el-col
-            :span="24"
-            v-loading="excelJiexi"
-            element-loading-text="文档解析中，请稍候..."
-          >
-            <el-upload
-              ref="excelUpload"
-              class="upload-demo"
-              drag
-              :action="uploadFFurl"
-              :data="{ orgId: tempForm.orgId.toString() }"
-              :before-upload="handleExcelChangeTemp"
-              :on-success="uploadTrue"
-              :on-error="uploadError"
-              :show-file-list="false"
-              multiple
-            >
-              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-              <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
-            </el-upload>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-progress
-              :text-inside="true"
-              :stroke-width="20"
-              :percentage="progressSize"
-            >
-              <span>已完成：{{ progressSize }}%</span>
-            </el-progress>
-          </el-col>
-        </el-row>
-        <el-scrollbar height="300px" ref="scrollbarRef" always>
-          <div ref="innerRef">
-            <p
-              v-for="(item, index) in peopleMsg"
-              :key="index"
-              class="scrollbar-demo-item"
-            >
-              {{ item }}
-            </p>
-          </div>
-        </el-scrollbar>
-      </el-dialog>
-
-      <!--导入模板下载-->
-      <el-drawer
-        v-model="downImportTemOpen"
-        title="各行政组织员工信息点在档案模板"
-        :direction="direction"
-        :before-close="handleClose"
-        :size="500"
-      >
-        <el-table :data="downTemplate" border style="width: 100%">
-          <el-table-column prop="orgName" label="行政组织" width="200" />
-          <el-table-column prop="fileName" label="文件名称">
-            <template #default="scope">
-              <el-link
-                type="success"
-                :underline="false"
-                :href="scope.row.fileUrl"
-                target="_blank"
-                >{{ scope.row.fileName }}</el-link
-              >
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-hasPerm="['288626867236253696']"
-            prop="address"
-            label="操作"
-            align="center"
-            width="100"
-          >
-            <template #default="scope">
-              <el-button link type="warning" size="small" @click="editUserTemp(scope.row)"
-                >编辑</el-button
-              >
-              <el-button
-                link
-                type="danger"
-                size="small"
-                @click="delUserTemp(scope.row, 3)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pageBox">
-          <el-pagination layout="prev, pager, next" :total="totalVal" />
-        </div>
-        <template #footer>
-          <div v-hasPerm="['288626950073757696']" style="flex: auto">
-            <el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
-          </div>
-        </template>
-      </el-drawer>
-      <!--导入模版上传-->
-      <el-dialog
-        v-model="isNewAddTem"
-        title="上传导入模版"
-        width="400"
-        :before-close="tempOpenClose"
-      >
-        <el-form
-          ref="ruleFormRef"
-          style="max-width: 600px"
-          :model="ruleForm"
-          :rules="dataFormRules"
-          label-width="auto"
-          class="demo-ruleForm"
-          :size="formSize"
-          status-icon
-        >
-          <el-form-item label="归属行政组织" prop="orgId">
-            <el-tree-select
-              v-model="ruleForm.orgId"
-              :data="orgTreeList"
-              :props="orgTreePropsBut"
-              :render-after-expand="false"
-              :expand-on-click-node="false"
-              :check-on-click-node="true"
-              :check-strictly="true"
-              :default-expand-all="false"
-              style="width: 240px"
-            />
-          </el-form-item>
-          <el-form-item label="信息模版" prop="fileName">
-            <el-input v-model="ruleForm.fileName" />
-            <el-upload
-              ref="excelUploadUs"
-              class="upload-demo"
-              drag
-              v-loading="excelLoading"
-              :action="uploadUrl"
-              :limit="1"
-              :before-upload="handleExcelChange"
-              :on-success="uploadTrueUs"
-              :on-error="uploadError"
-              :show-file-list="false"
-            >
-              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-              <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
-            </el-upload>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" v-loading="addTemLoading" @click="saveTemp()">
-              确定上传
-            </el-button>
-            <el-button @click="tempOpenClose()">取消</el-button>
-          </el-form-item>
-        </el-form>
-      </el-dialog>
-      <!--设置-->
-      <el-drawer
-        v-model="openSetup"
-        title="各行政组织员工信息点在档案模板"
-        :direction="direction"
-        :before-close="closeSetup"
-        :size="500"
-        class="drwBody"
-      >
-        <el-tabs v-model="setupActiveName" type="border-card">
-          <el-tab-pane label="员工档案导入模版" name="1">
-            <template #label>
-              <span class="fa fa-upload"></span>
-              <span>员工档案导入模版</span>
-            </template>
-
-            <div
-              v-hasPerm="['288626950073757696']"
-              style="flex: auto; text-align: right; margin-bottom: 10px"
-            >
-              <el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
-            </div>
-            <el-table :data="downTemplate" border style="width: 100%">
-              <el-table-column prop="orgName" label="行政组织" width="200" />
-              <el-table-column prop="fileName" label="文件名称">
-                <template #default="scope">
-                  <el-link
-                    type="success"
-                    :underline="false"
-                    :href="scope.row.fileUrl"
-                    target="_blank"
-                    >{{ scope.row.fileName }}</el-link
-                  >
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-hasPerm="['288626867236253696']"
-                prop="address"
-                label="操作"
-                align="center"
-                width="100"
-              >
-                <template #default="scope">
-                  <el-button
-                    link
-                    type="warning"
-                    size="small"
-                    @click="editUserTemp(scope.row)"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    link
-                    type="danger"
-                    size="small"
-                    @click="delUserTemp(scope.row, 3)"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-            <div class="pageBox">
-              <el-pagination layout="prev, pager, next" :total="totalVal" />
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="性格分析表" name="2">
-            <template #label>
-              <span class="fa fa-list"></span>
-              <span>性格分析表</span>
-            </template>
-            <div class="downLink">
-              <div>团队角色九型人格测试</div>
-              <div>
-                <el-button
-                  type="danger"
-                  text
-                  v-hasPerm="['287868103478489088']"
-                  @click="selectDownTiaojian('10000003')"
+                    style="width: 100%; margin: 10px 0"
+                    @click="resetChecked"
                 >
-                  下载
+                查看全部
                 </el-button>
-              </div>
-            </div>
-
-            <!-- <el-link type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
-			
-			v-hasPerm="['287868103478489088']"
-			plain
-			type="primary" 
-		>
-			<el-icon><Download /></el-icon>
-			下载团队角色分析表
-		</el-button></el-link> -->
-          </el-tab-pane>
-          <el-tab-pane label="测试统计" name="3">
-            <template #label>
-              <span class="fa fa-bar-chart"></span>
-              <span>测试统计</span>
-            </template>
-
-            <el-table :data="characterList" border style="width: 100%">
-              <el-table-column prop="label" label="测试名称" />
-
-              <el-table-column label="操作" align="center" width="80">
-                <template #default="scope">
-                  <el-button
-                    link
-                    type="danger"
-                    size="small"
-                    @click="downStatistics(scope.row)"
-                    >下载</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-
-          <el-tab-pane label="测试统计" name="4">
-            <template #label>
-              <span class="fa fa-line-chart"></span>
-              <span>考评人员成绩统计表</span>
-            </template>
-
-            <el-row
-              v-hasPerm="['288626950073757696']"
-              v-loading="excelLoading"
-              element-loading-text="文档上传中，请稍候..."
-            >
-              <el-col :span="24">
-                <el-form
-                  :model="stafftempForm"
-                  label-width="auto"
-                  style="max-width: 100%"
-                >
-                  <el-form-item label="请选择上传那个公司的人员信息">
-                    <el-radio-group v-model="stafftempForm.orgId">
-                      <el-radio v-for="item in orgListTemp" :value="item.id">{{
-                        item.name
-                      }}</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
+                <el-tree-v2
+                    style="max-width: 100%"
+                    :data="orgTreeList"
+                    :props="orgTreeProps"
+                    v-loading="orgTreeLoading"
+                    node-key="id"
+                    :expand-on-click-node="false"
+                    :check-on-click-node="true"
+                    :check-strictly="true"
+                    :default-expand-all="false"
+                    :height="1200"
+                    @node-click="handleOrgTreeNodeClick"
+                />
+            </el-card>
+        </el-aside>
+
+
+
+        <el-main style="padding: 10px 10px 0 0">
+            <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 15px' }">
+                <el-form ref="searchForm" :model="searchInfo" :inline="true" style="width: 100%; margin-top: 10px;">
+                    <el-form-item label="工号 / 姓名 / 手机号" prop="keywords">
+                        <el-input
+                            v-model="searchInfo.name"
+                            placeholder="请输入工号/姓名/手机号"
+                            clearable
+                        />
+                    </el-form-item>
+                    <el-form-item label="用工关系" prop="number">
+                        <el-select
+                            v-model="searchInfo.employ"
+                            multiple
+                            clearable
+                            collapse-tags
+                            placeholder="用工关系"
+                            style="width: 200px"
+                        >
+                            <el-option
+                                v-for="item in emptypeOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="班组" prop="number">
+                        <el-select
+                            v-model="searchInfo.team"
+                            clearable
+                            collapse-tags
+                            placeholder="员工班组"
+                            style="width: 240px"
+                        >
+                            <el-option
+                            v-for="item in tiemList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="入职日期" prop="number">
+                        <el-date-picker
+                            v-model="searchInfo.joinTime"
+                            type="date"
+                            placeholder="入职日期"
+                            format="YYYY-MM-DD"
+                            value-format="YYYY-MM-DD"
+                        />
+                    </el-form-item>
+                    <el-form-item label="" prop="number">
+                        <el-button type="primary" @click="getArchivesPage">
+                            <template #icon><i-ep-search /></template>
+                            搜索
+                        </el-button>
+                        <el-button @click="resetArcFormQuery">
+                            <template #icon><i-ep-refresh /></template>
+                            重置
+                        </el-button>
+                    </el-form-item>
                 </el-form>
-              </el-col>
-              <el-col
-                :span="24"
-                v-loading="excelJiexi"
-                element-loading-text="文档解析中，请稍候..."
-              >
-                <el-upload
-                  ref="excelUploadStaff"
-                  class="upload-demo"
-                  drag
-                  :action="uploadFFurlStaff"
-                  :data="{ orgId: stafftempForm.orgId.toString() }"
-                  :before-upload="handleExcelChangeTempStaff"
-                  :on-success="uploadTrueStaff"
-                  :on-error="uploadError"
-                  :show-file-list="false"
-                  multiple
-                >
-                  <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-                  <div class="el-upload__text">
-                    将电子表格拖到此处或 <em>单击上载</em>
-                  </div>
-                </el-upload>
-              </el-col>
-            </el-row>
-            <el-row v-hasPerm="['288626950073757696']">
-              <el-col :span="24">
-                <el-progress
-                  :text-inside="true"
-                  :stroke-width="20"
-                  :percentage="progressSize"
-                >
-                  <span>已完成：{{ progressSize }}%</span>
-                </el-progress>
-              </el-col>
-            </el-row>
-            <el-scrollbar height="300px" ref="scrollbarRef" always>
-              <div ref="innerRef">
-                <p
-                  v-for="(item, index) in peopleMsg"
-                  :key="index"
-                  class="scrollbar-demo-item"
-                >
-                  {{ item }}
-                </p>
-              </div>
-            </el-scrollbar>
-          </el-tab-pane>
-        </el-tabs>
-      </el-drawer>
-
-      <XingGeFengXi
-        v-if="openTableType"
-        :down-table-type="downTableType"
-        :down-class-type="downClassType"
-        :org-tree="orgTreeList"
-        @close-xige-page="closeXigePage"
-      />
+                <div class="func-but">
+                    <el-button v-hasButton="(50,[215437071358111744])" type="primary" @click="handleAddArchives">
+                        <template #icon><i-ep-plus /></template>
+                        新增
+                    </el-button>
+                    <el-button
+                        v-hasPerm="['215437153071542272']"
+                        plain
+                        type="primary"
+                        @click="openPiliangBox"
+                    >
+                        <el-icon><MessageBox /></el-icon>
+                        批量导入数据
+                    </el-button>
+                </div>
+            </el-card>
+        </el-main>
     </el-container>
-
-    <el-dialog
-      v-model="ubLockPage"
-      title="清楚锁定人员信息锁"
-      width="500"
-      :before-close="closeLock"
-    >
-      <el-form
-        ref="ruleFormRefLock"
-        :model="unLockForm"
-        :rules="editTitleRules"
-        label-width="80"
-        style="width: 100%"
-      >
-        <el-form-item label="工号" prop="numText">
-          <el-text>请输入工号；以英文逗号隔开(,)</el-text>
-          <el-input
-            v-model="unLockForm.numText"
-            type="textarea"
-            placeholder="请输入工号；以英文逗号隔开(,)"
-            clearable
-            :autosize="{ minRows: 4, maxRows: 10 }"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" v-loading="butLoad" @click="picksubus">
-            确定
-          </el-button>
-          <el-button @click="resetForm(ruleFormRef)">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
   </div>
 </template>
-<style lang="scss" scoped>
-.app-container {
+<style  lang='scss' scoped>
+.app-content {
+    height: calc(100vh - 170px);
+    background-color: aqua;
+
   :deep .el-drawer__body {
     padding: 0 10px;
   }
 }
-
 .common-layout {
-  height: calc(100% - 60px);
-  background-color: aqua;
-}
-.el-container {
-  .el-card.is-always-shadow {
-    height: 100%;
-    overflow: auto;
-  }
-}
-.cardBody {
-  height: 100%;
-}
-.orgTree {
-  padding: 5px 0;
-}
-.divBoxCont {
-  width: 100%;
-  height: 300px;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.pageBox {
-  text-align: center;
-  display: flex;
-  align-items: center;
-  width: 100%;
-}
-.downLink {
-  display: flex;
-  width: 100%;
-  align-items: center;
-  justify-content: space-between;
+  
 }
 </style>
diff --git a/src/views/hr/archives/index_251128.vue b/src/views/hr/archives/index_251128.vue
new file mode 100644
index 0000000..921f7c4
--- /dev/null
+++ b/src/views/hr/archives/index_251128.vue
@@ -0,0 +1,1465 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-06-03 15:12:26
+@ 备注: 人员管理
+-->
+<script lang="ts" setup>
+import { orgInfo, msgAry } from "@/api/hr/org/type";
+import {
+  getOrgTreeList,
+  gainUserInfoDownTemplateList,
+  uploadUserTemplate,
+  editUserTempr,
+  gainUserTemplateInfo,
+  editUserTemplateInfo,
+  gainTempleateOrgList,
+  teamcontlist,
+  jiechuUserLock,
+} from "@/api/hr/org/index";
+import { archivesCont, searchCriteriaForPeople } from "@/api/hr/people/type";
+import { emptypeOptions } from "@/api/hr/people/datacont";
+import {
+  getArchivesListPage,
+  analysisRedisExelect,
+  analysisRedisOrgExelect,
+  downLoadNineTestPage,
+  anaRedisOrgStaffExc,
+} from "@/api/hr/people/index";
+import UserRole from "@/assets/icons/user.svg";
+import { UploadFilled } from "@element-plus/icons-vue";
+
+import { uploadUrl } from "@/api/DesignForm";
+
+/**
+ * 引入页面
+ */
+import ArchivesContPage from "@/views/hr/archives/archivescont.vue";
+import XingGeFengXi from "@/views/hr/archives/downpage/xingGeFengXi.vue";
+
+import { ElScrollbar as ElScrollbarType } from "element-plus";
+
+import { json2string } from "@/utils/DesignForm/form";
+
+const innerRef = ref<HTMLDivElement>();
+const scrollbarRef = ref<InstanceType<typeof ElScrollbarType>>();
+
+const downloadUrl =
+  import.meta.env.VITE_APP_BASE_API + "/systemapi/rongxin/downLoadNineTestPage";
+
+const handleClick = () => {
+  nextTick(() => {
+    // console.log("滚动条长度",innerRef.value!.clientHeight)
+    if (innerRef.value!.clientHeight > 300) {
+      scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight);
+    }
+  });
+};
+
+const direction = ref("rtl");
+// const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFiles"
+const uploadFFurl =
+  import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFilesRedis";
+const uploadFFurlStaff =
+  import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/upLoadPeopelMerits";
+
+const searchOrgFormRef = ref(ElForm);
+const orgTreeRef = ref(ElTree); //行政组织树
+const orgTreeLoading = ref(false); //加载行政组织树
+const orgTreeList = ref<orgInfo[]>(); //行政组织树数据
+
+const orgTreeListNew = ref<any[]>([]); //行政组织树数据
+
+const orgTreeProps = {
+  children: "child",
+  label: "name",
+}; //行政组织树对照值
+const peopleList = ref<archivesCont[]>(); //人员列表
+const peoplecont = ref<archivesCont>(); //个人信息
+const tableLoading = ref(false); //加载数据列表
+const total = ref(0); //总记录数
+const searchArchiveQuery = reactive<searchCriteriaForPeople>({
+  page: 1,
+  pagesize: 13,
+});
+// const progressSize = 0
+const progressSize = ref(0);
+const archivesBox = ref(false); //详情弹窗
+/**用工关系（1:临时工 , 2:编外人员 ;3:实习&实习生;4：试用员工；5：待分配；6：待岗；7：临时调入；8：正式员工；9：长期病假；10：停薪留职；11：退休；12：辞职；13：辞退；14：离职）',
+  `company` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '入职公司',
+ * 获取行政组织数据
+ */
+function haveOrgTreeInfo() {
+  orgTreeLoading.value = true;
+  getOrgTreeList({})
+    .then(({ data }) => {
+      orgTreeList.value = data;
+    })
+    .finally(() => {
+      orgTreeLoading.value = false;
+    });
+}
+/**
+ * 选中行政组织树节点
+ */
+const handleOrgTreeNodeClick = (data: orgInfo) => {
+  // console.log(data)
+  searchArchiveQuery.adminorg = data.id;
+  getArchivesPage();
+};
+/**
+ * 重置选中行政组织
+ */
+function resetChecked() {
+  orgTreeRef.value!.setCheckedKeys([], false);
+  searchArchiveQuery.adminorg = 0;
+}
+/**
+ * 重置搜索框
+ */
+function resetArcFormQuery() {
+  searchOrgFormRef.value.resetFields();
+  searchArchiveQuery.emptype = [];
+  resetChecked();
+  getArchivesPage();
+}
+/**
+ * 获取人员列表
+ */
+function getArchivesPage() {
+  tableLoading.value = true;
+  getArchivesListPage(searchArchiveQuery)
+    .then(({ data }) => {
+      peopleList.value = data.list;
+      total.value = data.total;
+    })
+    .finally(() => {
+      tableLoading.value = false;
+    });
+}
+/**
+ * 新增员工
+ */
+function addPeopleDialog() {}
+/**
+ * 查看详情
+ */
+function lookPeopleCont(cont: archivesCont) {
+  peoplecont.value = cont;
+  archivesBox.value = true;
+}
+/**
+ * 更新个人信息
+ */
+function updateMyCont(cont: archivesCont) {
+  peoplecont.value = cont;
+}
+//批量导入数据相关操作
+const piLiangBox = ref(false);
+const orgListTemp = ref<any>([]);
+//打开批量导入面板
+const openPiliangBox = () => {
+  haveOrgList();
+  piLiangBox.value = true;
+};
+
+//获取行政组织
+const haveOrgList = () => {
+  gainTempleateOrgList().then((data: any) => {
+    console.log("打开批量导入面板", data);
+    orgListTemp.value = data.data;
+  });
+
+  orgTreeListNew.value
+};
+
+let jiBuQiVal = 0;
+//关闭导入
+const handleOpenClose = () => {
+  piLiangBox.value = false;
+  peopleListAry.value = [];
+  progressSize.value = 0;
+  peopleMsg.value = [];
+  jiBuQiVal = 0;
+};
+const excelLoading = ref(false);
+const excelJiexi = ref(false);
+const logList = ref<any>([]);
+/**
+ * Excel文件change事件
+ *
+ * @param file
+ */
+function handleExcelChange(file: UploadFile) {
+  excelLoading.value = true;
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    ElMessage.warning("上传Excel只能为xlsx、xls格式");
+    excelLoading.value = false;
+    return false;
+  }
+}
+
+function handleExcelChangeTemp(file: UploadFile) {
+  excelLoading.value = true;
+  if (tempForm.orgId == 0 || tempForm.orgId == "") {
+    ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
+    excelLoading.value = false;
+    return false;
+  }
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    ElMessage.warning("上传Excel只能为xlsx、xls格式");
+    excelLoading.value = false;
+    return false;
+  }
+}
+
+function handleExcelChangeTempStaff(file: UploadFile) {
+  excelLoading.value = true;
+  if (stafftempForm.orgId == 0 || stafftempForm.orgId == "") {
+    ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
+    excelLoading.value = false;
+    return false;
+  }
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    ElMessage.warning("上传Excel只能为xlsx、xls格式");
+    excelLoading.value = false;
+    return false;
+  }
+}
+
+let peopleListAry = new Array();
+const peopleMsg = ref<string[]>([]);
+const meritsYearIng = ref<any>();
+const rewPunYearsIng = ref<any>();
+const redisListKey = ref<string>();
+const totalNum = ref<number>();
+/**
+@ 作者: 秦东
+@ 时间: 2024-02-03 14:04:48
+@ 功能: 上传成功
+*/
+const uploadTrue = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+  excelLoading.value = false;
+  console.log("response", response);
+  // console.log("uploadFile",uploadFile);
+  // console.log("uploadFiles",uploadFiles);
+  peopleListAry.push("文件上传成功！开始解析数据并写入数据库！");
+  peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！");
+  // peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
+  // console.log("上传成功",response.code)
+  if (response.code == 0) {
+    jiBuQiVal = 0;
+    progressSize.value = 0;
+    excelJiexi.value = true;
+    meritsYearIng.value = response.data.meritsYearIng;
+    rewPunYearsIng.value = response.data.rewPunYearsIng;
+    redisListKey.value = response.data.redisListKey;
+    totalNum.value = response.data.totalNum;
+    // console.log("上传成功===>", staffChengji);
+    insetPeopleCont();
+  }
+};
+const uploadError = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+  excelLoading.value = true;
+  // console.log("1response",response);
+  // console.log("1uploadFile",uploadFile);
+  // console.log("1uploadFiles",uploadFiles);
+  let msgAry = new Array();
+  msgAry.push(
+    "响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"
+  );
+  // errorMsg = ["响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"]
+  peopleListAry.value = msgAry;
+};
+
+const excelUpload = ref<any>();
+const excelUploadStaff = ref<any>();
+
+const insetPeopleCont = () => {
+  console.log("启动数据写入数据库===============》", jiBuQiVal, totalNum.value);
+  if (jiBuQiVal < totalNum.value) {
+    let sendData = {
+      meritsYearIng: meritsYearIng.value,
+      rewPunYearsIng: rewPunYearsIng.value,
+      redisListKey: redisListKey.value,
+      number: jiBuQiVal,
+      orgId: tempForm.orgId.toString(),
+    };
+    console.log("启动数据写入数据库", sendData);
+    analysisRedisOrgExelect(sendData).then((data: any) => {
+      // console.log("启动数据写入11111数据库",data,data.data.msgStr)
+      peopleMsg.value.push(data.data.msgStr);
+      jiBuQiVal++;
+      // if (jibuq+ 1 >= totalNum.value){
+
+      // }
+      progressSize.value = Math.round((jiBuQiVal / totalNum.value) * 10000) / 100;
+      insetPeopleCont();
+      nextTick(() => {
+        handleClick();
+      });
+    });
+  } else {
+    excelJiexi.value = false;
+    progressSize.value = 100;
+    excelUpload.value.clearFiles();
+  }
+};
+
+//启动数据写入数据库
+const writeDataBase = () => {
+  let jibuq = 0;
+  for (let i = 0; i < totalNum.value; i++) {
+    let sendData = {
+      meritsYearIng: meritsYearIng.value,
+      rewPunYearsIng: rewPunYearsIng.value,
+      redisListKey: redisListKey.value,
+      number: i,
+    };
+    // console.log("启动数据写入数据库",sendData)
+    analysisRedisOrgExelect(sendData).then((data: any) => {
+      // console.log("启动数据写入11111数据库",data)
+      peopleMsg.value.push(data.data.msgStr);
+      jibuq++;
+      if (jibuq + 1 >= totalNum.value) {
+        excelJiexi.value = false;
+      }
+      nextTick(() => {
+        handleClick();
+      });
+    });
+  }
+};
+//加载数据
+onMounted(() => {
+  haveOrgTreeInfo();
+  getArchivesPage();
+  scrollToBottom();
+  gainTimeList();
+});
+
+const ruleForm = reactive({
+  id: "",
+  orgId: "",
+  fileName: "",
+  filePath: "",
+  fileUrl: "",
+});
+const tempForm = reactive({
+  orgId: 313,
+});
+const stafftempForm = reactive({
+  orgId: 0,
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 08:51:41
+@ 功能: 打开导入模板下载页面
+*/
+const search = reactive({
+  page: 1,
+  pagesize: 20,
+});
+const downImportTemOpen = ref(false);
+const downTemplate = ref();
+const openImportTemplate = () => {
+  downImportTemOpen.value = true;
+  temList();
+};
+const totalVal = ref(0);
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 13:33:41
+@ 功能: 获取导入模版下载列表
+*/
+const temList = () => {
+  gainUserInfoDownTemplateList(search).then((data: any) => {
+    console.log("获取导入模版下载列表---<", data);
+    downTemplate.value = data.data.list;
+    totalVal.value = data.data.total;
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 08:58:11
+@ 功能: 关闭抽屉
+*/
+const handleClose = () => {
+  downImportTemOpen.value = false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 14:14:37
+@ 功能: 上传新模版
+*/
+const isNewAddTem = ref(false);
+const setUpNewTemplate = () => {
+  isNewAddTem.value = true;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 14:22:09
+@ 功能: 关闭上传导入模版弹窗
+*/
+const tempOpenClose = () => {
+  isNewAddTem.value = false;
+};
+const orgTreePropsBut = {
+  children: "child",
+  value: "id",
+  label: "name",
+}; //行政组织树对照值
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-19 13:13:18
+@ 功能: 表单验证规则
+*/
+const dataFormRules = reactive({
+  orgId: [{ required: true, message: "请选择行政组织", trigger: "blur" }],
+  fileName: [{ required: true, message: "请上传模版文件", trigger: "blur" }],
+});
+
+const excelUploadUs = ref();
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 14:42:34
+@ 功能: 保存上传模版信息
+*/
+const addTemLoading = ref(false);
+const ruleFormRef = ref<any>();
+
+const saveTemp = () => {
+  addTemLoading.value = true;
+  ruleFormRef.value.validate((valid: any) => {
+    if (valid) {
+      ruleForm.orgId = ruleForm.orgId.toString();
+      console.log("上传传输信息--->", ruleForm);
+      if (ruleForm.id == 0 || ruleForm.id == "") {
+        uploadUserTemplate(ruleForm)
+          .then((data: any) => {
+            console.log("上传传输信息-1-->", data);
+            temList();
+            tempOpenClose();
+          })
+          .finally(() => {
+            addTemLoading.value = false;
+          });
+      } else {
+        editUserTemplateInfo(ruleForm)
+          .then((data: any) => {
+            console.log("上传传输信息-2-->", data);
+            temList();
+            tempOpenClose();
+          })
+          .finally(() => {
+            addTemLoading.value = false;
+          });
+      }
+    } else {
+      addTemLoading.value = false;
+    }
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 14:46:32
+@ 功能: 文件上传成功
+*/
+const uploadTrueUs = (
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) => {
+  // console.log("response",response);
+  // console.log("uploadFile",uploadFile);
+  // console.log("uploadFiles",uploadFiles);
+  excelLoading.value = false;
+  ruleForm.fileName = uploadFile.name;
+  ruleForm.filePath = response.data.physicspath;
+  ruleForm.fileUrl = response.data.url;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-26 11:08:00
+@ 功能: 编辑下载模版状态
+*/
+const delUserTemp = (val: any, status: number) => {
+  // console.log("编辑下载模版状态------1------->",val);
+  // console.log("编辑下载模版状态------2------->",status);
+  let sendVal = {
+    id: val.id.toString(),
+    status: status,
+  };
+  editUserTempr(sendVal).then((data: any) => {
+    ElMessage.success(data.msg);
+    temList();
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-26 11:45:44
+@ 功能: 编辑下载文件
+*/
+const editUserTemp = (val: any) => {
+  ruleForm.id = val.id.toString();
+  ruleForm.orgId = val.orgId;
+  ruleForm.fileName = val.fileName;
+  ruleForm.filePath = val.filePath;
+  ruleForm.fileUrl = val.fileUrl;
+  console.log("编辑下载文件---->", ruleForm);
+  isNewAddTem.value = true;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-26 13:36:12
+@ 功能: 关闭上传弹窗
+*/
+const closeUploadTemp = () => {
+  tempForm.orgId = 313;
+  progressSize.value = 0;
+  piLiangBox.value = false;
+  peopleMsg.value = [];
+};
+
+const myScrollbar = ref<any>(null);
+
+//滚动面板自动滑动到底部
+const scrollToBottom = () => {
+  if (myScrollbar.value) {
+    const container = myScrollbar.value.$el.querySelector(".el-scrollbar__wrap");
+    container.style.scrollBehavior = "smooth"; // 添加平滑滚动效果
+    container.scrollTop = container.scrollHeight;
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-13 09:18:25
+@ 功能: 下团队角色分析表
+*/
+const downLoadTeamTable = () => {
+  downLoadNineTestPage(searchArchiveQuery).then(({ data }) => {
+    console.log("下团队角色分析表", data);
+  });
+};
+const openSetup = ref(false);
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 09:57:42
+@ 功能: 设置相关操作
+*/
+const setupClick = () => {
+  openSetup.value = true;
+  haveOrgList();
+  temList();
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 10:12:29
+@ 功能: 关闭设置
+*/
+const closeSetup = () => {
+  openSetup.value = false;
+};
+const setupActiveName = ref("1");
+watch(
+  () => setupActiveName.value,
+  (val: any) => {
+    console.log("切换选项", val);
+  }
+);
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:12:29
+@ 功能: 下载性格分析表
+*/
+const openTableType = ref(false);
+const downTableType = ref("10000003");
+const downClassType = ref(1);
+const selectDownTiaojian = (val: string) => {
+  downTableType.value = val;
+  openTableType.value = true;
+  downClassType.value = 1;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:23:09
+@ 功能: 关闭下载页面
+*/
+const closeXigePage = () => {
+  openTableType.value = false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:55:09
+@ 功能: 性格类型
+*/
+const characterList = reactive([
+  {
+    label: "性格色彩",
+    code: "10000001",
+  },
+  {
+    label: "DISC性格特质",
+    code: "10000002",
+  },
+  {
+    label: "九型人格特质",
+    code: "10000003",
+  },
+]);
+const downStatistics = (val: any) => {
+  console.log("下载数据嗖嗖嗖--->", val);
+  downTableType.value = val.code;
+  openTableType.value = true;
+  downClassType.value = 2;
+};
+
+//上传绩效成绩解析
+const staffChengji = reactive({
+  orgId: "",
+  redisListKey: "",
+  total: "",
+  years: "",
+  levels: "",
+  number: 0,
+});
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-02-03 14:04:48
+@ 功能: 上传成功
+*/
+const uploadTrueStaff = (
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) => {
+  excelLoading.value = false;
+  // console.log("response",response);
+  // console.log("uploadFile",uploadFile);
+  // console.log("uploadFiles",uploadFiles);
+  peopleListAry.push("文件上传成功！开始解析数据并写入数据库！");
+  peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！");
+  // peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
+  console.log("上传成功", response.code);
+  if (response.code == 0) {
+    jiBuQiVal = 0;
+    progressSize.value = 0;
+    excelJiexi.value = true;
+    staffChengji.orgId = response.data.orgId;
+    staffChengji.redisListKey = response.data.redisListKey;
+    staffChengji.total = response.data.total;
+    staffChengji.years = response.data.years;
+    staffChengji.levels = response.data.levels;
+    console.log("上传成功===>", staffChengji);
+    insetPeopleContStall();
+  }
+};
+//解析数据上传
+const insetPeopleContStall = () => {
+  // console.log("启动数据写入数据库",jiBuQiVal,totalNum.value)
+  if (jiBuQiVal < staffChengji.total) {
+    staffChengji.number = jiBuQiVal;
+    // console.log("启动数据写入数据库",sendData)
+    anaRedisOrgStaffExc(staffChengji).then((data: any) => {
+      console.log("启动数据写入11111数据库", data, data.data);
+      peopleMsg.value.push(data.data.msgStr);
+      jiBuQiVal++;
+      // if (jibuq+ 1 >= totalNum.value){
+
+      // }
+      progressSize.value = Math.round((jiBuQiVal / staffChengji.total) * 10000) / 100;
+      insetPeopleContStall();
+      nextTick(() => {
+        // handleClick();
+      });
+    });
+  } else {
+    excelJiexi.value = false;
+    progressSize.value = 100;
+    excelUploadStaff.value.clearFiles();
+  }
+};
+const tiemList = ref([]);
+/**
+@ 作者: 秦东
+@ 时间: 2025-01-14 10:27:12
+@ 功能: 获取班组列表
+*/
+const gainTimeList = () => {
+  let searchMap = {
+    page: 1,
+    pagesize: 2000,
+    name: "",
+  };
+  teamcontlist(searchMap).then((data) => {
+    tiemList.value = data.data.list;
+  });
+};
+//清楚锁定
+const unLockUSer = (val: any) => {
+  console.log("解说-jiechuUserLock--》", val);
+  jiechuUserLock({ userId: val.number }).then((res: any) => {
+    getArchivesPage();
+  });
+};
+const ruleFormRefLock = ref(null);
+const ubLockPage = ref(false);
+const unLockForm = reactive({
+  numText: "",
+});
+const closeLock = () => {
+  ubLockPage.value = false;
+};
+const openUnlico = () => {
+  ubLockPage.value = true;
+};
+const resetForm = () => {
+  closeLock();
+  ruleFormRefLock.value.resetFields();
+};
+const editTitleRules = reactive({
+  numText: [
+    { required: true, message: "请输入工号；以英文逗号隔开(,)", trigger: "blur" },
+  ],
+});
+var butLoad = ref(false);
+//提交数据
+const picksubus = () => {
+  butLoad.value = true;
+  ruleFormRefLock.value.validate((isValid: boolean) => {
+    if (isValid) {
+      jiechuUserLock({ userId: unLockForm.numText })
+        .then((res: any) => {
+          butLoad.value = false;
+          getArchivesPage();
+        })
+        .finally(() => {
+          butLoad.value = false;
+        });
+    } else {
+      butLoad.value = false;
+    }
+  });
+};
+
+const systemMenuTreeProps = {
+  children: "child",
+  label: "name",
+	value:"id"
+}
+</script>
+<template>
+  <div class="app-container">
+    <el-container>
+      <el-aside width="300px" style="border-right: solid 1px #f0f0f0">
+        <el-card :body-style="{ height: '100%', padding: '0px 5px' }">
+          <el-button
+            type="primary"
+            style="width: 100%; margin: 10px 0"
+            @click="resetChecked"
+            >查看全部</el-button
+          >
+          <el-tree
+            ref="orgTreeRef"
+            v-loading="orgTreeLoading"
+            node-key="id"
+            class="orgTree"
+            :data="orgTreeList"
+            :props="orgTreeProps"
+            :expand-on-click-node="false"
+            :check-on-click-node="true"
+            :check-strictly="true"
+            :default-expand-all="false"
+            @node-click="handleOrgTreeNodeClick"
+          />
+        </el-card>
+      </el-aside>
+      <el-main style="padding: 0">
+        <div style="padding: 20px 0 0 0; margin: 0">
+          <el-form
+            ref="searchOrgFormRef"
+            :model="searchArchiveQuery"
+            :inline="true"
+            style="margin-left: 20px"
+          >
+            <el-form-item label="工号 / 姓名" prop="keywords">
+              <el-input
+                v-model="searchArchiveQuery.keywords"
+                placeholder="请输入工号 / 姓名"
+                clearable
+              />
+            </el-form-item>
+            <el-form-item label="用工关系" prop="number">
+              <el-select
+                v-model="searchArchiveQuery.emptype"
+                multiple
+                clearable
+                collapse-tags
+                placeholder="用工关系"
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="item in emptypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="班组" prop="number">
+              <el-select
+                v-model="searchArchiveQuery.teamid"
+                clearable
+                collapse-tags
+                placeholder="员工班组"
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="item in tiemList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="当班日期" prop="number">
+              <el-date-picker
+                v-model="searchArchiveQuery.days"
+                type="date"
+                placeholder="Pick a Date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+              />
+            </el-form-item>
+
+            <el-form-item label="" prop="number">
+              <el-button type="primary" @click="getArchivesPage">
+                <template #icon><i-ep-search /></template>
+                搜索
+              </el-button>
+              <el-button @click="resetArcFormQuery">
+                <template #icon><i-ep-refresh /></template>
+                重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+
+          <el-card shadow="never" style="padding: 0">
+            <div style="margin-bottom: 15px">
+              <el-space wrap>
+                <el-button
+                  v-hasPerm="['215437071358111744']"
+                  type="primary"
+                  @click="addPeopleDialog()"
+                >
+                  <template #icon><i-ep-plus /></template>新增
+                </el-button>
+                <el-button
+                  v-hasPerm="['215437153071542272']"
+                  plain
+                  type="primary"
+                  @click="openPiliangBox"
+                >
+                  <el-icon><MessageBox /></el-icon>
+                  批量导入数据
+                </el-button>
+                <el-button
+                  v-if="false"
+                  v-hasPerm="['287868103478489088']"
+                  plain
+                  type="primary"
+                  @click="openImportTemplate"
+                >
+                  <el-icon><Download /></el-icon>
+                  导入模板下载
+                </el-button>
+
+                <el-link
+                  type="primary"
+                  v-if="false"
+                  :underline="false"
+                  :href="
+                    downloadUrl +
+                    '?keywords=' +
+                    searchArchiveQuery.keywords +
+                    '&adminorg=' +
+                    searchArchiveQuery.adminorg +
+                    '&emptype=' +
+                    json2string(searchArchiveQuery.emptype)
+                  "
+                  target="_blank"
+                  ><el-button v-hasPerm="['287868103478489088']" plain type="primary">
+                    <el-icon><Download /></el-icon>
+                    下载团队角色分析表
+                  </el-button></el-link
+                >
+
+                <el-button type="success" @click="setupClick">
+                  <el-icon><Setting /></el-icon>
+                  设置
+                </el-button>
+                <el-button type="warning" @click="openUnlico">
+                  <el-icon><Unlock /></el-icon>
+
+                  批量解锁
+                </el-button>
+              </el-space>
+            </div>
+            <el-table
+              v-loading="tableLoading"
+              highlight-current-row
+              stripe
+              :data="peopleList"
+              :header-cell-style="{ background: '#F5F7FA' }"
+            >
+              <el-table-column fixed label="照片" width="60" align="center">
+                <template #default="scope">
+                  <el-avatar
+                    v-if="scope.row.icon != ''"
+                    shape="square"
+                    :size="30"
+                    :src="scope.row.icon"
+                  />
+                  <el-avatar
+                    v-else-if="scope.row.iconphoto != ''"
+                    shape="square"
+                    :size="30"
+                    :src="scope.row.iconphoto"
+                  />
+                  <el-avatar v-else shape="square" :size="30" :src="UserRole" />
+                </template>
+              </el-table-column>
+              <el-table-column fixed label="姓名" prop="name" width="150">
+                <template #default="scope">
+                  {{ scope.row.name }}
+                  <el-tag v-if="scope.row.personincharge == 1" type="danger"
+                    >负责人</el-tag
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                fixed
+                label="工号"
+                prop="number"
+                width="120"
+                align="center"
+              />
+              <el-table-column fixed label="归属行政组织">
+                <template #default="scope">
+                  <el-text class="mx-1">{{ scope.row.companyname }}</el-text>
+                  <el-text v-if="scope.row.maindeparmentname" class="mx-1">
+                    <span v-if="scope.row.companyname"> / </span
+                    >{{ scope.row.maindeparmentname }}</el-text
+                  >
+                  <el-text v-if="scope.row.sunmaindeparmentname" class="mx-1">
+                    <span v-if="scope.row.maindeparmentname"> / </span
+                    >{{ scope.row.sunmaindeparmentname }}</el-text
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                fixed
+                label="岗位"
+                prop="positionname"
+                width="120"
+                align="center"
+              />
+              <el-table-column fixed label="联系方式" prop="mobilephone" width="120" />
+              <el-table-column fixed label="居住地" prop="currentresidence" />
+              <el-table-column fixed="right" align="center" label="操作" width="120">
+                <template #default="scope">
+                  <el-button
+                    v-hasPerm="['275256219474604032']"
+                    type="primary"
+                    link
+                    size="small"
+                    v-if="scope.row.isShowTrue == 1"
+                    @click.stop="unLockUSer(scope.row)"
+                  >
+                    <!-- <i-ep-view /> -->
+                    清除信息锁定
+                  </el-button>
+                  <el-button
+                    v-hasPerm="['275256219474604032']"
+                    type="primary"
+                    link
+                    size="small"
+                    @click.stop="lookPeopleCont(scope.row)"
+                  >
+                    <!-- <i-ep-view /> -->
+                    查看详情
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+              v-if="total > 0"
+              v-model:total="total"
+              v-model:page="searchArchiveQuery.page"
+              v-model:limit="searchArchiveQuery.pagesize"
+              @pagination="getArchivesPage"
+            />
+          </el-card>
+          <ArchivesContPage
+            v-model:isShow="archivesBox"
+            :archivesdata="peoplecont"
+            @updatemyconting="updateMyCont"
+            @getarchivespageclick="getArchivesPage"
+          />
+        </div>
+      </el-main>
+      <!--上传导入数据-->
+      <el-dialog
+        v-model="piLiangBox"
+        title="批量导入人员信息"
+        width="800"
+        :before-close="closeUploadTemp"
+      >
+        <el-row v-loading="excelLoading" element-loading-text="文档上传中，请稍候..." >
+          <el-col :span="24">
+            <el-form :model="tempForm" label-width="auto" style="max-width: 100%">
+              <el-form-item label="请选择上传那个公司的人员信息">
+                
+                <el-tree-select
+                  v-model="tempForm.orgId"
+                  :data="orgTreeList"
+                  check-strictly
+                  :render-after-expand="false"
+                  :props="systemMenuTreeProps" 
+                  style="width: 240px"
+                />
+
+              </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col
+            :span="24"
+            v-loading="excelJiexi"
+            element-loading-text="文档解析中，请稍候..."
+          >
+            <el-upload
+              ref="excelUpload"
+              class="upload-demo"
+              drag
+              :action="uploadFFurl"
+              :data="{ orgId: tempForm.orgId.toString() }"
+              :before-upload="handleExcelChangeTemp"
+              :on-success="uploadTrue"
+              :on-error="uploadError"
+              :show-file-list="false"
+              multiple
+            >
+              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+              <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
+            </el-upload>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-progress
+              :text-inside="true"
+              :stroke-width="20"
+              :percentage="progressSize"
+            >
+              <span>已完成：{{ progressSize }}%</span>
+            </el-progress>
+          </el-col>
+        </el-row>
+        <el-scrollbar height="300px" ref="scrollbarRef" always>
+          <div ref="innerRef">
+            <p
+              v-for="(item, index) in peopleMsg"
+              :key="index"
+              class="scrollbar-demo-item"
+            >
+              {{ item }}
+            </p>
+          </div>
+        </el-scrollbar>
+      </el-dialog>
+
+      <!--导入模板下载-->
+      <el-drawer
+        v-model="downImportTemOpen"
+        title="各行政组织员工信息点在档案模板"
+        :direction="direction"
+        :before-close="handleClose"
+        :size="500"
+      >
+        <el-table :data="downTemplate" border style="width: 100%">
+          <el-table-column prop="orgName" label="行政组织" width="200" />
+          <el-table-column prop="fileName" label="文件名称">
+            <template #default="scope">
+              <el-link
+                type="success"
+                :underline="false"
+                :href="scope.row.fileUrl"
+                target="_blank"
+                >{{ scope.row.fileName }}</el-link
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-hasPerm="['288626867236253696']"
+            prop="address"
+            label="操作"
+            align="center"
+            width="100"
+          >
+            <template #default="scope">
+              <el-button link type="warning" size="small" @click="editUserTemp(scope.row)"
+                >编辑</el-button
+              >
+              <el-button
+                link
+                type="danger"
+                size="small"
+                @click="delUserTemp(scope.row, 3)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pageBox">
+          <el-pagination layout="prev, pager, next" :total="totalVal" />
+        </div>
+        <template #footer>
+          <div v-hasPerm="['288626950073757696']" style="flex: auto">
+            <el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
+          </div>
+        </template>
+      </el-drawer>
+      <!--导入模版上传-->
+      <el-dialog
+        v-model="isNewAddTem"
+        title="上传导入模版"
+        width="400"
+        :before-close="tempOpenClose"
+      >
+        <el-form
+          ref="ruleFormRef"
+          style="max-width: 600px"
+          :model="ruleForm"
+          :rules="dataFormRules"
+          label-width="auto"
+          class="demo-ruleForm"
+          :size="formSize"
+          status-icon
+        >
+          <el-form-item label="归属行政组织" prop="orgId">
+            <el-tree-select
+              v-model="ruleForm.orgId"
+              :data="orgTreeList"
+              :props="orgTreePropsBut"
+              :render-after-expand="false"
+              :expand-on-click-node="false"
+              :check-on-click-node="true"
+              :check-strictly="true"
+              :default-expand-all="false"
+              style="width: 240px"
+            />
+          </el-form-item>
+          <el-form-item label="信息模版" prop="fileName">
+            <el-input v-model="ruleForm.fileName" />
+            <el-upload
+              ref="excelUploadUs"
+              class="upload-demo"
+              drag
+              v-loading="excelLoading"
+              :action="uploadUrl"
+              :limit="1"
+              :before-upload="handleExcelChange"
+              :on-success="uploadTrueUs"
+              :on-error="uploadError"
+              :show-file-list="false"
+            >
+              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+              <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
+            </el-upload>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" v-loading="addTemLoading" @click="saveTemp()">
+              确定上传
+            </el-button>
+            <el-button @click="tempOpenClose()">取消</el-button>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
+      <!--设置-->
+      <el-drawer
+        v-model="openSetup"
+        title="各行政组织员工信息点在档案模板"
+        :direction="direction"
+        :before-close="closeSetup"
+        :size="500"
+        class="drwBody"
+      >
+        <el-tabs v-model="setupActiveName" type="border-card">
+          <el-tab-pane label="员工档案导入模版" name="1">
+            <template #label>
+              <span class="fa fa-upload"></span>
+              <span>员工档案导入模版</span>
+            </template>
+
+            <div
+              v-hasPerm="['288626950073757696']"
+              style="flex: auto; text-align: right; margin-bottom: 10px"
+            >
+              <el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
+            </div>
+            <el-table :data="downTemplate" border style="width: 100%">
+              <el-table-column prop="orgName" label="行政组织" width="200" />
+              <el-table-column prop="fileName" label="文件名称">
+                <template #default="scope">
+                  <el-link
+                    type="success"
+                    :underline="false"
+                    :href="scope.row.fileUrl"
+                    target="_blank"
+                    >{{ scope.row.fileName }}</el-link
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-hasPerm="['288626867236253696']"
+                prop="address"
+                label="操作"
+                align="center"
+                width="100"
+              >
+                <template #default="scope">
+                  <el-button
+                    link
+                    type="warning"
+                    size="small"
+                    @click="editUserTemp(scope.row)"
+                    >编辑</el-button
+                  >
+                  <el-button
+                    link
+                    type="danger"
+                    size="small"
+                    @click="delUserTemp(scope.row, 3)"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="pageBox">
+              <el-pagination layout="prev, pager, next" :total="totalVal" />
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="性格分析表" name="2">
+            <template #label>
+              <span class="fa fa-list"></span>
+              <span>性格分析表</span>
+            </template>
+            <div class="downLink">
+              <div>团队角色九型人格测试</div>
+              <div>
+                <el-button
+                  type="danger"
+                  text
+                  v-hasPerm="['287868103478489088']"
+                  @click="selectDownTiaojian('10000003')"
+                >
+                  下载
+                </el-button>
+              </div>
+            </div>
+
+            <!-- <el-link type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
+			
+			v-hasPerm="['287868103478489088']"
+			plain
+			type="primary" 
+		>
+			<el-icon><Download /></el-icon>
+			下载团队角色分析表
+		</el-button></el-link> -->
+          </el-tab-pane>
+          <el-tab-pane label="测试统计" name="3">
+            <template #label>
+              <span class="fa fa-bar-chart"></span>
+              <span>测试统计</span>
+            </template>
+
+            <el-table :data="characterList" border style="width: 100%">
+              <el-table-column prop="label" label="测试名称" />
+
+              <el-table-column label="操作" align="center" width="80">
+                <template #default="scope">
+                  <el-button
+                    link
+                    type="danger"
+                    size="small"
+                    @click="downStatistics(scope.row)"
+                    >下载</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+
+          <el-tab-pane label="测试统计" name="4">
+            <template #label>
+              <span class="fa fa-line-chart"></span>
+              <span>考评人员成绩统计表</span>
+            </template>
+
+            <el-row
+              v-hasPerm="['288626950073757696']"
+              v-loading="excelLoading"
+              element-loading-text="文档上传中，请稍候..."
+            >
+              <el-col :span="24">
+                <el-form
+                  :model="stafftempForm"
+                  label-width="auto"
+                  style="max-width: 100%"
+                >
+                  <el-form-item label="请选择上传那个公司的人员信息">
+                    <el-radio-group v-model="stafftempForm.orgId">
+                      <el-radio v-for="item in orgListTemp" :value="item.id">{{
+                        item.name
+                      }}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-form>
+              </el-col>
+              <el-col
+                :span="24"
+                v-loading="excelJiexi"
+                element-loading-text="文档解析中，请稍候..."
+              >
+                <el-upload
+                  ref="excelUploadStaff"
+                  class="upload-demo"
+                  drag
+                  :action="uploadFFurlStaff"
+                  :data="{ orgId: stafftempForm.orgId.toString() }"
+                  :before-upload="handleExcelChangeTempStaff"
+                  :on-success="uploadTrueStaff"
+                  :on-error="uploadError"
+                  :show-file-list="false"
+                  multiple
+                >
+                  <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+                  <div class="el-upload__text">
+                    将电子表格拖到此处或 <em>单击上载</em>
+                  </div>
+                </el-upload>
+              </el-col>
+            </el-row>
+            <el-row v-hasPerm="['288626950073757696']">
+              <el-col :span="24">
+                <el-progress
+                  :text-inside="true"
+                  :stroke-width="20"
+                  :percentage="progressSize"
+                >
+                  <span>已完成：{{ progressSize }}%</span>
+                </el-progress>
+              </el-col>
+            </el-row>
+            <el-scrollbar height="300px" ref="scrollbarRef" always>
+              <div ref="innerRef">
+                <p
+                  v-for="(item, index) in peopleMsg"
+                  :key="index"
+                  class="scrollbar-demo-item"
+                >
+                  {{ item }}
+                </p>
+              </div>
+            </el-scrollbar>
+          </el-tab-pane>
+        </el-tabs>
+      </el-drawer>
+
+      <XingGeFengXi
+        v-if="openTableType"
+        :down-table-type="downTableType"
+        :down-class-type="downClassType"
+        :org-tree="orgTreeList"
+        @close-xige-page="closeXigePage"
+      />
+    </el-container>
+
+    <el-dialog
+      v-model="ubLockPage"
+      title="清楚锁定人员信息锁"
+      width="500"
+      :before-close="closeLock"
+    >
+      <el-form
+        ref="ruleFormRefLock"
+        :model="unLockForm"
+        :rules="editTitleRules"
+        label-width="80"
+        style="width: 100%"
+      >
+        <el-form-item label="工号" prop="numText">
+          <el-text>请输入工号；以英文逗号隔开(,)</el-text>
+          <el-input
+            v-model="unLockForm.numText"
+            type="textarea"
+            placeholder="请输入工号；以英文逗号隔开(,)"
+            clearable
+            :autosize="{ minRows: 4, maxRows: 10 }"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" v-loading="butLoad" @click="picksubus">
+            确定
+          </el-button>
+          <el-button @click="resetForm(ruleFormRef)">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+<style lang="scss" scoped>
+.app-container {
+  :deep .el-drawer__body {
+    padding: 0 10px;
+  }
+}
+
+.common-layout {
+  height: calc(100% - 60px);
+  background-color: aqua;
+}
+.el-container {
+  .el-card.is-always-shadow {
+    height: 100%;
+    overflow: auto;
+  }
+}
+.cardBody {
+  height: 100%;
+}
+.orgTree {
+  padding: 5px 0;
+}
+.divBoxCont {
+  width: 100%;
+  height: 300px;
+  overflow: hidden;
+  overflow-y: auto;
+}
+.pageBox {
+  text-align: center;
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+.downLink {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
+}
+</style>
diff --git a/src/views/system/monitor/online/index.vue b/src/views/system/monitor/online/index.vue
index 08db74b..8ddbfdc 100644
--- a/src/views/system/monitor/online/index.vue
+++ b/src/views/system/monitor/online/index.vue
@@ -4,15 +4,1063 @@
 @ 备注: 
 -->
 <script lang='ts' setup>
+import { giveRoleTree,getOrgPostTree } from '@/api/role/index'
+import type {  TreeInstance  } from 'element-plus'
+import type {RoleListTree,RoleFormInfo,orgAndPostisListTree} from '@/api/role/types'
+import { getOrgTreeList } from "@/api/hr/org/index";
+import { appPowerUnit } from "@/api/system/roleapi/power";
+import type { getSystemPower,AppPowerTree,systemList } from "@/api/system/roleapi/types";
+import { gainAppList,gainAppTableListNew,getPowerPageUser,systemAppAuthorization } from "@/api/system/roleapi/postrole";
+import { appTableBut, appListBut } from "@/utils/workflow/const";
+import { Search } from '@element-plus/icons-vue'
 
-</script>
-<template>
-  <div class="app-content">
+import SetRolePeople from '@/views/system/monitor/online/roleConfig/setRolePeople.vue'
+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 roleGroupOrInfo = ref(1)
+const orgTree = ref<orgInfo[]>([])			//行政组织树
+const roleLeft = ref()   //左侧控件
+const searchQuery = ref('')	//行政组织搜索
+const treeRefOrg = ref<TreeInstance>()
+const treeRefOrgPost = ref<TreeInstance>()	//岗位
+const roleListdata = ref<RoleListTree[]>([])	//角色树
+const editRoleCont = ref<RoleFormInfo>()
+const appList = ref<custerAppInfo[]>([]);
+const openEditRoleGroup = ref(false)
+const roleLoading = ref(false)
+const orgPostLoading = ref(false)
+const openRoleGroup = ref(false)
+const treeBoxHeight = ref(300)
+const treeBoxHeightOrg = ref(300)
+const systemPowerTree = ref<AppPowerTree[]>([])
+const orgPostisListdata = ref<orgAndPostisListTree[]>([])		///行政组织岗位树
+const userPowerList = ref<systemList>({})	//人员树
+const activeAppId = ref<string>("");
+const appTableList = ref<custerAppTablePower[]>([]);
+const myAppTableLoad = ref(false)
+
+const props = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+//获取系统权限控制项
+const systemPower = ref<getSystemPower>({
+    powerType:"org",
+    appId:"",
+    appSystem:"system",
+    roleId:"",
+	isPick:false,
+})
+//行政组织树字段约束
+const propsOrg = {
+  value: 'id',
+  label: 'name',
+//   disabled:'status',
+  children: 'child',
+}
+const propsOrgPost = {
+  value: 'id',
+  label: 'label',
+  disabled:'status',
+  children: 'children',
+}
+const systemMenuTreePropsing = {
+  children: "child",
+  label: "name",
+  value: "id",
+};
+//搜索人员
+const searchUserQuery =reactive<searchUser>({
+	page:1,
+	pagesize:20,
+	name:"",
+});	//搜索人员
+const filterMethod = (query: string, node: any) => node.label!.includes(query)
+const filterMethodOrg = (query: string, node: any) => {
+	return node.name!.includes(query)
+}
+//搜索行政组织
+const onQueryChangedOrg = (query: string) => {
+  treeRefOrg.value!.filter(query)
+}
+//搜索行政组织岗位
+const onQuedOrg = (query: string) => {
+  treeRefOrgPost.value!.filter(query)
+}
+//获取行政组织树
+const getOrgTreeAry = () => {
+    roleLoading.value = true
+    if(!Array.isArray(orgTree.value) || orgTree.value.length<=0){
+        
+        getOrgTreeList({ orgid: 0 })
+        .then(({ data }) => {
+			console.log("获取行政组织树------->",data)
+            if(Array.isArray(data) && data.length>0){
+                systemPower.value.roleId=data[0].id.toString()
+                console.log("获取行政组织树------->",systemPower.value)
+            }
+            orgTree.value = data
+            roleLoading.value = false
+            getSystemPowerSub();
+        }).finally(()=>{roleLoading.value = false})
+    }else{
+        roleLoading.value = false
+    }
     
-  </div>
+}
+//获取行政组织及岗位
+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 pickOrgTree = (data:any) => {
+    console.log("监测赋权组----2222--->",systemPower.value.powerType,"---------->",data)
+	if((systemPower.value.powerType=="job" && data.types == "9") || systemPower.value.powerType!="job"){
+		systemPower.value.appId=""
+		systemPower.value.appSystem="system"
+		systemPower.value.roleId=""
+		systemPower.value.roleId=data.id.toString()
+		getSystemPowerSub();
+	}
+	
+}
+//监测赋权组
+watch(()=>systemPower.value.powerType,(val:string)=>{
+    console.log("监测赋权组",val)
+	systemPower.value.appId=""
+	systemPower.value.appSystem="system"
+	systemPower.value.roleId=""
+    switch(val){
+        case "org":
+            getOrgTreeAry();
+			
+            break;
+        case "job":
+            getOrgPostisTree()
+            break;
+        case "role":
+            getRoleTree();
+            break;
+		case "person":
+            getPowerPageUserSub()
+            break;
+        default:
+    }
+
+    if(systemPower.value.appSystem=="app"){
+        getAppList();
+    }else{
+        getSystemPowerSub();
+    }
+    
+},{
+    deep:true
+})
+//添加角色组
+const addRoleGroup = (types:number) => {
+    
+    roleGroupOrInfo.value = types
+    openRoleGroup.value = true     
+}
+//搜索角色
+const onQueryChanged = (query: string) => {
+  treeRef.value!.filter(query)
+}
+//获取角色树
+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 pickRoleTree = (data:any) => {
+	console.log("监测赋权组------->",data)
+    if(data.status && data.types==1){
+        console.log("监测赋权组------->",data)
+		systemPower.value.appId=""
+		systemPower.value.appSystem="system"
+		systemPower.value.roleId=""
+		systemPower.value.roleId=data.id.toString()
+		getSystemPowerSub();
+    }
+}
+//编辑角色信息
+const editMyInfoIcon = (data:RoleListTree,types:number) => {
+
+    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)
+     ({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 getPowerPageUserSub = () => {
+	console.log("获取平台授权项目用户---searchUserQuery---->",searchUserQuery)
+    getPowerPageUser(searchUserQuery).then(({data})=>{
+        console.log("获取平台授权项目用户------->",data)
+		userPowerList.value = data
+    })
+}
+//查询
+const onQueryChangedOrgUser = (query: string) => {
+	console.log("获取平台授权项目用户---查询--->",query)
+	searchUserQuery.page=1
+    searchUserQuery.name = query
+    getPowerPageUserSub()
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 14:20:47
+@ 功能: 获取自定义App
+*/
+const getAppList = () => {
+
+  gainAppList({appType:systemPower.value.appSystem,powerType:systemPower.value.powerType,roleId:systemPower.value.roleId}).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;
+        nextTick(()=>{
+            getAppTableList(false);
+        })
+      }
+    }
+    console.log("获取自定义App", activeAppId.value);
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-13 16:00:19
+@ 功能: 获取对应App下边的表单
+*/
+const getAppTableList = (number:boolean) => {
+	myAppTableLoad.value = true
+	console.log("获取对应App下边的表单---number---->",number,activeAppId.value)
+	if(activeAppId.value){
+		systemPower.value.appId = activeAppId.value.toString()
+		gainAppTableListNew({id:activeAppId.value,appType:systemPower.value.appSystem,powerType:systemPower.value.powerType,roleId:systemPower.value.roleId}).then(
+			(data: any) => {
+				// console.log("获取对应App下边的表单", data);
+				if (Array.isArray(data.data)) {
+					if(number){
+						data.data.forEach((item:any)=>{
+							item.tableIsAll = true
+							item.tablePower = [ "zc", "tj", "dy", "sc", "fz"]
+							item.listPower = [  "xz", "dr", "dc", "sc", "dy", "dyewm"]
+						})
+					}
+					appTableList.value = data.data;
+				} else {
+					appTableList.value = [];
+				}
+				myAppTableLoad.value = false
+			}
+		);
+	}else{
+		myAppTableLoad.value = false
+	}
+    
+};
+watch(()=>systemPower.value.appSystem,(val:string)=>{
+    if(val=="app"){
+        getAppList();
+    }
+	systemPower.value.isPick = false
+},{
+    immediate:true
+})
+const pickAppList = (val: custerAppInfo) => {
+	activeAppId.value = val.signCode
+	// systemPower.value.roleId = val.id
+	// appTableList.value = []
+	systemPower.value.isPick = val.pickAll
+	console.log("选择应用---111111->",val)
+	getAppTableList(val.pickAll);
+	// let cureePick =!val.isPick
+	// val.isPick = cureePick
+  	// activeAppId.value = val.signCode;
+	val.isPick = !val.isPick
+	if(appList.value && Array.isArray(appList.value)){
+		appList.value.forEach((item:custerAppInfo)=>{
+			if(val.signCode!=item.signCode){
+				item.isPick = false
+			}
+			// item.isPick = false
+		})
+	}
+	
+};
+const pickAppTableList = (val: custerAppInfo) =>{
+	console.log("选择应用-22222--111111->",val,appTableList.value)
+	systemPower.value.isPick = !val.pickAll
+	if(val.isPick){
+		appTableList.value.forEach((item:any)=>{
+			// console.log("选择应用-22222--333333->",val.isPick)
+			item.tableIsAll = !val.pickAll
+			if(!val.pickAll){
+				item.listIsAll = true
+				item.tablePower = [ "zc", "tj", "dy", "sc", "fz"]
+				item.listPower = [  "xz", "dr", "dc", "sc", "dy", "dyewm"]
+			}else{
+				item.listIsAll = false
+				item.tablePower = []
+				item.listPower = []
+			}
+		})
+	}
+	
+}
+//选择应用-22222--333333->
+const pickOneAppTableList = (item: any) =>{
+	console.log("选择应用-22222--333333->",item.listIsAll,item)
+	// item.listIsAll = !item.listIsAll
+	if(!item.listIsAll){
+			item.tablePower = [ "zc", "tj", "dy", "sc", "fz"]
+			item.listPower = [  "xz", "dr", "dc", "sc", "dy", "dyewm"]
+	}else{
+			item.tablePower = []
+			item.listPower = []
+	}
+	
+}
+//监听莹莹binh
+// watch(
+//   () => activeAppId.value,
+//   (val) => {
+//     getAppTableList(2);
+//   },
+//   {
+//     immediate:true
+//   }
+// );
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-18 08:38:06
+@ 功能: 提交应用授权
+*/
+const savePowerUserSub = () => {
+    console.log("提交应用授权---1---->",systemPower.value)
+	console.log("提交应用授权---2---->",systemPowerTree.value)
+	let sendInfo =  {
+		powerType: systemPower.value.powerType,
+		appId: systemPower.value.appId,
+		appSystem: systemPower.value.appSystem,
+		roleId: systemPower.value.roleId,
+		isPick: systemPower.value.isPick,
+		sysstemPowerInfo: systemPowerTree.value,
+		CustomizeApp:appTableList.value
+	}
+	console.log("提交应用授权---3---->",sendInfo)
+	systemAppAuthorization(sendInfo).then((data)=>{
+		console.log("提交应用授权-data--3---->",data)
+        if(data.code==0){
+            ElMessage({
+				message: "提交成功",
+				type: "success",
+			})
+        }else{
+            ElMessage({
+				message: "提交失败",
+				type: "error",
+			})
+        }
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-18 09:15:12
+@ 功能: 提交自定义应用内授权
+*/
+const savePowerAppSub = () => {
+    console.log("提交应用授权--app-1---->",systemPower.value)
+	console.log("提交应用授权--app-2---->",appTableList.value)
+	let sendInfo =  {
+		powerType: systemPower.value.powerType,
+		appId: systemPower.value.appId,
+		appSystem: systemPower.value.appSystem,
+		roleId: systemPower.value.roleId,
+		isPick: systemPower.value.isPick,
+		sysstemPowerInfo: systemPowerTree.value,
+		CustomizeApp:appTableList.value
+	}
+	console.log("提交应用授权--app-3---->",sendInfo)
+	systemAppAuthorization(sendInfo).then((data)=>{
+		console.log("提交应用授权--data---app-3---->",data)
+        if(data.code==0){
+            ElMessage({
+				message: "提交成功",
+				type: "success",
+			})
+        }else{
+            ElMessage({
+				message: "提交失败",
+				type: "error",
+			})
+        }
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-18 17:00:46
+@ 功能: 选择用户陪权
+*/
+const pickUser = (item:any) =>{
+	console.log("选择用户陪权--111111->",item)
+	item.isPick = true
+	systemPower.value.roleId = item.id.toString()
+	if(userPowerList.value.list && Array.isArray(userPowerList.value.list)){
+		userPowerList.value.list.forEach((items:any)=>{
+		// console.log("选择用户陪权--111111->",items.id)
+			if(items.id!=item.id){
+				items.isPick = false
+			}
+		})
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-19 08:25:41
+@ 功能: 选择系统菜单授权
+*/
+const pickSystemMenuInfo = (item:AppPowerTree) =>{
+	console.log("选择系统菜单授权--111111->",item)
+	if(item.isTrue){
+		if(item.buttenPower && Array.isArray(item.buttenPower)){
+			item.buttenPower.forEach((child:any)=>{
+				child.isTrue = false
+			})
+		}
+		childPickSystemMenuInfo(item.children,false)
+	}else{
+		if(item.buttenPower && Array.isArray(item.buttenPower)){
+			item.buttenPower.forEach((child:any)=>{
+				child.isTrue = true
+			})
+		}
+		childPickSystemMenuInfo(item.children,true)
+	}
+}
+
+const childPickSystemMenuInfo = (menuList:AppPowerTree[],isTrue:boolean) =>{
+	if(menuList && Array.isArray(menuList)){
+		menuList.forEach((item:AppPowerTree)=>{
+			item.isTrue = isTrue
+			if(item.buttenPower && Array.isArray(item.buttenPower)){
+				item.buttenPower.forEach((child:any)=>{
+					child.isTrue = isTrue
+				})
+			}
+			childPickSystemMenuInfo(item.children,isTrue)
+		})
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-26 10:09:42
+@ 功能: 编辑角色人员
+*/
+const setRolePople  = ref(false)
+const setRoleManInfo = ref<RoleListTree>()
+const editRolePeopel = (item:RoleListTree) =>{
+	console.log("编辑角色人员--111111->",item)
+    setRoleManInfo.value = item
+    setRolePople.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><SetRolePeople v-model:show="setRolePople" :org="orgTree" :role-info="setRoleManInfo" />
+	<div class="app-content">
+		<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="onQuedOrg"/>
+                    </div>
+                    <el-tree-v2
+                        ref="treeRefOrgPost"
+                        style="max-width: 350px;"
+                        :data="orgPostisListdata"
+                        :props="propsOrgPost"
+                        :filter-method="filterMethod"
+                        :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"
+                        @node-click="pickRoleTree"
+                    >
+                        <template #default="{ node }" >
+                            <div class="treeRoleBox">
+                                <span>{{ node.label }}</span>
+                                <div class="spanButBox">
+                                    <el-text v-if="node.data.types == 1" type="danger" size="small" @click.stop="editRolePeopel(node.data)">人员</el-text>
+                                    <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="searchUserQuery.name" placeholder="请输入要查找的人" :suffix-icon="Search" @input="onQueryChangedOrgUser" clearable />                                                                         
+                    </div>
+					<el-scrollbar class="tab_pane_bodyes">
+						<div v-for="item in userPowerList.list" :key="item.id"  :class="item.isPick?'userBox active':'userBox'" @click="pickUser(item)">
+							<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
+							v-model:current-page="searchUserQuery.page"
+                            :page-size="searchUserQuery.pageSize"
+                            :pager-count="7"
+                            layout="prev, pager, next"
+                            :total="userPowerList.total"
+							@change="getPowerPageUserSub"
+                        />
+                    </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="" @click.stop="pickSystemMenuInfo(scope.row)" />
+                            </template>
+                        </el-table-column>
+						<el-table-column prop="isTrue" label="操作按钮" min-width="380" align="center" >
+                            <template #default="scope">
+
+								<template v-for="item in scope.row.buttenPower" :key="item.id" >
+									<el-checkbox  v-model="item.isTrue" :label="item.name" :value="item.isTrue"  />
+								</template>
+                                
+                            </template>
+                        </el-table-column>
+						<el-table-column fixed="right" prop="buttenPower" label="操作按钮" min-width="220"  >
+							<template #header>
+                                <div class="pickButBox">
+                                    <el-text  >数据权限</el-text>
+                                    <el-button type="primary" size="small" @click="savePowerUserSub">确定授权</el-button>
+                                </div>
+                            </template>
+							<template #default="scope">
+								<el-radio-group
+                                    v-model="scope.row.visibleRange.typrs"
+                 
+                                >	
+									<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="scope.row.visibleRange.typrs == 5"
+                                                    v-model="scope.row.visibleRange.val"
+                                                    :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>
+                            </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 >
+                                <td align="center" width="20%">应用</td>
+                                <td width="80%">
+                                    <div  class="appPickPower">
+                                        应用详情
+                                        <el-button type="primary" size="small" @click="savePowerAppSub">确定授权</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)" :class="{'active':item.isPick}"
+											>
+												<el-checkbox @click.stop="pickAppTableList(item)" v-model="item.pickAll"  :value="item.pickAll" :disabled="!item.isPick" ></el-checkbox>
+												{{ 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 v-loading="myAppTableLoad" 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">
+												<el-checkbox  @click.stop="pickOneAppTableList(item)" v-model="item.listIsAll"  :value="item.listIsAll"></el-checkbox>
+                                                {{ 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"
+                                                    
+                                                >
+													<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>
-.app-content {
-  
+.app-content{
+    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  15px;
+        }
+        :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%;
+           
+            display: flex;
+            align-items: center;
+            justify-items: space-between;
+            padding: 5px 10px;
+            border-bottom: 1px dashed rgba($color: #000000, $alpha: 0.2);
+			cursor: pointer;
+            div{
+                span{
+                    display: flex;
+                    width: 100%;
+                    padding: 0 5px;
+                    color:rgba($color: #000000, $alpha: 0.6);
+                }
+            }
 }
+.userBox.active {
+    background-color: #a0cfff;
+  }
 </style>
diff --git a/src/views/system/monitor/online/index2.vue b/src/views/system/monitor/online/index2.vue
index dbe2f5c..09d25ee 100644
--- a/src/views/system/monitor/online/index2.vue
+++ b/src/views/system/monitor/online/index2.vue
@@ -503,11 +503,7 @@ const onQuedOrg = (query: string) => {
                     
                      <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>
+                            <tr>
                                 <td align="center" width="20%">应用</td>
                                 <td width="80%">
                                     <div  class="appPickPower">
diff --git a/src/views/system/monitor/online/roleConfig/setRolePeople.vue b/src/views/system/monitor/online/roleConfig/setRolePeople.vue
new file mode 100644
index 0000000..e1e748c
--- /dev/null
+++ b/src/views/system/monitor/online/roleConfig/setRolePeople.vue
@@ -0,0 +1,308 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-11-26 10:13:15
+@ 备注: 编辑角色使用人
+-->
+<script lang='ts' setup>
+import type { getSystemPower,AppPowerTree,systemList } from "@/api/system/roleapi/types";
+import { savePickRoleMan,getPowerPageUser,getRolePeople } from "@/api/system/roleapi/postrole";
+import type {  TreeInstance  } from 'element-plus'
+import type {RoleListTree} from '@/api/role/types'
+import { Search } from '@element-plus/icons-vue'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+
+const squareUrl = ref<string>(
+  "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png"
+);
+
+const props = defineProps({
+    show: {
+        type: Boolean,
+        default: false
+    },
+    org: {
+        type: Array as () => orgInfo[],
+        default: () => []
+    },
+    roleInfo: {
+        type: Object as () => RoleListTree,
+        default: () => ({})
+    }
+})
+const userLoading = ref(false)
+const emit = defineEmits(['update:show'])
+const isShow = computed(() => {
+    if(props.show){
+        getPowerPageUserSub()
+        getPickUser()
+    }
+    return props.show
+})
+const roleInfo = computed(() => {
+    return props.roleInfo
+})
+const orgTree = computed(() => {
+    return props.org
+})
+const treeBoxHeightOrg = ref(400)
+const treeRefOrgUser = ref<TreeInstance>()
+const propsOrg = {
+  value: 'id',
+  label: 'name',
+//   disabled:'status',
+  children: 'child',
+}
+const userPage = reactive({
+    page: 1,
+    pageSize: 20,
+    orgId: '',
+    name: '',
+    total: 0
+})
+const userPowerList = ref<systemList>({})	//人员树
+const userPowerListPick = ref<systemList[]>([])	//人员树
+const pickUserKey = ref<string[]>([])	//选择的使用人key
+const searchQuery = ref('')	//行政组织搜索
+//搜索行政组织
+const onQuePeople = (query: string) => {
+    console.log(query)
+  treeRefOrgUser.value!.filter(query)
+}
+const filterMethodOrg = (query: string, node: any) => {
+	return node.name!.includes(query)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-26 10:19:05
+@ 功能: 关闭弹窗
+*/
+const closeDialog = () => {
+    emit('update:show', false)
+    userPowerList.value =
+    pickUserKey.value=[]
+    userPowerListPick.value=[]
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-26 16:32:58
+@ 功能: 选择行政组织
+*/
+const pickOrgTree = (node: any) => {
+    userPage.page = 1
+    userPage.name = ''
+    userPage.orgId = node.id
+    console.log(userPage)
+    getPowerPageUserSub()
+}
+
+const getPowerPageUserSub = () => {
+	userLoading.value = true
+    getPowerPageUser(userPage).then(({data})=>{
+        console.log("获取平台授权项目用户------->",data)
+		userPowerList.value = data.list
+        userPage.total = data.total
+        userLoading.value = false
+    })
+}
+const pickName = ref("")
+const getPickUser = () => {
+    getRolePeople({
+        roleId: roleInfo.value.id*1,
+        name: pickName.value
+    }).then(({data})=>{
+        console.log("获取角色使用人------->",data)
+        if(data.list && Array.isArray(data.list)){
+           userPowerListPick.value = data.list
+        }else{
+            userPowerListPick.value = []
+        }
+        
+        pickUserKey.value = data.userKey
+    })
+}
+const pickUserInfo = (item: any) => {
+    let isPick = true
+    if(pickUserKey.value.includes(item.id)){
+        pickUserKey.value = pickUserKey.value.filter((i) => i !== item.id)
+        isPick = false
+    }else{
+        pickUserKey.value.push(item.id)
+        isPick = true
+    }
+    if(isPick){
+        userPowerListPick.value.push(item)
+    }else{
+        userPowerListPick.value = userPowerListPick.value.filter((i) => i.id !== item.id)
+    }
+}
+//判断是否已经选中
+const isPick = (item: any) => {
+    return pickUserKey.value.includes(item.id)
+}
+//删除选中的使用人
+const delUserPick = (item: any) => {
+    pickUserKey.value = pickUserKey.value.filter((i) => i !== item.id)
+    userPowerListPick.value = userPowerListPick.value.filter((i) => i.id !== item.id)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-27 10:18:29
+@ 功能: 保存人员
+*/
+const saveRolePeople = () => {
+    console.log("保存角色使用人------->",roleInfo.value.id*1,pickUserKey.value)
+    savePickRoleMan({
+        roleId: roleInfo.value.id*1,
+        userKey: pickUserKey.value
+    }).then((data)=>{
+        console.log("保存角色使用人------->",data)
+        if(data.code === 0){
+            ElMessage.success("保存成功")
+            closeDialog()
+        }else{
+            ElMessage.error(data.msg || "保存失败")
+        }
+    })
+}
+onMounted(() => {
+    getPickUser()
+})
+</script>
+<template>
+    <el-dialog
+        v-model="isShow"
+        :title="`编辑<<${roleInfo.label}>>角色使用人`"
+        width="800"
+        destroy-on-close
+        :before-close="closeDialog"
+    >
+        <el-row class="dialog-row" :gutter="10">
+            <el-col  :span="8">
+                <div class="quan">
+                    <div class="searchBox">
+                        <el-input v-model="searchQuery" placeholder="请输入要查找的行政组织" :prefix-icon="Search" @input="onQuePeople" clearable />
+                    </div>
+					<el-tree-v2
+                        ref="treeRefOrgUser"
+                        style="max-width: 100%;"
+                        :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>
+                </div>
+            </el-col>
+            <el-col  :span="9">
+                <div class="quan">
+                    <div class="searchBox">
+                        <el-input v-model="userPage.name" placeholder="请输入姓名、工号" :prefix-icon="Search" clearable />
+                    </div>
+                    <el-scrollbar v-loading="userLoading" height="370px">
+                        <div v-for="item in userPowerList" :key="item.id"  :class="isPick(item)?'userBox active':'userBox'"  @click="pickUserInfo(item)">
+							<el-avatar shape="square" :size="size" :src="item.icon?item.icon:squareUrl" />
+							<div class="userInfo">
+                                <el-text type="primary" >{{ item.name }}({{ item.code }})</el-text>
+                                <el-text type="primary" >{{ item.org }}</el-text>
+                            </div>
+                            <div style="width: 40px;">
+                                
+                            </div>
+						</div>                        
+                    </el-scrollbar>
+                    <div class="paginationBox">
+                       
+                        <el-pagination
+							v-model:current-page="userPage.page"
+                            :page-size="userPage.pageSize"
+                            :pager-count="7"
+                            layout="prev, pager, next"
+                            :total="userPage.total"
+							@change="getPowerPageUserSub"
+                        />
+                    </div>
+                </div>
+            </el-col>
+            <el-col  :span="7">
+                <div class="quan">
+                    <div class="searchBox">
+                        <!-- <el-input v-model="pickName" placeholder="请输入姓名、工号" :prefix-icon="Search" clearable /> -->
+                         已经选择的使用人
+                    </div>
+                    <el-scrollbar height="415px">
+                        <div v-for="item in userPowerListPick" :key="item.id"  class="userBox" >
+							<el-avatar shape="square" :size="size" :src="item.icon?item.icon:squareUrl" />
+							<div class="userInfo">
+                                <el-text type="primary" >{{ item.name }}({{ item.code }})</el-text>
+                                <el-text type="primary" >{{ item.org }}</el-text>
+                            </div>
+                            <div>
+                                <svg-icon icon-class="dels" @click="delUserPick(item)" />
+                            </div>
+						</div>                        
+                    </el-scrollbar>
+                </div>
+            </el-col>
+        </el-row>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="closeDialog">取消</el-button>
+                <el-button type="primary" @click="saveRolePeople">
+                确认
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<style  lang='scss' scoped>
+.dialog-row{
+    width: 100%;
+    .quan{
+        width: 100%;
+        border: 1px solid #ccc;
+        overflow: hidden;
+    }
+    .searchBox{
+        padding: 5px 10px 5px 10px;
+    }
+    
+}
+.userBox{
+            width: 100%;
+           
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 5px 10px;
+            border-bottom: 1px dashed rgba($color: #000000, $alpha: 0.2);
+			
+            .userInfo{
+                width: 60%;
+            }
+            div{
+                span{
+                    display: flex;
+                    width: 100%;
+                    padding: 0 5px;
+                    color:rgba($color: #000000, $alpha: 0.6);
+                }
+            }
+            svg{
+                cursor: pointer;
+                color: #FF0000;
+            }
+}
+.userBox.active {
+    background-color: #a0cfff;
+}
+.paginationBox{
+    width: 100%;
+    display: flex;
+    justify-content: center;
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
index 1cd3b2e..4b5ed83 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
@@ -247,7 +247,7 @@ const initWorkFlowData = async () => {
   processConfig.value.workFlowDef.formKey = appPageKey.value;
   nodeConfig.value = nodes;
   flowPermission.value = flowPermissiones;
-  directorMaxLeveling = levels;
+  directorMaxLeveling.value = levels;
   workFlowDef.value = workName;
 
   setTableId(tableId);
@@ -397,7 +397,7 @@ const gainFlowCont = () => {
       processConfig.value.workFlowDef.formKey = appPageKey.value;
       nodeConfig.value = data.data.nodeConfig;
       flowPermission.value = data.data.flowPermission;
-      directorMaxLeveling = data.data.directorMaxLevel;
+      directorMaxLeveling.value = data.data.directorMaxLevel;
       workFlowDef.value = data.data.workFlowDef;
       setTableId(data.data.tableId);
       flowIsTrue.value = true;
diff --git a/src/views/taskplatform/taskmanagement/edittaskcustomerform.vue b/src/views/taskplatform/taskmanagement/edittaskcustomerform.vue
deleted file mode 100644
index 32795b4..0000000
--- a/src/views/taskplatform/taskmanagement/edittaskcustomerform.vue
+++ /dev/null
@@ -1,248 +0,0 @@
-<!--
-@ 作者: 秦东
-@ 时间: 2023-09-26 09:12:55
-@ 备注: 编辑自定义表单数据
--->
-<script lang='ts' setup>
-import { ref, reactive, onMounted, computed, nextTick } from 'vue'
-import {  useRouter } from 'vue-router'
-import {
-    string2json,
-    stringToObj
-} from '@/utils/DesignForm/form'
-
-import { haveCustomerFormVersion } from '@/api/taskapi/management'
-import { judgeSubmitCancel } from '@/api/DesignForm/requestapi'
-
-import '@/assets/scss/element-var.scss'
-import '@/assets/scss/index.scss'
-import '@/assets/iconfont/iconfont.css'
-import 'element-plus/dist/index.css'
-
-const props = defineProps({
-	iseditopen:{
-		type:Boolean,
-		default:true
-	},
-	versionid:{
-		type:String,
-		default:""
-	},
-	versiontitle:{
-		type:String,
-		default:""
-	},
-	masterskey:{
-		type:String,
-		default:""
-	},
-	infoid:{
-		type:String,
-		default:""
-	},
-	drawerwith:{
-		type:Number,
-		default:0
-	}
-})
-const submitButton = {
-    type: "div",
-    control:{},
-    config:{
-		textAlign: "center",
-		span: ""
-    },
-    list: [
-		{
-			type: "button",
-			control:{
-				label: "保存",
-				type: "primary",
-				key: "submit"
-			},
-		config:{
-				textAlign: "center"
-			}
-		}
-	]
-}
-const cancelButton = {
-    type: "div",
-    control:{},
-    config:{
-      textAlign: "center",
-      span: ""
-    },
-    list: [
-		{
-			type: "button",
-			control:{
-				label: "返回",
-				type: "danger",
-				key: "cancel"
-			},
-			config:{
-				textAlign: "center"
-			}
-		}
-	]
-}
-const submitAndCancelButton = {
-    type: "div",
-    control:{},
-    config:{
-      span: 24,
-      textAlign: "center"
-    },
-    list: [
-		{
-			type: "button",
-			control:{
-				label: "保存",
-				type: "primary",
-				key: "submit"
-			},
-			config:{
-				span: 0
-			}
-		},
-		{
-			type: "button",
-			control:{
-				label: "返回",
-						type: "danger",
-				key: "cancel"
-			},
-			config:{
-				span: 0
-			}
-		}
-	]
-};
-const loadingData = ref(false)
-const formEl = ref()
-const state = reactive<any>({
-	type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
-    formData: {
-      list: [],
-      form: {},
-      config: {}
-    },
-    dict: {},
-    formId: props.versionid,
-    id: props.masterskey,
-    loading: true
-})
-const formType = computed(() => {
-    // 带有参数id为编辑状态
-    if (props.infoid) {
-      return 2
-    } else {
-      return 1
-    }
-})
-const emits = defineEmits(["update:iseditopen","searchquery"]);
-const isShow =   computed({
-	get: () => props.iseditopen,
-	set: (val) => {
-		emits("update:iseditopen", val);
-	},
-});
-//获取表单数据
-const getTaskFormData = () =>{
-	loadingData.value = true;
-	haveCustomerFormVersion({id:props.versionid})
-		.then(({ data }) =>{
-			// console.log("表单数据",data)
-			state.id=props.versionid
-			state.formData = stringToObj(data.mastesform)
-      		state.dict = string2json(data.dict)
-			  
-				judgeSubmitCancel({"name":data.mastesformjson})
-					.then((data:any) =>{
-						if(data.code == 0){
-							if (data.data == 3 || data.data == 4){
-								state.formData.list.push(submitButton)
-							}
-						}
-					})
-		})
-		.finally(()=>{
-			formEl.value.getData({ formId: props.versionid, id: props.masterskey})
-			loadingData.value = false;
-		})
-}
-
-const drawerWith = ref<number>(0);
-onMounted(()=>{
-	drawerWith.value = window.innerWidth - 220
-	
-});
-window.addEventListener("resize", function(){
-	drawerWith.value = window.innerWidth -220
-})
-const beforeSubmit = (params: any) => {
-    params.formId =  props.masterskey
-    params.id = props.versionid
-	// emits("update:isopen", false);
-	// console.log(params,"===========================>")
-    return params
-}
-const afterSubmit = (type: string) => {
-	if (type === 'success') {
-		// router.go(-1)
-		// console.log("表单提交成功")
-		emits("searchquery");
-		closeAppSubmit();
-		
-	}
-}
-const closeAppSubmit = () => {
-	emits("update:iseditopen", false);
-	initData();
-}
-const initData = () => {
-	state.formData = {
-      list: [],
-      form: {},
-      config: {}
-    };
-	state.dict = {};
-	state.formId = 0;
-	state.id = 0;
-	state.loading = true;
-}
-watch(()=>props.iseditopen,()=>{
-	if(props.iseditopen){
-		getTaskFormData();
-	}else{
-		initData()
-	}
-})
-const changeKeyVal = (key:any,val:any,type:any,attribute:any) => {
-
-}
-</script>
-<template>
-	<el-drawer  v-model="isShow" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerwith" class="drawerClass" >
-		<div class="drawerBody">
-			<ak-form
-				ref="formEl"
-				:form-data="state.formData"
-				:type="formType"
-				:dict="state.dict"
-				request-url="getFormContent"
-				add-url="saveFormContent"
-				edit-url="editFormContent"
-				:before-submit="beforeSubmit"
-				:after-submit="afterSubmit"
-				:close-app-submit="closeAppSubmit"
-				:change-key-val="changeKeyVal"
-			/>
-		</div>
-    	
-  	</el-drawer>
-</template>
-<style  lang='scss' scoped>
-
-</style>
diff --git a/src/views/taskplatform/taskmanagement/flowStep.vue b/src/views/taskplatform/taskmanagement/flowStep.vue
index 2801615..6dcac8a 100644
--- a/src/views/taskplatform/taskmanagement/flowStep.vue
+++ b/src/views/taskplatform/taskmanagement/flowStep.vue
@@ -141,7 +141,6 @@ const updateNode = (val:any) =>{
 					</el-tooltip>
 				</template>
 				<template #description>
-
 						<table>
 							<tr  v-for="items in item.operator" :key="items.id">
 								<td  valign="top" align="center" width="50">
@@ -187,7 +186,7 @@ const updateNode = (val:any) =>{
 				</template>
 			</el-step>
 		</el-steps>
-		{{ openOrClose }}======={{ openclosebox }}
+		
 		<OrgUserPage v-if="openOrClose" v-model:openclose="openOrClose" :preset-personnel="presetPersonnel" :selected-people="selectedPeople" @update-node="updateNode" />
 		<OrgAllUserPage v-if="openclosebox" v-model:openclosebox="openclosebox" :selected-people="selectedPeople"  @update-node="updateNode" />
 	</div>
@@ -200,4 +199,4 @@ const updateNode = (val:any) =>{
 	display:block;
 	cursor:pointer;
 }
-</style>
+</style> 
diff --git a/vite.config.ts.timestamp-1763685117626-b9e83b063ec3.mjs b/vite.config.ts.timestamp-1763685117626-b9e83b063ec3.mjs
new file mode 100644
index 0000000..6ffe830
--- /dev/null
+++ b/vite.config.ts.timestamp-1763685117626-b9e83b063ec3.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"]
}


From ef4f7e263b24fc4107d58dae7301e669a4f9dff9 Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Thu, 4 Dec 2025 08:31:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/index.ts                   |   4 +-
 src/api/system/roleapi/power.ts               |  24 +
 src/directive/permission/button.ts            |  24 +-
 src/store/modules/user.ts                     |   2 +-
 src/views/hr/archives/archivescont.vue        |   5 +-
 src/views/hr/archives/index.vue               | 924 +++++++++++++++---
 src/views/hr/archives/index_20251202.vue      | 200 ++++
 .../hr/archives/unitpage/addUserPage.vue      | 274 ++++++
 .../hr/archives/unitpage/batchImport.vue      | 235 +++++
 src/views/hr/archives/unitpage/lockInfo.vue   |  96 ++
 .../hr/archives/unitpage/uploadTemplate.vue   | 222 +++++
 src/views/nested/.editorconfig                |  12 +
 .../lowcodepage/appPage/appSetUp/setup.vue    |   1 +
 13 files changed, 1892 insertions(+), 131 deletions(-)
 create mode 100644 src/views/hr/archives/index_20251202.vue
 create mode 100644 src/views/hr/archives/unitpage/addUserPage.vue
 create mode 100644 src/views/hr/archives/unitpage/batchImport.vue
 create mode 100644 src/views/hr/archives/unitpage/lockInfo.vue
 create mode 100644 src/views/hr/archives/unitpage/uploadTemplate.vue
 create mode 100644 src/views/nested/.editorconfig

diff --git a/src/api/DesignForm/index.ts b/src/api/DesignForm/index.ts
index 5410828..f35bbe0 100644
--- a/src/api/DesignForm/index.ts
+++ b/src/api/DesignForm/index.ts
@@ -63,7 +63,9 @@ export const getRequest = (apiKey: string, data?: any, options: any = {}) => {
   return request(obj)
 }
 // export const uploadUrl = '/api/' + allApi.upload
-export const uploadUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
+// export const uploadUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
+export const uploadUrl = import.meta.env.VITE_APP_BASE_API+"/setupFile/uploads/oneFileUpload"
+export const uploadUrlNew = import.meta.env.VITE_APP_BASE_API+"/setupFile/uploads/oneFileUpload"
 export function uploadFiledTinymce(data:any, url:any) {
   return request({
     url: url || '/api/upordown',
diff --git a/src/api/system/roleapi/power.ts b/src/api/system/roleapi/power.ts
index 6a3037c..39bbd92 100644
--- a/src/api/system/roleapi/power.ts
+++ b/src/api/system/roleapi/power.ts
@@ -23,3 +23,27 @@ export function authorizeOrgTree(data?: getSystemPower){
       data:data
     });
 }
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-28 10:24:09
+@ 功能: 根据权限获取数据
+*/
+export function authorizePeopleList(data?: getSystemPower){
+    return request({
+      url: '/systemapi/hr/authorizePeopleList',
+      method: 'post',
+      data:data
+    });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-11-28 10:24:09
+@ 功能: 新增人员
+*/
+export function addNewPeople(data?: getSystemPower){
+    return request({
+      url: '/systemapi/hr/addNewPeople',
+      method: 'post',
+      data:data
+    });
+}
diff --git a/src/directive/permission/button.ts b/src/directive/permission/button.ts
index d57d71c..b44d998 100644
--- a/src/directive/permission/button.ts
+++ b/src/directive/permission/button.ts
@@ -7,17 +7,17 @@ import { useUserStore } from "@/store/modules/user";
 export const hasButton: Directive = {
   mounted(el: HTMLElement, binding: DirectiveBinding) {
     const userStore = useUserStore();
-    // const { value,oldValue } = binding;
-    // console.log("按钮权限",el,"-->",binding,"-->",value,"-->",oldValue,"-->",userStore.myPower);
-    console.log("按钮权限",el,"-->",binding,"-->","-->",userStore.myPower);
-    // if (value) {
-    //     const requiredPerms = value; // DOM绑定需要的按钮权限标识
-    //     const hasPerm = userStore.myPower.menuIdAry.some((perm: any) => {
-    //         return requiredPerms.includes(perm);
-    //     });
-    //     if (!hasPerm) {
-    //         el.parentNode?.removeChild(el);
-    //     }
-    // }
+    const { value } = binding;
+    // console.log("按钮权限",el,"-->",binding,"-->",value,"-->",userStore.myPower.menuButIdAry,"-->",userStore.myPower);
+
+    if (value) {
+        const requiredPerms = value; // DOM绑定需要的按钮权限标识
+        const hasPerm = userStore.myPower.menuButIdAry.some((perm: any) => {
+            return requiredPerms.includes(perm);
+        });
+        if (!hasPerm) {
+            el.parentNode?.removeChild(el);
+        }
+    }
   }
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f8db4d3..4863bda 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -96,7 +96,7 @@ export const useUserStore = defineStore("user", () => {
       //   });
 			getUserInfoIng()
 					.then(({data})=>{
-						console.log("获取用户信息：角色必须是非null数组！",data);
+						// console.log("获取用户信息：角色必须是非null数组！",data);
 						// debugger;
 						if (!data) {
 							return reject("验证失败，请重新登录。");
diff --git a/src/views/hr/archives/archivescont.vue b/src/views/hr/archives/archivescont.vue
index 1a0e2b4..34ef36f 100644
--- a/src/views/hr/archives/archivescont.vue
+++ b/src/views/hr/archives/archivescont.vue
@@ -57,7 +57,7 @@ const userIcon = ref<string>(); //人员头像
 const boxTitle = ref<string>(); //弹出框标题
 const userConting = ref<any>(""); //人员信息
 const rowLoading = ref(false);
-const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API + "/api/upordown"; //图片上传地址
+const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/setupFile/uploads/oneFileUpload";//图片上传地址
 const editMyOrgCont = ref(false); //编辑行政组织
 const editMyCont = ref(false); //编辑个人信息
 /**
@@ -134,11 +134,14 @@ const handleAvatarSuccess: UploadProps["onSuccess"] = (
   uploadFiles
 ) => {
   userIcon.value = URL.createObjectURL(uploadFile.raw!);
+  // console.log("上传成功-------------------->", uploadFile);
+  // console.log("上传成功-------------------->", props.archivesdata.id);
   //修改人员头像
   editMyInfoIcon({
     id: props.archivesdata.id,
     iconpath: response.data.url,
   }).then((data) => {
+    fileUploadIng.value = false;
     ElMessage.success("编辑成功");
     emits("getarchivespageclick");
   });
diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue
index 9f44a36..013825e 100644
--- a/src/views/hr/archives/index.vue
+++ b/src/views/hr/archives/index.vue
@@ -1,40 +1,96 @@
 <!--
 @ 作者: 秦东
-@ 时间: 2025-11-28 10:11:16
+@ 时间: 2025-12-02 09:47:59
 @ 备注: 人员列表
 -->
 <script lang='ts' setup>
 import { emptypeOptions } from "@/api/hr/people/datacont";
 import { orgInfo } from "@/api/hr/org/type";
-import { authorizeOrgTree } from '@/api/system/roleapi/power'
+import { authorizeOrgTree,authorizePeopleList } from '@/api/system/roleapi/power'
+import { archivesCont } from "@/api/hr/people/type";
 import {
-  teamcontlist
+  teamcontlist,
+  jiechuUserLock,
+  gainUserInfoDownTemplateList,
 } from "@/api/hr/org/index";
+import { ElTree, type ComponentSize } from 'element-plus'
+import {
+  anaRedisOrgStaffExc,
+} from "@/api/hr/people/index";
+import lockInfo from "@/views/hr/archives/unitpage/lockInfo.vue"
+import BatchImport from "@/views/hr/archives/unitpage/batchImport.vue"
+import UploadTemplate from "@/views/hr/archives/unitpage/uploadTemplate.vue"
+import XingGeFengXi from "@/views/hr/archives/downpage/xingGeFengXi.vue";
+import ArchivesContPage from "@/views/hr/archives/archivescont.vue";
+import AddUserPage from "@/views/hr/archives/unitpage/addUserPage.vue";
+
+
 
+const uploadFFurlStaff = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/upLoadPeopelMerits";
+const addUserBox = ref(false); //添加人员弹窗
+const excelJiexi = ref(false)
 const orgTreeRef = ref(ElTree); //行政组织树
 const orgTreeLoading = ref(false); //加载行政组织树
 const orgTreeList = ref<orgInfo[]>(); //行政组织树数据
 const tiemList = ref([]); //班组列表
+const tableLoading = ref(false)
+const peopleList = ref<archivesCont[]>(); //人员列表
+const peoplecont = ref<archivesCont>(); //个人信息
+const excelUploadStaff = ref<any>();
+const innerRef = ref<HTMLDivElement>();
+const scrollbarRef = ref<InstanceType<typeof ElScrollbarType>>();
+//批量导入数据相关操作
+const piLiangBox = ref(false);
 const orgTreeProps = {
   children: "child",
   label: "name",
 }; //行政组织树对照值
-
+const pageDefaultSize = ref<ComponentSize>('default')
 const searchInfo = reactive({
     orgId:"",
     name:"",
     employ:"",
     team:"",
-    joinTime:""
+    joinTime:"",
+    page:1,
+    pagesize:20,
+    total:0,
 })
-
+const search = reactive({
+  page: 1,
+  pagesize: 20,
+});
+const ruleForm = reactive({
+  id: "",
+  orgId: "",
+  fileName: "",
+  filePath: "",
+  fileUrl: "",
+});
+const isNewAddTem = ref(false);
+const setupActiveName = ref("1");
+const ubLockPage = ref(false);
+const openSetup = ref(false);
+const direction = ref("rtl");
+const downTemplate = ref();
+const totalVal = ref(0);
+const openTableType = ref(false);
+const downTableType = ref("10000003");
+const downClassType = ref(1);
+const orgListTemp = ref<any>([]);
+let peopleListAry = new Array();
+const peopleMsg = ref<string[]>([]);
+const archivesBox = ref(false); //详情弹窗
+let jiBuQiVal = 0;
+const progressSize = ref(0);
+//获取行政组织
 const getOrgPowerTrue =  () => {
     orgTreeLoading.value = true
     let sendInfo = {
         menuId:"50"
     }
     authorizeOrgTree(sendInfo).then((res) => {
-        console.log(res)
+        // console.log(res)
         orgTreeList.value = res.data
         orgTreeLoading.value = false
     }).finally(() => {
@@ -57,7 +113,10 @@ const gainTimeList = () => {
   });
 };
 const resetChecked = () => {
-    orgTreeRef.value.setCheckedKeys([])
+  searchInfo.orgId = 0
+  orgTreeRef.value.setCheckedKeys([])
+  handleCurrentChange(1);
+    
 }
 /**
  * 选中行政组织树节点
@@ -65,124 +124,743 @@ const resetChecked = () => {
 const handleOrgTreeNodeClick = (data: orgInfo) => {
   // console.log(data)
   searchInfo.orgId = data.id;
-//   getArchivesPage();
+  handleCurrentChange(1);
+
+};
+
+const handleSizeChange = (val: number) => {
+  searchInfo.page = 1
+  searchInfo.pagesize = val
+  getArchivesPage();
+}
+const handleCurrentChange = (val: number) => {
+  searchInfo.page = val
+  getArchivesPage();
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-02 09:47:59
+@ 功能: 获取人员列表
+*/
+const getArchivesPage = () => {
+    tableLoading.value = true
+    let sendInfo = {
+        menuId:"50",
+        orgId:searchInfo.orgId,
+        name:searchInfo.name,
+        employ:searchInfo.employ,
+        team:searchInfo.team,
+        joinTime:searchInfo.joinTime,
+        page:searchInfo.page,
+        pagesize:searchInfo.pagesize,
+    }
+    authorizePeopleList(sendInfo).then((res) => {
+        // console.log(res)
+        peopleList.value = res.data.list
+        searchInfo.total = res.data.total
+        tableLoading.value = false
+    }).finally(() => {
+        tableLoading.value = false
+    })
+}
+//清楚锁定
+const unLockUSer = (val: any) => {
+  // console.log("解说-jiechuUserLock--》", val);
+  jiechuUserLock({ userId: val.number }).then((res: any) => {
+    getArchivesPage();
+  });
+};
+//批量解锁
+const openUnlico = () => {
+  ubLockPage.value = true;
+};
+
+//打开批量导入面板
+const openPiliangBox = () => {
+  console.log(piLiangBox.value)
+  piLiangBox.value = true
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 09:57:42
+@ 功能: 设置相关操作
+*/
+const setupClick = () => {
+  openSetup.value = true;
+  temList();
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 10:12:29
+@ 功能: 关闭设置
+*/
+const closeSetup = () => {
+  openSetup.value = false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 13:33:41
+@ 功能: 获取导入模版下载列表
+*/
+const temList = () => {
+  gainUserInfoDownTemplateList(search).then((data: any) => {
+    console.log("获取导入模版下载列表---<", data);
+    downTemplate.value = data.data.list;
+    totalVal.value = data.data.total;
+  });
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-26 11:45:44
+@ 功能: 编辑下载文件
+*/
+const editUserTemp = (val: any) => {
+  ruleForm.id = val.id.toString();
+  ruleForm.orgId = val.orgId;
+  ruleForm.fileName = val.fileName;
+  ruleForm.filePath = val.filePath;
+  ruleForm.fileUrl = val.fileUrl;
+  console.log("编辑下载文件---->", ruleForm);
+  isNewAddTem.value = true;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-26 11:08:00
+@ 功能: 编辑下载模版状态
+*/
+const delUserTemp = (val: any, status: number) => {
+  // console.log("编辑下载模版状态------1------->",val);
+  // console.log("编辑下载模版状态------2------->",status);
+  let sendVal = {
+    id: val.id.toString(),
+    status: status,
+  };
+  editUsefrTempr(sendVal).then((data: any) => {
+    ElMessage.success(data.msg);
+    temList();
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 10:53:27
+@ 功能: 上传新模版
+*/
+const setUpNewTemplate = () => {
+  isNewAddTem.value = true;
+
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 13:10:07
+@ 功能: 下载九色人格
+*/
+const selectDownTiaojian = (val: string) => {
+  downTableType.value = val;
+  openTableType.value = true;
+  downClassType.value = 1;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:23:09
+@ 功能: 关闭下载页面
+*/
+const closeXigePage = () => {
+  openTableType.value = false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:55:09
+@ 功能: 性格类型
+*/
+const characterList = reactive([
+  {
+    label: "性格色彩",
+    code: "10000001",
+  },
+  {
+    label: "DISC性格特质",
+    code: "10000002",
+  },
+  {
+    label: "九型人格特质",
+    code: "10000003",
+  },
+]);
+const stafftempForm = reactive({
+  orgId: "",
+});
+//上传绩效成绩解析
+const staffChengji = reactive({
+  orgId: "",
+  redisListKey: "",
+  total: "",
+  years: "",
+  levels: "",
+  number: 0,
+});
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 13:20:27
+@ 功能: 下载
+*/
+const downStatistics = (val: any) => {
+  console.log("下载数据嗖嗖嗖--->", val);
+  downTableType.value = val.code;
+  openTableType.value = true;
+  downClassType.value = 2;
+};
+const orgTreePropsBut = {
+    children: "child",
+    value: "id",
+    label: "name",
+}; //行政组织树对照值
+
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 13:51:02
+@ 功能: 上传前文件检查                                                                                       m
+*/
+function handleExcelChangeTempStaff(file: UploadFile) {
+  excelLoading.value = true;
+  if (stafftempForm.orgId == 0 || stafftempForm.orgId == "") {
+    ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
+    excelLoading.value = false;
+    return false;
+  }
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    ElMessage.warning("上传Excel只能为xlsx、xls格式");
+    excelLoading.value = false;
+    return false;
+  }
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-02-03 14:04:48
+@ 功能: 上传成功
+*/
+const uploadTrueStaff = (
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) => {
+  excelLoading.value = false;
+  // console.log("response",response);
+  // console.log("uploadFile",uploadFile);
+  // console.log("uploadFiles",uploadFiles);
+  peopleListAry.push("文件上传成功！开始解析数据并写入数据库！");
+  peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！");
+  // peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
+  console.log("上传成功", response.code);
+  if (response.code == 0) {
+    jiBuQiVal = 0;
+    progressSize.value = 0;
+    excelJiexi.value = true;
+    staffChengji.orgId = response.data.orgId;
+    staffChengji.redisListKey = response.data.redisListKey;
+    staffChengji.total = response.data.total;
+    staffChengji.years = response.data.years;
+    staffChengji.levels = response.data.levels;
+    console.log("上传成功===>", staffChengji);
+    insetPeopleContStall();
+  }
 };
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 13:58:37
+@ 功能: 解析数据上传
+*/
+const insetPeopleContStall = () => {
+  // console.log("启动数据写入数据库",jiBuQiVal,totalNum.value)
+  if (jiBuQiVal < staffChengji.total) {
+    staffChengji.number = jiBuQiVal;
+    // console.log("启动数据写入数据库",sendData)
+    anaRedisOrgStaffExc(staffChengji).then((data: any) => {
+      console.log("启动数据写入11111数据库", data, data.data);
+      peopleMsg.value.push(data.data.msgStr);
+      jiBuQiVal++;
+      // if (jibuq+ 1 >= totalNum.value){
+
+      // }
+      progressSize.value = Math.round((jiBuQiVal / staffChengji.total) * 10000) / 100;
+      insetPeopleContStall();
+      nextTick(() => {
+        // handleClick();
+      });
+    });
+  } else {
+    excelJiexi.value = false;
+    progressSize.value = 100;
+    excelUploadStaff.value.clearFiles();
+  }
+};
+
+/**
+ * 查看详情
+ */
+function lookPeopleCont(cont: archivesCont) {
+  peoplecont.value = cont;
+  archivesBox.value = true;
+}
+/**
+ * 更新个人信息
+ */
+function updateMyCont(cont: archivesCont) {
+  peoplecont.value = cont;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 14:21:07
+@ 功能: 添加人员
+*/
+const handleAddArchives = () => {
+  addUserBox.value = true;
+}
+
+
+
+
+
+
+
+
+
 onMounted(() => {
     getOrgPowerTrue();
     gainTimeList();
+    getArchivesPage();
 })
 </script>
 <template>
   <div class="app-content">
     <el-container>
-        <el-aside width="300px" style="padding: 10px 10px">
-            <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 5px' }">
-                <el-button
-                    type="primary"
-                    style="width: 100%; margin: 10px 0"
-                    @click="resetChecked"
+      <el-aside width="300px" style="padding: 10px 10px">
+        <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 5px' }">
+          <el-button
+            type="primary"
+            style="width: 100%; margin: 10px 0"
+            @click="resetChecked"
+          >
+            查看全部
+          </el-button>
+          <el-tree-v2
+            ref="orgTreeRef"
+             style="max-width: 100%"
+             :data="orgTreeList"
+             :props="orgTreeProps"
+             v-loading="orgTreeLoading"
+             node-key="id"
+             :expand-on-click-node="false"
+             :check-on-click-node="true"
+             :check-strictly="true"
+             :default-expand-all="false"
+             :height="1200"
+            @node-click="handleOrgTreeNodeClick"
+          />
+        </el-card>
+      </el-aside>
+
+      <el-main style="padding: 10px 10px 0 0">
+        <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 15px' }">
+          <el-form ref="searchForm" :model="searchInfo" :inline="true" style="width: 100%; margin-top: 10px;">
+            <el-form-item label="工号 / 姓名 / 手机号" prop="name">
+                <el-input
+                    v-model="searchInfo.name"
+                    placeholder="请输入工号/姓名/手机号"
+                    clearable
+                />
+              </el-form-item>
+              <el-form-item label="用工关系" prop="number">
+                <el-select
+                    v-model="searchInfo.employ"
+                    multiple
+                    clearable
+                    collapse-tags
+                    placeholder="用工关系"
+                    style="width: 200px"
                 >
-                查看全部
-                </el-button>
-                <el-tree-v2
-                    style="max-width: 100%"
-                    :data="orgTreeList"
-                    :props="orgTreeProps"
-                    v-loading="orgTreeLoading"
-                    node-key="id"
-                    :expand-on-click-node="false"
-                    :check-on-click-node="true"
-                    :check-strictly="true"
-                    :default-expand-all="false"
-                    :height="1200"
-                    @node-click="handleOrgTreeNodeClick"
+                  <el-option
+                      v-for="item in emptypeOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                   />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="班组" prop="number">
+              <el-select
+                  v-model="searchInfo.team"
+                  multiple
+                  clearable
+                  collapse-tags
+                  placeholder="员工班组"
+                  style="width: 240px"
+              >
+                <el-option
+                  v-for="item in tiemList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 />
-            </el-card>
-        </el-aside>
-
-
-
-        <el-main style="padding: 10px 10px 0 0">
-            <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 15px' }">
-                <el-form ref="searchForm" :model="searchInfo" :inline="true" style="width: 100%; margin-top: 10px;">
-                    <el-form-item label="工号 / 姓名 / 手机号" prop="keywords">
-                        <el-input
-                            v-model="searchInfo.name"
-                            placeholder="请输入工号/姓名/手机号"
-                            clearable
-                        />
-                    </el-form-item>
-                    <el-form-item label="用工关系" prop="number">
-                        <el-select
-                            v-model="searchInfo.employ"
-                            multiple
-                            clearable
-                            collapse-tags
-                            placeholder="用工关系"
-                            style="width: 200px"
-                        >
-                            <el-option
-                                v-for="item in emptypeOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="班组" prop="number">
-                        <el-select
-                            v-model="searchInfo.team"
-                            clearable
-                            collapse-tags
-                            placeholder="员工班组"
-                            style="width: 240px"
-                        >
-                            <el-option
-                            v-for="item in tiemList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                            />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="入职日期" prop="number">
-                        <el-date-picker
-                            v-model="searchInfo.joinTime"
-                            type="date"
-                            placeholder="入职日期"
-                            format="YYYY-MM-DD"
-                            value-format="YYYY-MM-DD"
-                        />
-                    </el-form-item>
-                    <el-form-item label="" prop="number">
-                        <el-button type="primary" @click="getArchivesPage">
-                            <template #icon><i-ep-search /></template>
-                            搜索
-                        </el-button>
-                        <el-button @click="resetArcFormQuery">
-                            <template #icon><i-ep-refresh /></template>
-                            重置
-                        </el-button>
-                    </el-form-item>
-                </el-form>
-                <div class="func-but">
-                    <el-button v-hasButton="(50,[215437071358111744])" type="primary" @click="handleAddArchives">
-                        <template #icon><i-ep-plus /></template>
-                        新增
-                    </el-button>
-                    <el-button
-                        v-hasPerm="['215437153071542272']"
-                        plain
-                        type="primary"
-                        @click="openPiliangBox"
-                    >
-                        <el-icon><MessageBox /></el-icon>
-                        批量导入数据
-                    </el-button>
-                </div>
-            </el-card>
-        </el-main>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="入职日期" prop="number">
+              <el-date-picker
+                  v-model="searchInfo.joinTime"
+                  type="date"
+                  placeholder="入职日期"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+              />
+            </el-form-item>
+            <el-form-item label="" prop="number">
+              <el-button type="primary" @click="getArchivesPage">
+                <template #icon><i-ep-search /></template>搜索
+              </el-button>
+              <el-button @click="resetArcFormQuery">
+                <template #icon><i-ep-refresh /></template>重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+          <div class="func-but">
+            <el-button v-hasButton="['215437071358111744']" type="primary" @click="handleAddArchives">
+              <template #icon><i-ep-plus /></template>新增
+            </el-button>
+            <el-button
+              v-hasButton="['215437153071542272']"
+              plain
+              type="primary"
+              @click="openPiliangBox"
+            >
+              <el-icon><MessageBox /></el-icon>批量导入数据
+            </el-button>
+            
+            
+            <el-button type="success" @click="setupClick">
+              <el-icon><Setting /></el-icon>设置
+            </el-button>
+            <el-button type="warning" @click="openUnlico">
+              <el-icon><Unlock /></el-icon>批量解锁
+            </el-button>
+          </div>
+
+          <el-table
+            v-loading="tableLoading"
+            highlight-current-row
+            stripe
+            :data="peopleList"
+            :header-cell-style="{ background: '#F5F7FA' }"
+            class="tableBox"
+          >
+            <el-table-column fixed label="照片" width="60" align="center">
+              <template #default="scope">
+                <el-avatar
+                  v-if="scope.row.icon != ''"
+                  shape="square"
+                  :size="30"
+                  :src="scope.row.icon"
+                />
+                <el-avatar
+                  v-else-if="scope.row.iconphoto != ''"
+                  shape="square"
+                  :size="30"
+                  :src="scope.row.iconphoto"
+                />
+                <el-avatar v-else shape="square" :size="30" :src="UserRole" />
+              </template>
+            </el-table-column>
+            <el-table-column fixed label="姓名" prop="name" width="100">
+                <template #default="scope">
+                  {{ scope.row.name }}
+                  <el-tag v-if="scope.row.personincharge == 1" type="danger"
+                    >负责人</el-tag
+                  >
+                </template>
+            </el-table-column>
+            <el-table-column
+                fixed
+                label="工号"
+                prop="number"
+                width="120"
+                align="center"
+            />
+             <el-table-column
+                label="归属行政组织"
+                prop="orgAllName"
+                width="320"
+                align="center"
+            />
+            <el-table-column
+                label="岗位"
+                prop="positionname"
+                width="120"
+                align="center"
+            />
+            <el-table-column  label="联系方式" prop="mobilephone" width="120" />
+            <el-table-column  label="居住地" prop="currentresidence" />
+            <el-table-column fixed="right" align="center" label="操作" width="120">
+              <template #default="scope">
+                  <el-button
+                    v-hasButton="['275256219474604032']"
+                    type="primary"
+                    link
+                    size="small"
+                    v-if="scope.row.isShowTrue == 1"
+                    @click.stop="unLockUSer(scope.row)"
+                  >
+                    <!-- <i-ep-view /> -->
+                    清除信息锁定
+                  </el-button>
+                  <el-button
+                    v-hasButton="['275256219474604032']"
+                    type="primary"
+                    link
+                    size="small"
+                    @click.stop="lookPeopleCont(scope.row)"
+                  >
+                    <!-- <i-ep-view /> -->
+                    查看详情
+                  </el-button>
+                </template>
+            </el-table-column>
+          </el-table>
+
+          <div class="paginationBox">
+            <el-pagination
+              v-model:current-page="searchInfo.page"
+              v-model:page-size="searchInfo.pagesize"
+              :page-sizes="[10, 20, 30, 40, 50, 60, 70, 80, 90, 100]"
+              :size="pageDefaultSize"
+              :background="true"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="searchInfo.total"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+            />
+
+          </div>
+
+
+
+        </el-card>
+      </el-main>
     </el-container>
+
+    <!-- 批量解锁 -->
+    <lockInfo ref="lockInfoRef" v-model:show="ubLockPage" @updateInfo="getArchivesPage" />
+    <!-- 批量导入 -->
+    <BatchImport ref="batchImportRef" v-model:show="piLiangBox" :org-tree="orgTreeList" @updateInfo="getArchivesPage" />
+    <!--设置-->
+    <el-drawer
+      v-model="openSetup"
+      title="各行政组织员工信息点在档案模板"
+      :direction="direction"
+      :before-close="closeSetup"
+      :size="500"
+      class="drwBody"
+    >
+      <el-tabs v-model="setupActiveName" type="border-card">
+        <el-tab-pane label="员工档案导入模版" name="1">
+          <template #label>
+            <span class="fa fa-upload"></span>
+            <span>员工档案导入模版</span>
+          </template>
+          <div
+            v-hasButton="['288626950073757696']"
+            style="flex: auto; text-align: right; margin-bottom: 10px"
+          >
+            <el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
+          </div>
+          <el-table :data="downTemplate" border style="width: 100%">
+            <el-table-column prop="orgName" label="行政组织" width="200" />
+            <el-table-column prop="fileName" label="文件名称">
+                <template #default="scope">
+                  <el-link
+                    type="success"
+                    :underline="false"
+                    :href="scope.row.fileUrl"
+                    target="_blank"
+                    >{{ scope.row.fileName }}</el-link
+                  >
+                </template>
+            </el-table-column>
+            <el-table-column
+                v-hasButton="['288626867236253696']"
+                prop="address"
+                label="操作"
+                align="center"
+                width="100"
+              >
+                <template #default="scope">
+                  <el-button
+                    link
+                    type="warning"
+                    size="small"
+                    @click="editUserTemp(scope.row)"
+                    >编辑</el-button
+                  >
+                  <el-button
+                    link
+                    type="danger"
+                    size="small"
+                    @click="delUserTemp(scope.row, 3)"
+                    >删除</el-button
+                  >
+                </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="性格分析表" name="2">
+          <template #label>
+            <span class="fa fa-list"></span>
+            <span>性格分析表</span>
+          </template>
+          <div class="downLink">
+            <div>团队角色九型人格测试</div>
+            <div>
+                <el-button
+                  type="danger"
+                  text
+                  v-hasButton="['287868103478489088']"
+                  @click="selectDownTiaojian('10000003')"
+                >
+                  下载
+                </el-button>
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="测试统计" name="3">
+          <template #label>
+              <span class="fa fa-bar-chart"></span>
+              <span>测试统计</span>
+          </template>
+          <el-table :data="characterList" border style="width: 100%">
+            <el-table-column prop="label" label="测试名称" />
+            <el-table-column label="操作" align="center" width="80">
+              <template #default="scope">
+                <el-button
+                  link
+                  type="danger"
+                  size="small"
+                  @click="downStatistics(scope.row)"
+                  >下载</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="考评人员成绩统计表" name="4">
+          <template #label>
+              <span class="fa fa-line-chart"></span>
+              <span>考评人员成绩统计表</span>
+          </template>
+          <el-row
+              v-hasButton="['288626950073757696']"
+              v-loading="excelLoading"
+              element-loading-text="文档上传中，请稍候..."
+          >
+            <el-col :span="24">
+              <el-form
+                  :model="stafftempForm"
+                  label-width="auto"
+                  style="max-width: 100%"
+              >
+                <el-form-item label="请选择上传那个公司的人员信息">
+                    <el-tree-select
+                        v-model="stafftempForm.orgId"
+                        :data="orgTreeList"
+                        :props="orgTreePropsBut"
+                        :render-after-expand="false"
+                        :expand-on-click-node="false"
+                        :check-on-click-node="true"
+                        :check-strictly="true"
+                        :default-expand-all="false"
+                        style="width: 240px"
+                    />
+                  </el-form-item>
+              </el-form>
+            </el-col>
+            <el-col
+                :span="24"
+                v-loading="excelJiexi"
+                element-loading-text="文档解析中，请稍候..."
+            >
+              <el-upload
+                  ref="excelUploadStaff"
+                  class="upload-demo"
+                  drag
+                  :action="uploadFFurlStaff"
+                  :data="{ orgId: stafftempForm.orgId.toString() }"
+                  :before-upload="handleExcelChangeTempStaff"
+                  :on-success="uploadTrueStaff"
+                  :on-error="uploadError"
+                  :show-file-list="false"
+                  multiple
+              >
+                <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+                  <div class="el-upload__text">
+                    将电子表格拖到此处或 <em>单击上载</em>
+                  </div>
+              </el-upload>
+            </el-col>
+          </el-row>
+          <el-row v-hasButton="['288626950073757696']" style="width: 100%;">
+              <el-col :span="24">
+                <el-progress
+                  :text-inside="true"
+                  :stroke-width="20"
+                  :percentage="progressSize"
+                >
+                  <span>已完成：{{ progressSize }}%</span>
+                </el-progress>
+              </el-col>
+          </el-row>
+          <el-scrollbar height="300px" ref="scrollbarRef" always>
+              <div ref="innerRef">
+                <p
+                  v-for="(item, index) in peopleMsg"
+                  :key="index"
+                  class="scrollbar-demo-item"
+                >
+                  {{ item }}
+                </p>
+              </div>
+            </el-scrollbar>
+        </el-tab-pane>
+
+        
+      </el-tabs>
+    </el-drawer>
+
+    <!-- 上传模版 -->
+    <UploadTemplate ref="uploadTemplateRef" v-model:show="isNewAddTem" :org-tree="orgTreeList" :rule-form="ruleForm" />
+    <!-- 性格分析表 -->
+    <XingGeFengXi
+        v-if="openTableType"
+        :down-table-type="downTableType"
+        :down-class-type="downClassType"
+        :org-tree="orgTreeList"
+        @close-xige-page="closeXigePage"
+    />
+    <!-- 档案详情 -->
+    <ArchivesContPage
+            v-model:isShow="archivesBox"
+            :archivesdata="peoplecont"
+            @updatemyconting="updateMyCont"
+            @getarchivespageclick="getArchivesPage"
+    />
+    <!-- 添加人员 -->
+    <AddUserPage
+        v-model:show="addUserBox"
+        :org-tree="orgTreeList"
+        @updateInfo="getArchivesPage"
+    />
+
+
+
   </div>
 </template>
 <style  lang='scss' scoped>
@@ -193,8 +871,22 @@ onMounted(() => {
   :deep .el-drawer__body {
     padding: 0 10px;
   }
+  .paginationBox {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 10px;
+  }
+  .tableBox{
+    margin-top: 10px;
+    height: calc(100vh - 390px);
+  }
 }
-.common-layout {
-  
+.downLink {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
 }
 </style>
diff --git a/src/views/hr/archives/index_20251202.vue b/src/views/hr/archives/index_20251202.vue
new file mode 100644
index 0000000..6cddce0
--- /dev/null
+++ b/src/views/hr/archives/index_20251202.vue
@@ -0,0 +1,200 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-11-28 10:11:16
+@ 备注: 人员列表
+-->
+<script lang='ts' setup>
+import { emptypeOptions } from "@/api/hr/people/datacont";
+import { orgInfo } from "@/api/hr/org/type";
+import { authorizeOrgTree } from '@/api/system/roleapi/power'
+import {
+  teamcontlist
+} from "@/api/hr/org/index";
+
+const orgTreeRef = ref(ElTree); //行政组织树
+const orgTreeLoading = ref(false); //加载行政组织树
+const orgTreeList = ref<orgInfo[]>(); //行政组织树数据
+const tiemList = ref([]); //班组列表
+const orgTreeProps = {
+  children: "child",
+  label: "name",
+}; //行政组织树对照值
+
+const searchInfo = reactive({
+    orgId:"",
+    name:"",
+    employ:"",
+    team:"",
+    joinTime:""
+})
+
+const getOrgPowerTrue =  () => {
+    orgTreeLoading.value = true
+    let sendInfo = {
+        menuId:"50"
+    }
+    authorizeOrgTree(sendInfo).then((res) => {
+        console.log(res)
+        orgTreeList.value = res.data
+        orgTreeLoading.value = false
+    }).finally(() => {
+        orgTreeLoading.value = false
+    })
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-01-14 10:27:12
+@ 功能: 获取班组列表
+*/
+const gainTimeList = () => {
+  let searchMap = {
+    page: 1,
+    pagesize: 2000,
+    name: "",
+  };
+  teamcontlist(searchMap).then((data) => {
+    tiemList.value = data.data.list;
+  });
+};
+const resetChecked = () => {
+    orgTreeRef.value.setCheckedKeys([])
+}
+/**
+ * 选中行政组织树节点
+ */
+const handleOrgTreeNodeClick = (data: orgInfo) => {
+  // console.log(data)
+  searchInfo.orgId = data.id;
+//   getArchivesPage();
+};
+onMounted(() => {
+    getOrgPowerTrue();
+    gainTimeList();
+})
+</script>
+<template>
+  <div class="app-content">
+    <el-container>
+        <el-aside width="300px" style="padding: 10px 10px">
+            <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 5px' }">
+                <el-button
+                    type="primary"
+                    style="width: 100%; margin: 10px 0"
+                    @click="resetChecked"
+                >
+                查看全部
+                </el-button>
+                <el-tree-v2
+                    style="max-width: 100%"
+                    :data="orgTreeList"
+                    :props="orgTreeProps"
+                    v-loading="orgTreeLoading"
+                    node-key="id"
+                    :expand-on-click-node="false"
+                    :check-on-click-node="true"
+                    :check-strictly="true"
+                    :default-expand-all="false"
+                    :height="1200"
+                    @node-click="handleOrgTreeNodeClick"
+                />
+            </el-card>
+        </el-aside>
+
+
+
+        <el-main style="padding: 10px 10px 0 0">
+            <el-card :body-style="{ height: 'calc(100vh - 190px)', padding: '0px 15px' }">
+                <el-form ref="searchForm" :model="searchInfo" :inline="true" style="width: 100%; margin-top: 10px;">
+                    <el-form-item label="工号 / 姓名 / 手机号" prop="keywords">
+                        <el-input
+                            v-model="searchInfo.name"
+                            placeholder="请输入工号/姓名/手机号"
+                            clearable
+                        />
+                    </el-form-item>
+                    <el-form-item label="用工关系" prop="number">
+                        <el-select
+                            v-model="searchInfo.employ"
+                            multiple
+                            clearable
+                            collapse-tags
+                            placeholder="用工关系"
+                            style="width: 200px"
+                        >
+                            <el-option
+                                v-for="item in emptypeOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="班组" prop="number">
+                        <el-select
+                            v-model="searchInfo.team"
+                            clearable
+                            collapse-tags
+                            placeholder="员工班组"
+                            style="width: 240px"
+                        >
+                            <el-option
+                            v-for="item in tiemList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="入职日期" prop="number">
+                        <el-date-picker
+                            v-model="searchInfo.joinTime"
+                            type="date"
+                            placeholder="入职日期"
+                            format="YYYY-MM-DD"
+                            value-format="YYYY-MM-DD"
+                        />
+                    </el-form-item>
+                    <el-form-item label="" prop="number">
+                        <el-button type="primary" @click="getArchivesPage">
+                            <template #icon><i-ep-search /></template>
+                            搜索
+                        </el-button>
+                        <el-button @click="resetArcFormQuery">
+                            <template #icon><i-ep-refresh /></template>
+                            重置
+                        </el-button>
+                    </el-form-item>
+                </el-form>
+                <div class="func-but">
+                    <el-button v-hasButton="[215437071358111744]" type="primary" @click="handleAddArchives">
+                        <template #icon><i-ep-plus /></template>
+                        新增
+                    </el-button>
+                    <el-button
+                        v-hasPerm="['215437153071542272']"
+                        plain
+                        type="primary"
+                        @click="openPiliangBox"
+                    >
+                        <el-icon><MessageBox /></el-icon>
+                        批量导入数据
+                    </el-button>
+                </div>
+            </el-card>
+        </el-main>
+    </el-container>
+  </div>
+</template>
+<style  lang='scss' scoped>
+.app-content {
+    height: calc(100vh - 170px);
+    background-color: aqua;
+
+  :deep .el-drawer__body {
+    padding: 0 10px;
+  }
+}
+.common-layout {
+  
+}
+</style>
diff --git a/src/views/hr/archives/unitpage/addUserPage.vue b/src/views/hr/archives/unitpage/addUserPage.vue
new file mode 100644
index 0000000..329a616
--- /dev/null
+++ b/src/views/hr/archives/unitpage/addUserPage.vue
@@ -0,0 +1,274 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-12-03 14:22:19
+@ 备注: 添加人员
+-->
+<script lang='ts' setup>
+import { addNewPeople } from "@/api/system/roleapi/power";
+import defaultImg from "@/assets/images/1.png";
+const props = defineProps({
+    show: {
+        type: Boolean,
+        default: false
+    },
+    orgTree: {
+        type: Array as PropType<orgInfo[]>,
+        default: () => []
+    }
+})
+const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/setupFile/uploads/oneFileUpload";//图片上传地址
+const emit = defineEmits(['update:show','updateInfo'])
+const ubLockPage = computed(() => props.show)
+const orgTreeList = computed(() => props.orgTree) //行政组织树数据
+const butLoading = ref(false)
+const fileUploadIng = ref(false);
+const systemMenuTreeProps = {
+  children: "child",
+  label: "name",
+  value:"id"
+} //行政组织树对照值
+const formRef = ref<any>();
+const rules = ref<any>({
+    name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入工号', trigger: 'blur' }],
+    orgId: [{ required: true, message: '请选择行政组织', trigger: 'change' }],
+    employment: [{ required: true, message: '请输入用工关系', trigger: 'blur' }],
+    mobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+});
+const userInfo = ref({
+    name: "",
+    code: "",
+    mobile: "",
+    nation: "",
+    sex: "1",
+    age: "",
+    oldName: "",
+    icon: defaultImg,
+    orgId:"",
+    employment:"",
+    address:""
+})
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 14:26:25
+@ 功能: 关闭
+*/
+const closeLock = () => {
+    emit('update:show', false)
+    emit('updateInfo')
+    userInfo.value.icon = defaultImg
+    butLoading.value = false
+    formRef.value.resetFields();
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 15:40:14
+@ 功能: 提交数据
+*/
+const onSubmit = () => {
+    butLoading.value = true
+    formRef.value.validate((valid) => {
+        if (valid) {
+            // 提交表单数据
+            addNewPeople(userInfo.value).then((res) => {
+                if (res.code == 0) {
+                    ElMessage.success("新增成功");
+                    closeLock();
+                } else {
+                    ElMessage.error(res.msg);
+                }
+                butLoading.value = false
+            })
+        } else {
+            butLoading.value = false
+        }
+    });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-31 14:35:18
+@ 功能: 上传前判断类型
+*/
+const beforeAvatarUpload: UploadProps["beforeUpload"] = (rawFile) => {
+  fileUploadIng.value = true;
+  if (!/\.(png|jpg|gif|jpeg|svg|bmp)$/.test(rawFile.name)) {
+    ElMessage.warning("您上传的图片不符合要求！");
+    fileUploadIng.value = false;
+    return false;
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-31 14:40:31
+@ 功能: 上传成功
+*/
+const handleAvatarSuccess: UploadProps["onSuccess"] = (
+  response,
+  uploadFile,
+  uploadFiles
+) => {
+    userInfo.value.icon = URL.createObjectURL(uploadFile.raw!);
+    // console.log("上传成功-------------------->", uploadFile);
+    // console.log("上传成功-------------------->", props.archivesdata.id);
+    fileUploadIng.value = false;
+    ElMessage.success("上传成功");
+  
+};
+</script>
+<template>
+    <el-dialog
+      v-model="ubLockPage"
+      title="新增人员信息"
+      width="650"
+      draggable
+      :destroy-on-close="true"
+      :before-close="closeLock"
+    >
+        <el-form :model="userInfo" :rules="rules" ref="formRef" label-width="80px">
+            <table>
+                <tr>
+                    <td>
+                        <el-form-item label="姓名" prop="name">
+                            <el-input v-model="userInfo.name" placeholder="请输入姓名" />
+                        </el-form-item>
+                    </td>
+                    <td>
+                        <el-form-item label="曾用名" prop="oldName">
+                            <el-input v-model="userInfo.oldName" placeholder="请输入曾用名" />
+                        </el-form-item>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <el-form-item label="工号" prop="code">
+                            <el-input v-model="userInfo.code" placeholder="请输入工号" />
+                        </el-form-item>
+                    </td>
+                    <td rowspan="3" align="center">
+                        <el-upload
+                            class="avatar-uploader"
+                            :action="imgUploadApiUrl"
+                            :show-file-list="false"
+                            :on-success="handleAvatarSuccess"
+                            :before-upload="beforeAvatarUpload"
+                            v-loading="fileUploadIng"
+                        >
+                            <el-avatar shape="square" :size="180" :src="userInfo.icon" class="bianKuang" />
+                        </el-upload>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <el-form-item label="民族" prop="nation">
+                            <el-input v-model="userInfo.nation" placeholder="请输入民族" />
+                        </el-form-item>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <el-form-item label="性别" prop="sex">
+                            <el-radio-group v-model="userInfo.sex">
+                                <el-radio label="1">男</el-radio>
+                                <el-radio label="2">女</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2">
+                       <el-form-item label="归属部门" prop="orgId">
+                            <el-tree-select
+                                v-model="userInfo.orgId"
+                                :data="orgTreeList"
+                                check-strictly
+                                :render-after-expand="false"
+                                :props="systemMenuTreeProps" 
+                                style="width: 100%"
+                                clearable
+                            />
+                        </el-form-item>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                       <el-form-item label="联系电话" prop="mobile">
+                            <el-input v-model="userInfo.mobile" placeholder="请输入联系电话" />
+                        </el-form-item>
+                    </td>
+                    <td>
+                        <el-form-item label="用工关系" prop="employment">
+                            <el-select v-model="userInfo.employment" placeholder="请选择用工关系" style="width: 100%">
+                                <el-option label="临时工" value="1" />
+                                <el-option label="编外人员" value="2" />
+                                <el-option label="实习&实习生" value="3" />
+                                <el-option label="试用员工" value="4" />
+                                <el-option label="待分配" value="5" />
+                                <el-option label="待岗" value="6" />
+                                <el-option label="临时调入" value="7" />
+                                <el-option label="正式员工" value="8" />
+                                <el-option label="长期病假" value="9" />
+                                <el-option label="停薪留职" value="10" />
+                                <el-option label="退休" value="11" />
+                                <el-option label="辞职" value="12" />
+                                <el-option label="辞退" value="13" />
+                                <el-option label="离职" value="14" />
+                            </el-select>
+                        </el-form-item>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <el-form-item label="出生日期" prop="age">
+                            <el-date-picker
+                                v-model="userInfo.age"
+                                type="date"
+                                placeholder="请选择出生日期"
+                                format="YYYY/MM/DD"
+                                value-format="YYYY-MM-DD"
+                            />
+                        </el-form-item>
+                    </td>
+                    <td>
+                        <el-form-item label="联系地址" prop="address">
+                            <el-input v-model="userInfo.address" placeholder="请输入联系地址" />
+                        </el-form-item>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <el-form-item label="身体状况" prop="bodyStatus">
+                             <el-select v-model="userInfo.bodyStatus" placeholder="请选择身体状况" style="width: 100%">
+                                <el-option label="良好" value="1" />
+                                <el-option label="一般" value="2" />
+                                <el-option label="较弱" value="3" />
+                                <el-option label="有生理缺陷" value="4" />
+                                <el-option label="有生理缺陷" value="4" />
+                            </el-select>
+                        </el-form-item>
+                    </td>
+                    <td>
+                        <el-form-item label="婚姻状况" prop="marriageStatus">
+                            <el-select v-model="userInfo.marriageStatus" placeholder="请选择婚姻状况" style="width: 100%">
+                                <el-option label="未婚" value="1" />
+                                <el-option label="已婚" value="2" />
+                                <el-option label="离异" value="4" />
+                                <el-option label="丧偶" value="3" />
+                            </el-select>
+                        </el-form-item>
+                    </td>
+                </tr>
+            </table>
+            <div class="flex justify-center">
+                <el-button type="primary" :loading="butLoading" @click="onSubmit">提交</el-button>
+                <el-button @click="closeLock">取消</el-button>
+            </div>
+        </el-form>
+    </el-dialog>
+</template>
+<style  lang='scss' scoped>
+.bianKuang {
+  border: 1px solid #ccc;
+}
+
+
+</style>
diff --git a/src/views/hr/archives/unitpage/batchImport.vue b/src/views/hr/archives/unitpage/batchImport.vue
new file mode 100644
index 0000000..9d66ac7
--- /dev/null
+++ b/src/views/hr/archives/unitpage/batchImport.vue
@@ -0,0 +1,235 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-12-02 16:17:37
+@ 备注: 批量导入
+-->
+<script lang='ts' setup>
+import { orgInfo } from "@/api/hr/org/type";
+import {
+  analysisRedisOrgExelect,
+} from "@/api/hr/people/index";
+import { ElScrollbar as ElScrollbarType } from "element-plus";
+const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFilesRedis";
+const props = defineProps({
+    show: {
+        type: Boolean,
+        default: false
+    },
+    orgTree: {
+        type: Array as PropType<orgInfo[]>,
+        default: () => []
+    }
+})
+const ubLockPage = computed(() => props.show)
+const emit = defineEmits(['update:show','updateInfo'])
+const closeUploadTemp = () => {
+    emit('update:show', false)
+    emit('updateInfo')
+    tempForm.orgId = ""
+    excelLoading.value = false;
+    excelJiexi.value = false;
+}
+const orgTreeList = computed(() => props.orgTree) //行政组织树数据
+const excelLoading = ref(false);
+const excelJiexi = ref(false);
+const tempForm = reactive({
+  orgId: "",
+});
+const systemMenuTreeProps = {
+  children: "child",
+  label: "name",
+  value:"id"
+}
+const excelUpload = ref<any>();
+let peopleListAry = new Array();        //输出信息
+const peopleMsg = ref<string[]>([]);
+let jiBuQiVal = 0;
+const progressSize = ref(0);
+const meritsYearIng = ref<any>();
+const rewPunYearsIng = ref<any>();
+const redisListKey = ref<string>();
+const totalNum = ref<number>();
+const innerRef = ref<HTMLDivElement>();
+const scrollbarRef = ref<InstanceType<typeof ElScrollbarType>>();
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-02 16:53:45
+@ 功能: 上传前检查
+*/
+function handleExcelChangeTemp(file: UploadFile) {
+  excelLoading.value = true;
+  if (tempForm.orgId == 0 || tempForm.orgId == "") {
+    ElMessage.warning("对不起！你没有选定上传的是哪个行政组织得人员信息！");
+    excelLoading.value = false;
+    return false;
+  }
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    ElMessage.warning("上传Excel只能为xlsx、xls格式");
+    excelLoading.value = false;
+    return false;
+  }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-02 16:55:17
+@ 功能: 上传失败
+*/
+const uploadError = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+  excelLoading.value = true;
+  // console.log("1response",response);
+  // console.log("1uploadFile",uploadFile);
+  // console.log("1uploadFiles",uploadFiles);
+  let msgAry = new Array();
+  msgAry.push(
+    "响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"
+  );
+  // errorMsg = ["响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"]
+  peopleListAry.value = msgAry;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-02 16:56:39
+@ 功能: 上传成功
+*/
+const uploadTrue = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+    excelLoading.value = false;
+    // console.log("response", response);
+    // console.log("uploadFile",uploadFile);
+    // console.log("uploadFiles",uploadFiles);
+    peopleListAry.push("文件上传成功！开始解析数据并写入数据库！");
+    peopleMsg.value.push("文件上传成功！开始解析数据并写入数据库！");
+    // peopleListAry.value.push("文件上传成功！开始解析数据并写入数据库！")
+    // console.log("上传成功",response.code)
+    if (response.code == 0) {
+        jiBuQiVal = 0;
+        progressSize.value = 0;
+        excelJiexi.value = true;
+        meritsYearIng.value = response.data.meritsYearIng;
+        rewPunYearsIng.value = response.data.rewPunYearsIng;
+        redisListKey.value = response.data.redisListKey;
+        totalNum.value = response.data.totalNum;
+        // console.log("上传成功===>", staffChengji);
+        insetPeopleCont();
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-02 17:01:05
+@ 功能: 写入数据库
+*/
+const insetPeopleCont = () => {
+//   console.log("启动数据写入数据库===============》", jiBuQiVal, totalNum.value);
+  if (jiBuQiVal < totalNum.value) {
+    let sendData = {
+      meritsYearIng: meritsYearIng.value,
+      rewPunYearsIng: rewPunYearsIng.value,
+      redisListKey: redisListKey.value,
+      number: jiBuQiVal,
+      orgId: tempForm.orgId.toString(),
+    };
+    // console.log("启动数据写入数据库", sendData);
+    analysisRedisOrgExelect(sendData).then((data: any) => {
+      // console.log("启动数据写入11111数据库",data,data.data.msgStr)
+      peopleMsg.value.push(data.data.msgStr);
+      jiBuQiVal++;
+      // if (jibuq+ 1 >= totalNum.value){
+
+      // }
+      progressSize.value = Math.round((jiBuQiVal / totalNum.value) * 10000) / 100;
+      insetPeopleCont();
+      nextTick(() => {
+        handleClick();
+      });
+    });
+  } else {
+    excelJiexi.value = false;
+    progressSize.value = 100;
+    excelUpload.value.clearFiles();
+  }
+};
+
+const handleClick = () => {
+  nextTick(() => {
+    // console.log("滚动条长度",innerRef.value!.clientHeight)
+    if (innerRef.value!.clientHeight > 300) {
+      scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight);
+    }
+  });
+};
+</script>
+<template>
+    <el-dialog
+        v-model="ubLockPage"
+        title="批量导入人员信息"
+        width="800"
+        draggable
+        :destroy-on-close="true"
+        :before-close="closeUploadTemp"
+    >   
+        <el-row v-loading="excelLoading" element-loading-text="文档上传中，请稍候..."  style="width: 100%">
+            <el-col :span="24">
+                <el-form :model="tempForm" label-width="auto" style="width: 100%">
+                    <el-form-item label="请选择上传那个公司的人员信息">
+                        <el-tree-select
+                            v-model="tempForm.orgId"
+                            :data="orgTreeList"
+                            check-strictly
+                            :render-after-expand="false"
+                            :props="systemMenuTreeProps" 
+                            style="width: 100%"
+                            clearable
+                        />
+                    </el-form-item>
+                </el-form>
+            </el-col>
+            <el-col
+                :span="24"
+                v-loading="excelJiexi"
+                element-loading-text="文档解析中，请稍候..."
+            >
+                <el-upload
+                    ref="excelUpload"
+                    class="upload-demo"
+                    drag
+                    :action="uploadFFurl"
+                    :data="{ orgId: tempForm.orgId.toString() }"
+                    :before-upload="handleExcelChangeTemp"
+                    :on-success="uploadTrue"
+                    :on-error="uploadError"
+                    :show-file-list="false"
+                    multiple
+                >
+                    <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+                    <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
+                </el-upload>
+            </el-col>
+        </el-row>
+        <el-row style="width: 100%;">
+            <el-col :span="24">
+                <el-progress
+                    :text-inside="true"
+                    :stroke-width="20"
+                    :percentage="progressSize"
+                >
+                    <span>已完成：{{ progressSize }}%</span>
+                </el-progress>
+            </el-col>
+        </el-row>
+        <el-scrollbar height="300px" ref="scrollbarRef" always style="padding:10px 20px;">
+            <div ref="innerRef">
+                <p
+                    v-for="(item, index) in peopleMsg"
+                    :key="index"
+                    class="scrollbar-demo-item"
+                >
+                    {{ item }}
+                </p>
+            </div>
+        </el-scrollbar>
+    </el-dialog>
+</template>
+<style  lang='scss' scoped>
+.app-content {
+  
+}
+</style>
diff --git a/src/views/hr/archives/unitpage/lockInfo.vue b/src/views/hr/archives/unitpage/lockInfo.vue
new file mode 100644
index 0000000..44f79ef
--- /dev/null
+++ b/src/views/hr/archives/unitpage/lockInfo.vue
@@ -0,0 +1,96 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-12-02 15:50:46
+@ 备注: 解除人员信息锁
+-->
+<script lang='ts' setup>
+import {
+  jiechuUserLock,
+} from "@/api/hr/org/index";
+
+
+const props = defineProps({
+    show: {
+        type: Boolean,
+        default: false
+    }
+})
+const ubLockPage = computed(() => props.show)
+const emit = defineEmits(['update:show','updateInfo'])
+const unLockForm = reactive({
+  numText: "",
+});
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-02 15:53:20
+@ 功能: 关闭解锁弹窗
+*/
+const closeLock = () => {
+    emit('update:show', false)
+    emit('updateInfo')
+}
+const ruleFormRefLock = ref(null);
+var butLoad = ref(false);
+//提交数据
+const picksubus = () => {
+  butLoad.value = true;
+  ruleFormRefLock.value.validate((isValid: boolean) => {
+    if (isValid) {
+      jiechuUserLock({ userId: unLockForm.numText })
+        .then((res: any) => {
+          butLoad.value = false;
+          closeLock()
+        })
+        .finally(() => {
+          butLoad.value = false;
+        });
+    } else {
+      butLoad.value = false;
+    }
+  });
+};
+const resetForm = () => {
+  closeLock();
+  ruleFormRefLock.value.resetFields();
+};
+</script>
+<template>
+    <el-dialog
+      v-model="ubLockPage"
+      title="清除锁定人员信息锁"
+      width="500"
+      draggable
+      :destroy-on-close="true"
+      :before-close="closeLock"
+    >
+      <el-form
+        ref="ruleFormRefLock"
+        :model="unLockForm"
+        :rules="editTitleRules"
+        label-width="80"
+        style="width: 100%"
+      >
+        <el-form-item label="工号" prop="numText">
+          <el-text>请输入工号；以英文逗号隔开(,)</el-text>
+          <el-input
+            v-model="unLockForm.numText"
+            type="textarea"
+            placeholder="请输入工号；以英文逗号隔开(,)"
+            clearable
+            :autosize="{ minRows: 4, maxRows: 10 }"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" v-loading="butLoad" @click="picksubus">
+            确定
+          </el-button>
+          <el-button @click="resetForm(ruleFormRef)">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+</template>
+<style  lang='scss' scoped>
+.app-content {
+  
+}
+</style>
diff --git a/src/views/hr/archives/unitpage/uploadTemplate.vue b/src/views/hr/archives/unitpage/uploadTemplate.vue
new file mode 100644
index 0000000..3f93580
--- /dev/null
+++ b/src/views/hr/archives/unitpage/uploadTemplate.vue
@@ -0,0 +1,222 @@
+<!-- eslint-disable vue/no-side-effects-in-computed-properties -->
+<!--
+@ 作者: 秦东
+@ 时间: 2025-12-03 10:44:56
+@ 备注: 上传模版
+-->
+<script lang='ts' setup>
+import { orgInfo } from "@/api/hr/org/type";
+import {
+  uploadUserTemplate
+
+} from "@/api/hr/org/index";
+import { uploadUrl } from "@/api/DesignForm";
+const props = defineProps({
+    show: {
+        type: Boolean,
+        default: false
+    },
+    orgTree: {
+        type: Array as PropType<orgInfo[]>,
+        default: () => []
+    },
+    ruleForm: {
+        type: Object as PropType<typeof ruleForm>,
+        default: () => ({})
+    }
+})
+const addTemLoading = ref(false);
+let peopleListAry = new Array();
+const excelLoading = ref(false);
+const excelUploadUs = ref();
+
+const emits = defineEmits(['update:show'])
+const ruleFormRef = ref<any>();
+const ruleFormIng = ref({
+    id: "",
+    orgId: "",
+    fileName: "",
+    filePath: "",
+    fileUrl: "",
+});
+const orgTreePropsBut = {
+    children: "child",
+    value: "id",
+    label: "name",
+}; //行政组织树对照值
+const orgTreeList = computed(() => props.orgTree) //行政组织树数据
+const ubLockPage = computed({
+    get: () =>{
+        if(props.show){
+            ruleFormIng.value.id = props.ruleForm.id
+            ruleFormIng.value.orgId = props.ruleForm.orgId 
+            ruleFormIng.value.fileName = props.ruleForm.fileName
+            ruleFormIng.value.filePath = props.ruleForm.filePath
+            ruleFormIng.value.fileUrl = props.ruleForm.fileUrl
+        }  
+        return props.show
+    },
+	set: (val) => {
+		emits("update:show", val);
+	},
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-19 13:13:18
+@ 功能: 表单验证规则
+*/
+const dataFormRules = reactive({
+    orgId: [{ required: true, message: "请选择行政组织", trigger: "blur" }],
+    fileName: [{ required: true, message: "请上传模版文件", trigger: "blur" }],
+});
+//关闭
+const tempOpenClose = () => {
+    emits('update:show', false)
+    ruleFormIng.value.id = ""
+    ruleFormIng.value.orgId = 0
+    ruleFormIng.value.fileName = ""
+    ruleFormIng.value.filePath = ""
+    ruleFormIng.value.fileUrl = ""
+}
+//文件前缀检查
+const handleExcelChange = (file: UploadFile) => {
+    excelLoading.value = true;
+    if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+        ElMessage.warning("上传Excel只能为xlsx、xls格式");
+        excelLoading.value = false;
+        return false;
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-24 14:46:32
+@ 功能: 文件上传成功
+*/
+const uploadTrueUs = (
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) => {
+  // console.log("response",response);
+  // console.log("uploadFile",uploadFile);
+  // console.log("uploadFiles",uploadFiles);
+  excelLoading.value = false;
+  ruleFormIng.value.fileName = uploadFile.name;
+  ruleFormIng.value.filePath = response.data.physicspath;
+  ruleFormIng.value.fileUrl = response.data.url;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 11:02:30
+@ 功能: 文件上传失败
+*/
+const uploadError = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+  excelLoading.value = true;
+  // console.log("1response",response);
+  // console.log("1uploadFile",uploadFile);
+  // console.log("1uploadFiles",uploadFiles);
+  let msgAry = new Array();
+  msgAry.push(
+    "响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"
+  );
+  // errorMsg = ["响应时间过长，系统自动转为后台静默处理，可先关闭窗口！完成时间大约90分钟。请于90分钟后刷新信息"]
+  peopleListAry.value = msgAry;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2025-12-03 11:05:57
+@ 功能: 提交上传数据
+*/
+const saveTemp = () => {
+    addTemLoading.value = true;
+    ruleFormRef.value.validate((valid: any) => {
+        if (valid) {
+            ruleFormIng.value.orgId = ruleFormIng.value.orgId.toString();
+            // console.log("上传传输信息--->", ruleForm);
+            if (ruleFormIng.value.id == 0 || ruleFormIng.value.id == "") {
+                uploadUserTemplate(ruleForm)
+                .then((data: any) => {
+                    console.log("上传传输信息-1-->", data);
+                    tempOpenClose();
+                })
+                .finally(() => {
+                    addTemLoading.value = false;
+                });
+            } else {
+                editUserTemplateInfo(ruleForm)
+                .then((data: any) => {
+                    console.log("上传传输信息-2-->", data);
+                    tempOpenClose();
+                })
+                .finally(() => {
+                    addTemLoading.value = false;
+                });
+            }
+        } else {
+            addTemLoading.value = false;
+        }
+    });
+};
+</script>
+<template>
+    <el-dialog
+        v-model="ubLockPage"
+        title="上传导入模版"
+        width="400"
+        :before-close="tempOpenClose"
+    >
+        <el-form
+            ref="ruleFormRef"
+            style="max-width: 600px"
+            :model="ruleForm"
+            :rules="dataFormRules"
+            label-width="auto"
+            class="demo-ruleForm"
+            :size="formSize"
+            status-icon
+        >  
+            <el-form-item label="归属行政组织" prop="orgId">
+                <el-tree-select
+                    v-model="ruleFormIng.orgId"
+                    :data="orgTreeList"
+                    :props="orgTreePropsBut"
+                    :render-after-expand="false"
+                    :expand-on-click-node="false"
+                    :check-on-click-node="true"
+                    :check-strictly="true"
+                    :default-expand-all="false"
+                    style="width: 240px"
+                />
+            </el-form-item>
+            <el-form-item label="信息模版" prop="fileName">
+                <el-input v-model="ruleFormIng.fileName" />
+                <el-upload
+                    ref="excelUploadUs"
+                    class="upload-demo"
+                    drag
+                    v-loading="excelLoading"
+                    :action="uploadUrl"
+                    :limit="1"
+                    :before-upload="handleExcelChange"
+                    :on-success="uploadTrueUs"
+                    :on-error="uploadError"
+                    :show-file-list="false"
+                >
+                    <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+                    <div class="el-upload__text">将电子表格拖到此处或 <em>单击上载</em></div>
+                </el-upload>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" v-loading="addTemLoading" @click="saveTemp()">
+                确定上传
+                </el-button>
+                <el-button @click="tempOpenClose()">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </el-dialog>
+</template>
+<style  lang='scss' scoped>
+.app-content {
+  
+}
+</style>
diff --git a/src/views/nested/.editorconfig b/src/views/nested/.editorconfig
new file mode 100644
index 0000000..b9c127d
--- /dev/null
+++ b/src/views/nested/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
\ No newline at end of file
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appSetUp/setup.vue b/src/views/sysworkflow/lowcodepage/appPage/appSetUp/setup.vue
index cd5b270..11676ae 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appSetUp/setup.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appSetUp/setup.vue
@@ -85,6 +85,7 @@ const submitForm = () => {
       // console.log("提交数据",appSetupCont)
       appBasicSettings(appSetupCont)
         .then(() => {
+          // eslint-disable-next-line vue/no-mutating-props
           props.appCont.appName = appSetupCont.title;
           props.appCont.appSvg = appSetupCont.appSvg;
           props.appCont.describe = appSetupCont.appdescribe;