fix(icc add hls)

src/pages/dep/config.tsx

@@ -45,7 +45,7 @@ export const defaultConfig = [
     value: 0,
     selectUrl: CompanyConfig.LIST,
     keys: "name",
-    rules: [],
+    rules: [{ required: true, message: "请选择所属单位!" }],
   },
 ];
 

src/pages/role/role_config.tsx

@@ -20,15 +20,15 @@ export const defaultConfig = [
     value: "",
     rules: [{ required: true, message: "请输入角色描述" }],
   },
-  {
+  // {
-    type: FormType.select,
+  //   type: FormType.select,
-    label: "所属部门",
+  //   label: "所属部门",
-    name: "dep_identity",
+  //   name: "dep_identity",
-    selectUrl: DepConfig.LIST,
+  //   selectUrl: DepConfig.LIST,
-    keys: "dep_name",
+  //   keys: "dep_name",
-    value: "",
+  //   value: "",
-    rules: [{ required: true, message: "所属部门不能为空" }],
+  //   rules: [],
-  },
+  // },
   {
     type: FormType.treeSelect,
     label: "所属单位",
@@ -38,24 +38,24 @@ export const defaultConfig = [
     value: "",
     rules: [{ required: true, message: "所属单位不能为空" }],
   },
-  {
+  // {
-    type: FormType.treeSelect,
+  //   type: FormType.treeSelect,
-    treeCheckbox:true,
+  //   treeCheckbox:true,
-    label: "菜单权限",
+  //   label: "菜单权限",
-    name: "menu_id",
+  //   name: "menu_id",
-    selectUrl: MenuConfig.LIST,
+  //   selectUrl: MenuConfig.LIST,
-    value: "",
+  //   value: "",
-    treeMultiple:true,
+  //   treeMultiple:true,
-    rules: [{ required: true, message: "请选择菜单" }],
+  //   rules: [{ required: true, message: "请选择菜单" }],
-  },
+  // },
-  {
+  // {
-    type: FormType.cehckbox,
+  //   type: FormType.cehckbox,
-    label: "数据列",
+  //   label: "数据列",
-    name: "column_ids",
+  //   name: "column_ids",
-    selectUrl: SourceConfig.Headers,
+  //   selectUrl: SourceConfig.Headers,
-    value: [],
+  //   value: [],
-    rules: [{ required: true, message: "请选择默认数据" }],
+  //   rules: [{ required: true, message: "请选择默认数据" }],
-  },
+  // },
 ];
 
 export const columns: ColumnsType<UserDataType> = [

src/pages/source/upload.tsx

@@ -1,11 +1,12 @@
+import Config from "@/util/config";
 import { Button, message, Upload, UploadProps } from "antd";
 
 const Uploads = () => {
   const props: UploadProps = {
     name: "file",
-    action: `http://127.0.0.1:12216/v1/public/fts/upload`,
+    action: Config.baseUrl + `/public/fts/upload`,
     headers: {
-      authorization: window.localStorage.getItem("token")??''
+      authorization: window.localStorage.getItem("token") ?? ''
     },
     onChange(info: any) {
       if (info.file.status === "done" && info.file.response.code !== 200) {
@@ -13,6 +14,7 @@ const Uploads = () => {
       } else if (info.file.status === "error") {
         message.error(`${info.file.name} file upload failed.`);
       }
+      message.success(`upload successfully`);
     },
   };
   return (

src/pages/user/user.tsx

@@ -9,7 +9,14 @@ const User = (props: Store) => {
   const { usrStore } = props;
   // 获取列表数据
   useEffect(() => {
-    usrStore.getlist();
+    usrStore.getlist().then(()=>{
+      const list = usrStore.list
+      for (let index = 0; index < list.length; index++) {
+        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)
+      }
+    });
   }, [usrStore]);
 
   return (

src/pages/user/user_config.tsx

@@ -3,7 +3,8 @@ import { UserDataType } from "@/model/userModel";
 import { ColumnsType } from "antd/lib/table";
 import { Image } from "antd";
 import { getBirthDateAndGender } from "@/util/util";
-import { CompanyConfig, DepConfig, RoleConfig } from "@/service/user_config";
+import { CompanyConfig, DepConfig, MenuConfig, RoleConfig } from "@/service/user_config";
+import SourceConfig from "@/service/source_config";
 export const defaultConfig = [
   {
     type: FormType.input,
@@ -31,24 +32,27 @@ export const defaultConfig = [
     label: "联系电话",
     name: "tel",
     value: "",
-    rule:[{ required: true, message: "联系电话不能为空" }]
+    rules: [{ required: true, message: "联系电话不能为空" }]
   },
   {
-    type: FormType.input,
+    type: FormType.treeSelect,
-    label: "邮箱",
+    treeCheckbox: true,
-    name: "email",
+    label: "菜单权限",
-    value: "",
+    name: "menu_id",
+    selectUrl: MenuConfig.LIST,
+    value: [],
+    treeMultiple: true,
+    rules: [{ required: true, message: "请选择菜单" }],
   },
   {
-    type: FormType.select,
+    type: FormType.cehckbox,
-    label: "所属部门",
+    label: "数据列",
-    name: "dep_identity",
+    name: "column_ids",
-    selectUrl: DepConfig.LIST,
+    selectUrl: SourceConfig.Headers,
-    keys: "dep_name",
+    value: [],
-    value: "",
+    rules: [{ required: true, message: "请选择默认数据" }],
-    rules: [],
   },
-  {
+   {
     type: FormType.treeSelect,
     label: "所属单位",
     name: "company_identity",
@@ -66,12 +70,29 @@ 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.upload,
     label: "头像",
     name: "head_img",
     value: [],
   },
+
 ];
 
 export const columns: ColumnsType<UserDataType> = [
@@ -118,16 +139,17 @@ export const columns: ColumnsType<UserDataType> = [
   },
   {
     title: "所属单位",
-     render: (render) => (
+    render: (render) => (
       <span>{render.company[0]?.name}</span>
     ),
-    
+
   },
   {
     title: "角色",
     dataIndex: "",
-      render: (render) => (
+    render: (render) => (
       <span>{render.role[0]?.name}</span>
     ),
-  }
+  },
+
 ];