From 5900ca7be381a95f915d14ee17a6c834dc777ab1 Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Sat, 9 Aug 2025 23:23:09 +0800 Subject: [PATCH] fix(icc add hls) --- src/pages/dep/config.tsx | 2 +- src/pages/role/role_config.tsx | 54 +++++++++++++++---------------- src/pages/source/upload.tsx | 6 ++-- src/pages/user/user.tsx | 9 +++++- src/pages/user/user_config.tsx | 58 +++++++++++++++++++++++----------- 5 files changed, 80 insertions(+), 49 deletions(-) diff --git a/src/pages/dep/config.tsx b/src/pages/dep/config.tsx index bc09f92..7d2e8e4 100644 --- a/src/pages/dep/config.tsx +++ b/src/pages/dep/config.tsx @@ -45,7 +45,7 @@ export const defaultConfig = [ value: 0, selectUrl: CompanyConfig.LIST, keys: "name", - rules: [], + rules: [{ required: true, message: "请选择所属单位!" }], }, ]; diff --git a/src/pages/role/role_config.tsx b/src/pages/role/role_config.tsx index 2b712eb..9044345 100644 --- a/src/pages/role/role_config.tsx +++ b/src/pages/role/role_config.tsx @@ -20,15 +20,15 @@ export const defaultConfig = [ value: "", rules: [{ required: true, message: "请输入角色描述" }], }, - { - type: FormType.select, - label: "所属部门", - name: "dep_identity", - selectUrl: DepConfig.LIST, - keys: "dep_name", - value: "", - rules: [{ required: true, message: "所属部门不能为空" }], - }, + // { + // type: FormType.select, + // label: "所属部门", + // name: "dep_identity", + // selectUrl: DepConfig.LIST, + // keys: "dep_name", + // value: "", + // rules: [], + // }, { type: FormType.treeSelect, label: "所属单位", @@ -38,24 +38,24 @@ export const defaultConfig = [ value: "", rules: [{ required: true, message: "所属单位不能为空" }], }, - { - type: FormType.treeSelect, - treeCheckbox:true, - label: "菜单权限", - name: "menu_id", - selectUrl: MenuConfig.LIST, - value: "", - treeMultiple:true, - rules: [{ required: true, message: "请选择菜单" }], - }, - { - type: FormType.cehckbox, - label: "数据列", - name: "column_ids", - selectUrl: SourceConfig.Headers, - value: [], - rules: [{ required: true, message: "请选择默认数据" }], - }, + // { + // type: FormType.treeSelect, + // treeCheckbox:true, + // label: "菜单权限", + // name: "menu_id", + // selectUrl: MenuConfig.LIST, + // value: "", + // treeMultiple:true, + // rules: [{ required: true, message: "请选择菜单" }], + // }, + // { + // type: FormType.cehckbox, + // label: "数据列", + // name: "column_ids", + // selectUrl: SourceConfig.Headers, + // value: [], + // rules: [{ required: true, message: "请选择默认数据" }], + // }, ]; export const columns: ColumnsType = [ diff --git a/src/pages/source/upload.tsx b/src/pages/source/upload.tsx index 1d8cab0..c089356 100644 --- a/src/pages/source/upload.tsx +++ b/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 ( diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index ab14592..4b6adfa 100644 --- a/src/pages/user/user.tsx +++ b/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 ( diff --git a/src/pages/user/user_config.tsx b/src/pages/user/user_config.tsx index 7476753..466d794 100644 --- a/src/pages/user/user_config.tsx +++ b/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, - label: "邮箱", - name: "email", - value: "", + type: FormType.treeSelect, + treeCheckbox: true, + label: "菜单权限", + name: "menu_id", + selectUrl: MenuConfig.LIST, + value: [], + treeMultiple: true, + rules: [{ required: true, message: "请选择菜单" }], }, { - type: FormType.select, - label: "所属部门", - name: "dep_identity", - selectUrl: DepConfig.LIST, - keys: "dep_name", - value: "", - rules: [], + type: FormType.cehckbox, + label: "数据列", + name: "column_ids", + selectUrl: SourceConfig.Headers, + value: [], + rules: [{ required: true, message: "请选择默认数据" }], }, - { + { 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 = [ @@ -118,16 +139,17 @@ export const columns: ColumnsType = [ }, { title: "所属单位", - render: (render) => ( + render: (render) => ( {render.company[0]?.name} ), - + }, { title: "角色", dataIndex: "", - render: (render) => ( + render: (render) => ( {render.role[0]?.name} ), - } + }, + ];