From 4b8f16cb565998deaab20ab5c004c9b012c423a4 Mon Sep 17 00:00:00 2001
From: wang_yp <357754663@qq.com>
Date: Mon, 11 Aug 2025 22:43:40 +0800
Subject: [PATCH] fix(icc add hls)

---
 src/components/form/checkbox.tsx        |  2 +-
 src/components/layout/layout_config.tsx |  3 +-
 src/pages/company/config.tsx            | 14 +++++-
 src/pages/user/user.tsx                 |  1 +
 src/pages/user/user_config.tsx          | 63 +++++++++++--------------
 5 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/components/form/checkbox.tsx b/src/components/form/checkbox.tsx
index 92fc31e..6e33af1 100644
--- a/src/components/form/checkbox.tsx
+++ b/src/components/form/checkbox.tsx
@@ -24,7 +24,7 @@ export const FormCheckBox = (v: FormDatas) => {
             <Checkbox.Group>
                 {list.map((item, index) => {
                     return <Checkbox key={index} value={item.identity}>
-                        {item.data_name}
+                        {v.keys?item[v.keys]:item.data_name}
                     </Checkbox>
                 })}
             </Checkbox.Group>
diff --git a/src/components/layout/layout_config.tsx b/src/components/layout/layout_config.tsx
index d767d1a..bd23a19 100644
--- a/src/components/layout/layout_config.tsx
+++ b/src/components/layout/layout_config.tsx
@@ -33,7 +33,8 @@ export const items = [
     icon: <PaperClipOutlined />,
     children: [
       { label: `单位管理`, key: "/permi/company" },
-      { label: `部门管理`, key: "/permi/dep" },
+      // { label: `科室列表`, key: "/permi/dep" },
+      // { label: `社区列表`, key: "/permi/dep" },
       { label: `角色管理`, key: "/permi/role" },
       { label: `菜单管理`, key: "/permi/menu" },
     ],
diff --git a/src/pages/company/config.tsx b/src/pages/company/config.tsx
index 4915781..c12043e 100644
--- a/src/pages/company/config.tsx
+++ b/src/pages/company/config.tsx
@@ -1,6 +1,6 @@
 import { FormType } from "@/components/form/interface";
 import { UserDataType } from "@/model/userModel";
-import { CompanyConfig } from "@/service/user_config";
+import { CompanyConfig, UserConfig } from "@/service/user_config";
 import { ColumnsType } from "antd/lib/table";
 export const defaultConfig = [
   {
@@ -17,6 +17,16 @@ export const defaultConfig = [
     value: "",
     rules: [{ required: true, message: "请输入单位描述" }],
   },
+  {
+    type: FormType.select,
+    label: "分管领导",
+    name: "leader_charge",
+    value: "",
+    model: "multiple",
+    selectUrl: UserConfig.LIST,
+    keys:"user_name",
+    rules: [],
+  },
   {
     type: FormType.input,
     label: "单位负责人",
@@ -40,7 +50,7 @@ export const defaultConfig = [
     rules: [{ required: true, message: "请输入单位邮箱" }],
   },
   {
-    type: FormType.select, 
+    type: FormType.treeSelect,
     label: "上级单位",
     name: "p_id",
     value: 0,
diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx
index 4b6adfa..4d6425b 100644
--- a/src/pages/user/user.tsx
+++ b/src/pages/user/user.tsx
@@ -15,6 +15,7 @@ const User = (props: Store) => {
         const element = list[index];
         element.menu_id = element.menu.map((item) => item.menu_identity)
         element.column_ids = element.column.map((item) => item.data_name_id)
+        element.thing_ids = element.thing.map((item) => item.thing_identity)
       }
     });
   }, [usrStore]);
diff --git a/src/pages/user/user_config.tsx b/src/pages/user/user_config.tsx
index 466d794..99da040 100644
--- a/src/pages/user/user_config.tsx
+++ b/src/pages/user/user_config.tsx
@@ -3,7 +3,7 @@ import { UserDataType } from "@/model/userModel";
 import { ColumnsType } from "antd/lib/table";
 import { Image } from "antd";
 import { getBirthDateAndGender } from "@/util/util";
-import { CompanyConfig, DepConfig, MenuConfig, RoleConfig } from "@/service/user_config";
+import { CompanyConfig,  EventConfig, MenuConfig, RoleConfig } from "@/service/user_config";
 import SourceConfig from "@/service/source_config";
 export const defaultConfig = [
   {
@@ -13,13 +13,13 @@ export const defaultConfig = [
     value: "",
     rules: [{ required: true, message: "请输入用户名称!" }],
   },
-  {
-    type: FormType.input,
-    label: "身份证",
-    name: "id_card",
-    value: "",
-    rules: [{ required: true, message: "请输入身份证" }],
-  },
+  // {
+  //   type: FormType.input,
+  //   label: "身份证",
+  //   name: "id_card",
+  //   value: "",
+  //   rules: [{ required: true, message: "请输入身份证" }],
+  // },
   {
     type: FormType.input,
     label: "登录账号",
@@ -52,7 +52,16 @@ export const defaultConfig = [
     value: [],
     rules: [{ required: true, message: "请选择默认数据" }],
   },
-   {
+  {
+    type: FormType.cehckbox,
+    label: "事件",
+    name: "thing_ids",
+    selectUrl: EventConfig.LIST,
+    keys:"name",
+    value: [],
+    rules: [{ required: true, message: "请选择默认数据" }],
+  },
+  {
     type: FormType.treeSelect,
     label: "所属单位",
     name: "company_identity",
@@ -70,22 +79,12 @@ export const defaultConfig = [
     value: "",
     rules: [{ required: true, message: "角色不能为空" }],
   },
-  {
-    type: FormType.input,
-    label: "邮箱",
-    name: "email",
-    value: "",
-  },
-  {
-    type: FormType.select,
-    label: "所属部门",
-    name: "dep_identity",
-    selectUrl: DepConfig.LIST,
-    keys: "dep_name",
-    value: "",
-    rules: [],
-  },
- 
+  // {
+  //   type: FormType.input,
+  //   label: "邮箱",
+  //   name: "email",
+  //   value: "",
+  // },
   {
     type: FormType.upload,
     label: "头像",
@@ -123,20 +122,14 @@ export const columns: ColumnsType<UserDataType> = [
     title: "登录账号",
     dataIndex: "account",
   },
-  {
-    title: "身份证",
-    dataIndex: "id_card",
-  },
+  // {
+  //   title: "身份证",
+  //   dataIndex: "id_card",
+  // },
   {
     title: "联系电话",
     dataIndex: "tel",
   },
-  {
-    title: "所属部门",
-    render: (render) => (
-      <span>{render.dep[0]?.dep_name}</span>
-    ),
-  },
   {
     title: "所属单位",
     render: (render) => (