From 95b56048015670862256b02ed16e8354cd7f9a5a Mon Sep 17 00:00:00 2001 From: Lhk0001 <2406661616@qq.com> Date: Mon, 20 Nov 2023 20:52:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9api=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=E5=8F=98=E9=87=8F=E6=B3=A8=E9=87=8A=EF=BC=88?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E6=9A=82=E6=97=B6=E4=B8=8D=E6=95=A2?= =?UTF-8?q?=E5=8A=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/dept.ts | 2 +- src/api/system/publish.ts | 82 ++++++++++++------------ src/api/system/role.ts | 2 +- src/view/system/dept/index.tsx | 5 +- src/view/system/notice/publish/index.tsx | 52 +-------------- src/view/system/role/index.tsx | 13 ++-- 6 files changed, 53 insertions(+), 103 deletions(-) diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index d5e4852..5eede45 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -1,4 +1,4 @@ -import request from "../utils/request"; +import request from "@/utils/request"; interface queryParamsType { deptName?: string; state?: number; diff --git a/src/api/system/publish.ts b/src/api/system/publish.ts index 8937d0c..edc5e97 100644 --- a/src/api/system/publish.ts +++ b/src/api/system/publish.ts @@ -1,67 +1,67 @@ import request from "@/utils/request"; interface paramsType { - cluster?: string, - contentType?: string, - noticeTitle?: string, - noticeType?: string, - publishId?: number, - sendType?: string, - pageNum?: number, - pageSize?: number - } + cluster?: string; + contentType?: string; + noticeTitle?: string; + noticeType?: string; + publishId?: number; + sendType?: string; + pageNum?: number; + pageSize?: number; +} - interface addParamsType { - action?: string, - cluster?: string, - contentType?: string, - noticeContent?: string, - noticeTitle?: string, - noticeType?:string, - remark?:string, - sendType?: string, - senderIds?:number[] - } -export const getDataListAPI = (params:paramsType) => { +interface addParamsType { + action?: string; + cluster?: string; + contentType?: string; + noticeContent?: string; + noticeTitle?: string; + noticeType?: string; + remark?: string; + sendType?: string; + senderIds?: number[]; +} +export const getDataListAPI = (params: paramsType) => { return request({ url: "/notice/notice", method: "get", - params: params + params: params, }); }; export const getUserListAPI = () => { return request({ url: "/admin/user", - method: "get" + method: "get", }); }; export const getRolesListAPI = () => { return request({ url: "/admin/role", - method: "get" + method: "get", }); }; export const getDeptsListAPI = () => { return request({ url: "/admin/dept", - method: "get" + method: "get", }); }; -export const addDataAPI=(addParams:addParamsType)=>{ +export const addDataAPI = (addParams: addParamsType) => { return request({ - url:`/notice/notice`, - method:'post', - data:addParams - }) -} -export const deleteDataAPI=(noticeId:number)=>{ + url: `/notice/notice`, + method: "post", + data: addParams, + }); +}; +export const deleteDataAPI = (noticeId: number) => { return request({ - url:`/notice/notice/${noticeId}`, - method:'delete', - }) -} -export const getDataAPI=(noticeId:number)=>{ + url: `/notice/notice/${noticeId}`, + method: "delete", + }); +}; +export const getDataAPI = (noticeId: number) => { return request({ - url:`/notice/notice/${noticeId}`, - method:'get', - }) -} \ No newline at end of file + url: `/notice/notice/${noticeId}`, + method: "get", + }); +}; diff --git a/src/api/system/role.ts b/src/api/system/role.ts index 9f40099..76187b1 100644 --- a/src/api/system/role.ts +++ b/src/api/system/role.ts @@ -1,4 +1,4 @@ -import request from "../utils/request"; +import request from "@/utils/request"; interface paramsType { createTime?: string, dataScope?: string, diff --git a/src/view/system/dept/index.tsx b/src/view/system/dept/index.tsx index c5d7f21..d89d861 100644 --- a/src/view/system/dept/index.tsx +++ b/src/view/system/dept/index.tsx @@ -34,7 +34,7 @@ import { getDataAPI, } from "../../../api/system/dept"; import "./index.scss"; -import { useForm } from "antd/es/form/Form"; +// import { useForm } from "antd/es/form/Form"; interface searchValueType { deptName: string | undefined; state: string | undefined; @@ -169,13 +169,14 @@ export default function Dept() { }; const handleSerach = () => { searchValue = formSearch.getFieldsValue(); + setSearchValue(searchValue) console.log(searchValue); - // queryTableDataParams={...searchValue} setQueryTableDataParams({ ...searchValue }); }; const handleReset = () => { formSearch.resetFields(); searchValue = formSearch.getFieldsValue(); + setSearchValue(searchValue) setQueryTableDataParams({ ...searchValue }); }; const handleEdit = async (dept: any) => { diff --git a/src/view/system/notice/publish/index.tsx b/src/view/system/notice/publish/index.tsx index 4f10d93..def0a7d 100644 --- a/src/view/system/notice/publish/index.tsx +++ b/src/view/system/notice/publish/index.tsx @@ -74,7 +74,6 @@ interface queryParamsType { let thisrole: any = {}; export default function Inform() { const { confirm } = Modal; - const { RangePicker } = DatePicker; //提示组件 const [messageApi, contextHolder] = message.useMessage(); //搜索框内所有内容 @@ -241,17 +240,14 @@ export default function Inform() { }; const handleSerach = () => { searchValue = formSearch.getFieldsValue(); - if (typeof searchValue.dateTime !== "undefined") { - searchValue.startTime = (searchValue.dateTime as string[])[0]; - searchValue.endTime = (searchValue.dateTime as string[])[1]; - } - console.log(searchValue); + setSearchValue(searchValue) count = 1; setQueryTableDataParams({ ...searchValue }); }; const handleReset = () => { formSearch.resetFields(); searchValue = formSearch.getFieldsValue(); + setSearchValue(searchValue) setQueryTableDataParams({ ...searchValue }); }; //Modal区域 @@ -429,50 +425,6 @@ export default function Inform() { getDataList(queryTableDataParams); // console.log(queryParams); }, [queryTableDataParams]); - const SendIds = function () { - if (senderIds === undefined) - return ( - - ); - } else - return ( - - ); - }; return (
diff --git a/src/view/system/role/index.tsx b/src/view/system/role/index.tsx index 1ead02f..e2928d2 100644 --- a/src/view/system/role/index.tsx +++ b/src/view/system/role/index.tsx @@ -16,7 +16,6 @@ import { Radio, Tree, ConfigProvider, - Spin, } from "antd"; import type { CheckboxChangeEvent } from "antd/es/checkbox"; import type { DatePickerProps, RangePickerProps } from "antd/es/date-picker"; @@ -38,7 +37,7 @@ import { setRoleDataAPI, getMenuLiseAPI, } from "../../../api/system/role"; -import { useForm } from "antd/es/form/Form"; +// import { useForm } from "antd/es/form/Form"; interface searchValueType { dateTime: string[] | undefined; roleName: string | undefined; @@ -269,22 +268,20 @@ export default function Role() { }); }; const handleSerach = () => { - // console.log("搜索框", searchValue); - // setSearchValue({ ...searchValue }); searchValue = formSearch.getFieldsValue(); + if (typeof searchValue.dateTime !== "undefined") { searchValue.startTime = (searchValue.dateTime as string[])[0]; searchValue.endTime = (searchValue.dateTime as string[])[1]; } - - console.log(searchValue); + setSearchValue(searchValue) count = 1; - // queryTableDataParams={...searchValue} setQueryTableDataParams({ ...searchValue }); }; const handleReset = () => { formSearch.resetFields(); searchValue =formSearch.getFieldsValue() + setSearchValue(searchValue) setQueryTableDataParams({ ...searchValue }); // setSearchValue({ ...searchValue }); // setCount(1) @@ -339,7 +336,7 @@ export default function Role() { searchValue.startTime = dateString[0]; searchValue.endTime = dateString[1]; formSearch.setFieldsValue({ dateTime: [dateString[0], dateString[1]] }); - console.log("time:", searchValue.endTime, searchValue.startTime); + setSearchValue(searchValue) // setSearchValue({ ...searchValue }) }; const filterOption = (