fix(icc add hls)

src/components/b_table.tsx

@@ -117,7 +117,7 @@ const BTable = (props: any) => {
                 searchCallback && searchCallback(dats)
               }}
               formDatas={searchConfig} />
-            <Button onClick={() => {
+            <Button type="primary" onClick={() => {
               searchFormRef.current?.submit()
             }}>查询</Button>
             <Button onClick={() => {
@@ -125,7 +125,6 @@ const BTable = (props: any) => {
               searchFormRef.current?.submit()
             }}>重置</Button>
           </Space>
-
           : null}
       </>
     )

src/components/form/select.tsx

@@ -16,7 +16,7 @@ export const FormSelect = (v: FormDatas) => {
   }, [v.selectUrl, v.selectList]);
   return (
     <Form.Item
-      key={v.name}
+      key={v.label}
       label={v.label}
       name={v.name}
       rules={v.rules}
@@ -24,7 +24,7 @@ export const FormSelect = (v: FormDatas) => {
       <Select placeholder={v.placeholder} mode={v.model} 
         style={{ width: "100%" ,minWidth:"200px"}} >
         {list?.map((item: any, index) => {
-          return <Option key={item.identity} value={item.identity}>
+          return <Option key={JSON.stringify(item)} value={item.identity}>
             {item[v.keys ?? "name"]}
           </Option>
         })}

src/pages/event/config.tsx

@@ -5,12 +5,12 @@ import { EventTypeConfig } from "@/service/user_config";
 import { ColumnsType } from "antd/es/table";
 
 export const searchConfig = [
-    {
+  {
     type: FormType.select,
     label: "",
     name: "type_identity",
-    placeHolder:"事件类型",
+    placeHolder: "事件类型",
-    keys:"type_name",
+    keys: "type_name",
     value: "",
     selectUrl: EventTypeConfig.LIST,
   },
@@ -45,12 +45,12 @@ export const defaultConfig = [
     value: "",
     rules: [{ required: true, message: "请输入事件地点!" }],
   },
-   {
+  {
     type: FormType.select,
     label: "事件类型",
     name: "type_identity",
     value: "",
-    keys:"type_name",
+    keys: "type_name",
     selectUrl: EventTypeConfig.LIST,
     rules: [{ required: true, message: "请输入事件地点!" }],
   },
@@ -82,7 +82,7 @@ export const defaultConfig = [
     value: "",
     mode: "",
     selectUrl: SourceConfig.Searchs,
-    keys:"content",
+    keys: "content",
     rules: [{ required: false, message: "请选择负责人!" }],
   },
   {
@@ -92,7 +92,7 @@ export const defaultConfig = [
     value: "",
     rules: [{ required: true, message: "请输入负责人电话!" }],
   },
-  
+
   {
     type: FormType.fetchList,
     label: "参与人员选择",
@@ -106,17 +106,18 @@ export const defaultConfig = [
     type: FormType.select,
     label: "事件等级",
     name: "level",
-    value: 1,
+    value: "1",
+    placeHolder: "事件等级",
     selectList: [
       {
         name: "普通",
-        id: 1,
+        identity: "1",
       }, {
         name: "紧急",
-        id: 2,
+        identity: "2",
       }, {
         name: "特级",
-        id: 3,
+        identity: "3",
       }
     ],
     rules: [{ required: true, message: "请输入事件等级!" }],

src/pages/user/user.tsx

@@ -10,7 +10,10 @@ const User = (props: Store) => {
   const { usrStore } = props;
   // 获取列表数据
   useEffect(() => {
-    usrStore.getlist().then(()=>{
+    getList({})
+  }, [usrStore, usrStore.isRefresh]);
+  const getList = (params) => {
+    usrStore.getlist(params).then(() => {
       const list = usrStore.list
       for (let index = 0; index < list.length; index++) {
         const element = list[index];
@@ -19,8 +22,7 @@ const User = (props: Store) => {
         element.thing_type_ids = element.thing_type.map((item) => item.type_identity)
       }
     });
-  }, [usrStore, usrStore.isRefresh]);
+  };
-
   return (
     <div className="contentBox">
       <BTable
@@ -30,13 +32,13 @@ const User = (props: Store) => {
         btnText="添加人员"
         dataSource={usrStore.list}
         searchConfig={searchConfig}
+        config={defaultConfig}
         searchCallback={(values) => {
-          usrStore.getlist(values);
+          getList(values);
         }}
         deleteCallback={(record) => {
           usrStore.deleteItem(record);
         }}
-        config={defaultConfig}
       />
     </div>
   );

src/pages/user/user_config.tsx

@@ -26,6 +26,26 @@ export const defaultConfig = [
     name: "tel",
     value: "",
     rules: [{ required: true, message: "联系电话不能为空" }]
+  },
+    {
+    type: FormType.treeSelect,
+    label: "所属单位",
+    name: "company_identity",
+    treeCheckbox: false,
+    selectUrl: CompanyConfig.LIST,
+    value: "",
+    keys: "company_id",
+    rules: [{ required: true, message: "所属单位不能为空" }],
+  },
+    {
+    type: FormType.treeSelect,
+    label: "所属科室",
+    name: "dep_identity",
+    treeCheckbox: false,
+    selectUrl: CompanyConfig.LIST,
+    value: "",
+    keys: "company_id",
+    rules: [],
   },
   {
     type: FormType.treeSelect,
@@ -54,16 +74,7 @@ export const defaultConfig = [
     value: [],
     rules: [{ required: true, message: "请选择默认数据" }],
   },
-  {
+
-    type: FormType.treeSelect,
-    label: "所属单位",
-    name: "company_identity",
-    treeCheckbox: false,
-    selectUrl: CompanyConfig.LIST,
-    value: "",
-    keys: "company_id",
-    rules: [{ required: true, message: "所属单位不能为空" }],
-  },
 
   {
     type: FormType.select,