diff --git a/src/App.tsx b/src/App.tsx index a8a1e26..615205f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,3 +1,7 @@ +// 引入Provider +import { Provider } from 'react-redux'; +// 引入仓库 +import store from './store'; import Head from './layout/head/Head.tsx'; import Body from './layout/body/Body.tsx'; // import Foot from './layout/foot/Foot.tsx'; @@ -8,7 +12,7 @@ import { GlobalDataActionType, GlobalDispatchContext, } from "./context/GlobalContext.ts"; -import React, {Reducer, useReducer} from "react"; +import React, { Reducer, useReducer } from "react"; const App: React.FC = () => { @@ -38,13 +42,15 @@ const App: React.FC = () => { return ( <> - - - - - {/* */} - - + + + + + + {/* */} + + + ); }; diff --git a/src/components/BelongPeople/BelongPeople.tsx b/src/components/BelongPeople/BelongPeople.tsx index e2bc8fc..d1aa2e0 100644 --- a/src/components/BelongPeople/BelongPeople.tsx +++ b/src/components/BelongPeople/BelongPeople.tsx @@ -114,7 +114,7 @@ export default function BelongPeople(props: propsInfo) { const belongRowSelection = { // selectedRowKeys: React.Key[] onChange: (selectedRowKeys: React.Key[], selectedRows: BelongDataType[]) => { - console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); + // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); setauthorName(selectedRows[0].name) setauthorIdCardType(selectedRows[0].idCardType) setauthorIdCard(selectedRows[0].idCardNo) @@ -245,7 +245,7 @@ export default function BelongPeople(props: propsInfo) { setIsLoading(true); }, onSuccess({ data }: AxiosResponse) { - console.log('所属者表格', data); + // console.log('所属者表格', data); setTableBelongData(data) // const selectBelongArray = data.filter(item => item.name === authorName) // console.log('嘻嘻',selectBelongArray); @@ -267,7 +267,7 @@ export default function BelongPeople(props: propsInfo) { setIsLoading(true); }, onSuccess({ data }: AxiosResponse) { - console.log('搜索所属者表格', data); + // console.log('搜索所属者表格', data); setTableBelongData(data) }, onFinally() { @@ -367,7 +367,7 @@ export default function BelongPeople(props: propsInfo) { getProjOwnerList() listArea('0').then(data => { - console.log('省市1', data); + // console.log('省市1', data); // data.slice(0, 2).map const options: Option[] = data.map(item => { return { @@ -503,7 +503,8 @@ export default function BelongPeople(props: propsInfo) {
{/* 表格 */} - {props.isShow ? ( */} ( + render={(_text, record: any) => ( { // alert(record.projOwnerId); - console.log('text:', text); - console.log('record:', record); + // console.log('text:', text); + // console.log('record:', record); setProjOwnerId(record.projOwnerId) setbelongTitle('编辑所属者') @@ -654,14 +655,14 @@ export default function BelongPeople(props: propsInfo) { {/* */} ( + render={(_text, record: any) => ( { // alert(record.projOwnerId); - console.log('text:', text); - console.log('record:', record); + // console.log('text:', text); + // console.log('record:', record); setProjOwnerId(record.projOwnerId) setbelongTitle('编辑所属者') diff --git a/src/components/ContactPeople/ContactPeople.tsx b/src/components/ContactPeople/ContactPeople.tsx index 79d17e7..6cec0be 100644 --- a/src/components/ContactPeople/ContactPeople.tsx +++ b/src/components/ContactPeople/ContactPeople.tsx @@ -61,7 +61,7 @@ export default function ContactPeople(props: any) { messageApi, url: `/api/proj-contact/list/self`, onSuccess({ data }: AxiosResponse) { - console.log('联系人表格', data); + // console.log('联系人表格', data); // setTableBelongData(data) setTableContactData(data) } @@ -82,8 +82,8 @@ export default function ContactPeople(props: any) { // 联系人表格选择触发 const ContantRowSelection = { // selectedRowKeys: React.Key[] - onChange: (selectedRowKeys: React.Key[], selectedRows: ContactDataType[]) => { - console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); + onChange: (_selectedRowKeys: React.Key[], selectedRows: ContactDataType[]) => { + // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); setApplyConcatId(selectedRows[0].projContactId) setapplyContactCsaNo(selectedRows[0].csaNo) setapplyContactEmail(selectedRows[0].email) @@ -99,13 +99,13 @@ export default function ContactPeople(props: any) { messageApi, url: `/api/csa/get`, onSuccess({ data }: AxiosResponse) { - console.log('随机客服信息二维码', data.casQrCode); + // console.log('随机客服信息二维码', data.casQrCode); formContact.setFieldsValue({ csaNo: data.csaNo }); if (data.casQrCode) { - const imgUrl = downloadUrl(data.casQrCode); - console.log('图片地址', imgUrl); + const imgUrl = downloadUrl(data.casQrCode,false); + // console.log('图片地址', imgUrl); setImgUrl(imgUrl) } @@ -266,8 +266,8 @@ export default function ContactPeople(props: any) { { // alert(record.projOwnerId); - console.log('text:', text); - console.log('record:', record); + // console.log('text:', text); + // console.log('record:', record); setContactId(record.projContactId) setContactTitle('编辑联系人') @@ -333,8 +333,8 @@ export default function ContactPeople(props: any) { { // alert(record.projOwnerId); - console.log('text:', text); - console.log('record:', record); + // console.log('text:', text); + // console.log('record:', record); setContactId(record.projContactId) setContactTitle('编辑联系人') diff --git a/src/components/EditModal/EditModal.tsx b/src/components/EditModal/EditModal.tsx index b6b7b5e..5507e03 100644 --- a/src/components/EditModal/EditModal.tsx +++ b/src/components/EditModal/EditModal.tsx @@ -46,7 +46,7 @@ export default function ProjConfigModEdit(props: idType) { messageApi, url: `api/proj-mod/get/${props.id}`, onSuccess({ data }) { - console.log(data); + // console.log(data); form.setFieldsValue({ projId: data.projId, modName: data.modName, @@ -180,18 +180,18 @@ export default function ProjConfigModEdit(props: idType) { setIsEditModalOpen(false); // const reg = /^[\u4e00-\u9fa5]+$/; // 中文字符的正则表达式 - console.log(((form.getFieldValue('fields'))[0].fieldDesc)); + // console.log(((form.getFieldValue('fields'))[0].fieldDesc)); const isChinese = (form.getFieldValue('fields')).every((item: { fieldDesc: string; }) => { return /^([\u4e00-\u9fa5a-zA-Z]+)$/.test(item.fieldDesc); }); - console.log(isChinese); + // console.log(isChinese); if (!isChinese) { messageApi.error('描述由中文和字母组成') } else { - console.log(projId); + // console.log(projId); put({ messageApi, @@ -222,7 +222,7 @@ export default function ProjConfigModEdit(props: idType) { } }, onSuccess({ data }) { - console.log('更新',data); + // console.log('更新',data); props.setUpdata(data) } }) diff --git a/src/components/LoginPage/LoginPage.tsx b/src/components/LoginPage/LoginPage.tsx index d51005e..0cb1c2a 100644 --- a/src/components/LoginPage/LoginPage.tsx +++ b/src/components/LoginPage/LoginPage.tsx @@ -73,7 +73,7 @@ export default function ProjConfigLoginpage(props: any) { }, onSuccess({ data }) { setIframeSrcDoc(data.data); - console.log(data); + // console.log(data); } }) @@ -83,7 +83,7 @@ export default function ProjConfigLoginpage(props: any) { messageApi, url: '/api/loginpage/list', onSuccess({ data }) { - console.log('登录页图片列表', data); + // console.log('登录页图片列表', data); setloginpageArray(data) // setDefaultId(data[0].loginpageId) // upLoginPage(data[0].loginpageId) @@ -96,7 +96,7 @@ export default function ProjConfigLoginpage(props: any) { messageApi, url: '/api/loginpage/list', onSuccess({ data }) { - console.log('登录页图片列表', data); + // console.log('登录页图片列表', data); setloginpageArray(data) // setDefaultId(data[0].loginpageId) // upLoginPage(data[0].loginpageId) @@ -130,7 +130,7 @@ export default function ProjConfigLoginpage(props: any) { messageApi, url: `/api/proj/get/config-loginpage/${props.projId}`, onSuccess({ data }) { - console.log('寻找被选中id', data); + // console.log('寻找被选中id', data); if (data.loginpageId) { form.setFieldValue('loginpageId', data.loginpageId); setSelectedLoginpageId(data.loginpageId); @@ -511,7 +511,7 @@ export default function ProjConfigLoginpage(props: any) { // setLoginpageArray([ // ...loginpageArray // ]) - console.log('选择的id', item.loginpageId); + // console.log('选择的id', item.loginpageId); form.setFieldValue('loginpageId', item.loginpageId); preview() @@ -537,7 +537,7 @@ export default function ProjConfigLoginpage(props: any) { // console.log('发起球球的id',selectedLoginpageId); setIsEditModalOpen(false); - console.log(logoImgArray) + // console.log(logoImgArray) put({ messageApi, url: `/api/proj/update/config-loginpage/${props.projId}`, diff --git a/src/components/LoginPageShow/LoginPageShow.tsx b/src/components/LoginPageShow/LoginPageShow.tsx index e67093b..9bbe0b4 100644 --- a/src/components/LoginPageShow/LoginPageShow.tsx +++ b/src/components/LoginPageShow/LoginPageShow.tsx @@ -71,7 +71,7 @@ export default function ProjConfigLoginpage(props:any) { }, onSuccess({ data }) { setIframeSrcDoc(data.data); - console.log(data); + // console.log(data); } }) @@ -81,7 +81,7 @@ export default function ProjConfigLoginpage(props:any) { messageApi, url: '/api/loginpage/list', onSuccess({ data }) { - console.log('登录页图片列表', data); + // console.log('登录页图片列表', data); setloginpageArray(data) // setDefaultId(data[0].loginpageId) upLoginPage(data[0].loginpageId) @@ -112,7 +112,7 @@ export default function ProjConfigLoginpage(props:any) { messageApi, url: `/api/proj/get/config-loginpage/${props.projId}`, onSuccess({ data }) { - console.log('寻找被选中id', data); + // console.log('寻找被选中id', data); setSelectedLoginpageId(data.loginpageId); form.setFieldValue('loginpageId', data.loginpageId); form.setFieldValue('subTitle', data.subTitle); diff --git a/src/components/ai/AiHelper.tsx b/src/components/ai/AiHelper.tsx index 43c6c4e..3a2a097 100644 --- a/src/components/ai/AiHelper.tsx +++ b/src/components/ai/AiHelper.tsx @@ -663,7 +663,7 @@ export default function AiHelper(props: PropsType) {
{/* defaultCurrent: 默认当前页数 total:数据总数 defaultPageSize:'页面显示几条' */} { - console.log(page); + // console.log(page); // setPage(page) setloginpageArray([]) getlistLoginpage(page) diff --git a/src/components/ai/mod/AiHelperMod.tsx b/src/components/ai/mod/AiHelperMod.tsx index 8f6ab9e..d375988 100644 --- a/src/components/ai/mod/AiHelperMod.tsx +++ b/src/components/ai/mod/AiHelperMod.tsx @@ -55,7 +55,7 @@ export default function AiHelperMod(props: PropsType) { }, [props.mods, props.newMods]); useEffect(() => { if (updata.length != 0) { - console.log('更新数据', updata); + // console.log('更新数据', updata); setModArray(updata) } diff --git a/src/components/ai/text/AiHelperText.tsx b/src/components/ai/text/AiHelperText.tsx index 55ca4da..a31ffdb 100644 --- a/src/components/ai/text/AiHelperText.tsx +++ b/src/components/ai/text/AiHelperText.tsx @@ -32,7 +32,7 @@ export default function AiHelperText(props: PropsType) { messageApi, url: `/api/proj/get/${pathParams.projId}`, onSuccess({ data }) { - console.log('其他页面状态判断', data); + // console.log('其他页面状态判断', data); setStatus(data.generate.generateStatus) } }) diff --git a/src/components/balance/BalanceHead.tsx b/src/components/balance/BalanceHead.tsx index 13a5b3c..88cd821 100644 --- a/src/components/balance/BalanceHead.tsx +++ b/src/components/balance/BalanceHead.tsx @@ -13,7 +13,7 @@ export default function BalanceHead() {
{ - console.log('查看余额') + // console.log('查看余额') }}>￥{globalContext.user.balance}
) diff --git a/src/components/card/CardImgSelect.tsx b/src/components/card/CardImgSelect.tsx index 9bb2ab5..418ec7d 100644 --- a/src/components/card/CardImgSelect.tsx +++ b/src/components/card/CardImgSelect.tsx @@ -14,7 +14,7 @@ export type ImgSelect = { export default function CardImgSelect(props: ImgSelect) { const imgSrc = `${Axios.defaults?.baseURL}/route/file/v2/download/true/${props.imgs}`; - console.log(imgSrc) + // console.log(imgSrc) return (
{data.gmtCreate}
+ +
+ +
+ + {data.progress == 'DONE' ? '已下证' : data.progress == 'SUBMIT_FOR_REVIEW' ? '已提交版权中心' : data.progress == 'PRODUCTION' ? '正在制作中' : '等待制作中'} + +
+
+ {/*
+
+ + {data.progress == 'DONE' ? '已完成' : data.progress == 'SUBMIT_FOR_REVIEW' ? '已提交版权中心' : data.progress == 'PRODUCTION' ? '正在制作中' : '等待制作中'} + +
+
*/}
+ { data.generate.generateStatus == GenerateStatus.SUCCESS ? ( @@ -155,12 +187,12 @@ export default function CardProj(props: any) {
- +
- +
@@ -168,9 +200,17 @@ export default function CardProj(props: any) {
{/* */}
-
- 金额(￥) : - {data.pay.payment / 100} +
+
+ 金额(￥) : + {data.pay.payment / 100} +
+
+ {/*
基础费用:{basicsValue}
*/} + 加急:{URGENTvalue} + 安装包:{pkgValue} + 演示视频:{videoDemoValue} +
{ @@ -245,11 +285,10 @@ export default function CardProj(props: any) { }
-
+ {/*
- {/* 层级 */} { @@ -285,6 +324,9 @@ export default function CardProj(props: any) { }} /> ) : <> } +
*/} +
+ 产权所属者:{data.apply.authorName }
{/*
*/} diff --git a/src/components/card/card-proj.css b/src/components/card/card-proj.css index 777b741..382c238 100644 --- a/src/components/card/card-proj.css +++ b/src/components/card/card-proj.css @@ -87,7 +87,22 @@ font-size: 14px; color: #888888; } - +.proj-progress{ + + height: 29px; + background: #ff7b00; + /* background: #01a13f; */ + border-radius: 5px; + /* font-family: Microsoft YaHei UI; */ + font-weight: 400; + font-size: 14px; + color: #ffffff; + text-align: center; + line-height: 29px; + padding-left: 9px; + padding-right: 9px; + margin-left: 19px; +} .cpt-right { font-size: 14px; color: #FFA415; @@ -182,7 +197,17 @@ margin-left: 15px; } - +.otherMoney{ + display: flex; + margin-left: 10px; + height: 47px; + /* background-color: #F3F3F3; */ + padding: 0 10px; + align-items: center; + /* color: #797979; */ +} +.moneyBox{ +} .cpbl-btn { display: flex; diff --git a/src/components/list/ListProj.tsx b/src/components/list/ListProj.tsx index 84d4f46..37c9251 100644 --- a/src/components/list/ListProj.tsx +++ b/src/components/list/ListProj.tsx @@ -29,8 +29,11 @@ export default function ListProj() { // // setKeywords(state.keyword) // } const keywords = state ? state.keyword : '' - const name = state ? state.name : '' + const name = state ? state.name : '' + const chargeAdditionals = state? state.chargeAdditionals:'' + const progress = state? state.progress:'' + const authorId = state? state.authorId:'' // console.log(keywords); // const images = [syminga,symingb,symingc,symingd] const listProjRef: MutableRefObject = useRef(null); @@ -51,7 +54,8 @@ export default function ListProj() { get>({ messageApi: messageApi, - url: '/api/proj/listpage/self', + // url: '/api/proj/listpage/self', + url: '/api/proj/claim/listpage/self', config: { params: { page: currentPage, @@ -59,6 +63,8 @@ export default function ListProj() { keywords: keywords, charge: name, chargeAdditionals:chargeAdditionals, + progress:progress, + authorId:authorId, projCategoryId: indexListContext.category, status: indexListContext.status ? indexListContext.status : getMenuActive() } @@ -67,6 +73,8 @@ export default function ListProj() { setIsLoading(true); }, onSuccess({ data }) { + // console.log('数据',data); + setPage(data.page); setTotal(data.total); setProjs(data.rows); @@ -140,28 +148,33 @@ export default function ListProj() { }); } - const renderCategory = () => { - } + // const renderCategory = () => { + // } useEffect(() => { setShowPage(false) setPage(1) - if (indexListContext.categorys) { - reqData(1); - renderCategory(); - } - + reqData(1); + // if (indexListContext.categorys) { + // reqData(1); + // renderCategory(); + // } + // + // if(!keywords && !name && !chargeAdditionals && !progress && !authorId){ + // reqData(1) + // } setTimeout(() => { setShowPage(true) }, 0); - }, [indexListContext.status, keywords, name,chargeAdditionals]) + }, [indexListContext.status, keywords, name,chargeAdditionals,progress,authorId]) useEffect(() => { - if (indexListContext.categorys) { + reqData(page); + // if (indexListContext.categorys) { - reqData(page); - renderCategory(); - } + // reqData(page); + // // renderCategory(); + // } }, [indexListContext.categoryChangeCount, indexListContext.category]) // const renderStatus = () => { diff --git a/src/components/list/ListProjAgent.tsx b/src/components/list/ListProjAgent.tsx index ec55b2b..355b3e8 100644 --- a/src/components/list/ListProjAgent.tsx +++ b/src/components/list/ListProjAgent.tsx @@ -14,7 +14,7 @@ import NoData from "../../assets/no-data.png"; export default function ListProjAgent() { const indexListContext = useContext(IndexListContext); - console.log(indexListContext.status); + // console.log(indexListContext.status); const [messageApi, messageApiHolder] = useMessage(); const listProjRef: MutableRefObject = useRef(null); diff --git a/src/components/menu/MenuWithTopButton.tsx b/src/components/menu/MenuWithTopButton.tsx index d4ac54c..7aec1a3 100644 --- a/src/components/menu/MenuWithTopButton.tsx +++ b/src/components/menu/MenuWithTopButton.tsx @@ -31,7 +31,13 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
  • { props.handleListItem(e, index, item); setMenuActive(item.id) - navugate('/home') + navugate('/home',{ + state: { + keyword: props.keywords, + name: props.type, + chargeAdditionals: props.chargeAdditionals, + } + }) }}> {item.icon ? (加载失败) : <>} diff --git a/src/components/step/StepProjEdit.tsx b/src/components/step/StepProjEdit.tsx index acf804b..1a5cb48 100644 --- a/src/components/step/StepProjEdit.tsx +++ b/src/components/step/StepProjEdit.tsx @@ -9,7 +9,7 @@ export default function StepProjEdit(props: IStepProj) { useEffect(() => { // console.log(props); // location.pathname.includes('/proj-eall') - console.log('路由', location.pathname); + // console.log('路由', location.pathname); setAllShow(location.pathname.includes('/proj-eall') ? true : false) }, []) const height = window.innerHeight - 375; diff --git a/src/interfaces/menu/IMenuWithTopButton.ts b/src/interfaces/menu/IMenuWithTopButton.ts index e272db7..52cb310 100644 --- a/src/interfaces/menu/IMenuWithTopButton.ts +++ b/src/interfaces/menu/IMenuWithTopButton.ts @@ -19,5 +19,7 @@ export interface IMenuWithTopButton { list: Array; handleListItem(e: MouseEvent, index: number, item: IMenuListItem): void; - + keywords?:string; + type?:string ; + chargeAdditionals?:string; } \ No newline at end of file diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx index d0e1437..8a4c686 100644 --- a/src/layout/head/Head.tsx +++ b/src/layout/head/Head.tsx @@ -1,10 +1,11 @@ import './head.css' +import { useDispatch } from 'react-redux' import BalanceHead from '../../components/balance/BalanceHead.tsx'; import RechargeHead from '../../components/recharge/RechargeHead.tsx'; import { Dropdown, MenuProps, message, Modal, Space, Spin } from "antd"; import { DownOutlined, UserOutlined, KeyOutlined, LogoutOutlined, AccountBookOutlined, MenuFoldOutlined, UsergroupAddOutlined } from "@ant-design/icons"; import { useContext, useEffect, useState } from "react"; -import { put } from "../../util/AjaxUtils.ts"; +import { put,get} from "../../util/AjaxUtils.ts"; import { GlobalContext, GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts"; import UserEdit from "../../components/user/UserEdit.tsx"; import PasswordChange from "../../components/password/PasswordChange.tsx"; @@ -18,6 +19,29 @@ import BelongPeople from '../../components/BelongPeople/BelongPeople.tsx' import ContactPeople from '../../components/ContactPeople/ContactPeople.tsx' export default function Head() { + const dispath = useDispatch() + // 更新所属者表格储存至redux + const upBelongArray = () => { + get({ + messageApi, + url: `/api/proj-owner/list/self`, + onBefore() { + + }, + onSuccess(data: any) { + // console.log('所属者表格', data.data); + // setBelongPeopleArray(data.data) + // 存redux的belongArray + dispath({ + type: 'uparray', + val: data.data + }) + }, + onFinally() { + + } + }) + } const globalContext = useContext(GlobalContext); const globalDispatchContext = useContext(GlobalDispatchContext); const [messageApi, contextHolder] = message.useMessage(); @@ -54,8 +78,50 @@ export default function Head() { applyContactPhone: '', applyContactCompany: '' }) + // const [belongArray,setBelongArray] = useState([]) + // // 获取初始所属者数组 + // const getLength = () => { + // get({ + // messageApi, + // url: `/api/proj-owner/list/self`, + // onBefore() { + // }, + // onSuccess(data: any) { + // // console.log('所属者表格', data.data); + // // setBelongPeopleArray(data.data) + // setBelongArray(data.data ) + // }, + // onFinally() { + + // } + // }) + // } + // // 获取更新的所属者数组并且做对比查看是否刷新网页 + // const getNewLength = () => { + // get({ + // messageApi, + // url: `/api/proj-owner/list/self`, + // onBefore() { + + // }, + // onSuccess(data: any) { + // // console.log('所属者表格', data.data); + // // setBelongPeopleArray(data.data) + // console.log('查看结果',data.data != belongArray); + + // // if (data.data == belongArray) { + // // window.location.reload(); + // // } + // }, + // onFinally() { + + // } + // }) + // } + useEffect(() => { + // getLength() reloadUser(messageApi, globalDispatchContext).then((data) => { if (!data.hasUserInfo) { setIsSelfModalOpen(true); @@ -276,6 +342,8 @@ export default function Head() { footer={null} onCancel={() => { + upBelongArray() + // getNewLength() setBelongModal(false) }}> diff --git a/src/route/ProductRelease/components/EditModal/EditModal.tsx b/src/route/ProductRelease/components/EditModal/EditModal.tsx index ca400b0..b07134f 100644 --- a/src/route/ProductRelease/components/EditModal/EditModal.tsx +++ b/src/route/ProductRelease/components/EditModal/EditModal.tsx @@ -103,7 +103,7 @@ export default function EditModal(props: any) { ); useEffect(() => { listArea('0').then(data => { - console.log('省市1', data); + // console.log('省市1', data); // data.slice(0, 2).map const options: Option[] = data.map(item => { return { diff --git a/src/route/SearchList/SearchList.tsx b/src/route/SearchList/SearchList.tsx index b760db3..cab9b5c 100644 --- a/src/route/SearchList/SearchList.tsx +++ b/src/route/SearchList/SearchList.tsx @@ -19,7 +19,7 @@ export default function SearchList() { // const [keywords, setKeywords] = useState(''); const [messageApi, contextHolder] = message.useMessage(); const {state} = useLocation() - console.log(state); + // console.log(state); const reqData = (currentPage: number) => { get>({ diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index 3cd24ff..0a04aa0 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -1,14 +1,20 @@ import './index.css'; // import { MouseEvent, Reducer, useEffect, useReducer, useState, useContext } from "react"; import { MouseEvent, Reducer, useEffect, useReducer, useState } from "react"; +import { useSelector, useDispatch } from 'react-redux' import { useNavigate, useSearchParams, Outlet } from "react-router-dom"; import { IMenuListItem, IMenuWithTopButton } from "../../interfaces/menu/IMenuWithTopButton.ts"; import MenuWithTopButton from "../../components/menu/MenuWithTopButton.tsx"; // import MenuWithBottomButtom from '../../components/menu/MenuWithBottomButton.tsx' -import MenuTreeWithTopButton from "../../components/menu/MenuTreeWithTopButton.tsx"; +// import MenuTreeWithTopButton from "../../components/menu/MenuTreeWithTopButton.tsx"; // import ListProj from "../../components/list/ListProj.tsx"; // import ListProjAgent from "../../components/list/ListProjAgent.tsx"; -import { MenuProps, Select } from 'antd'; +import { + MenuProps, Select, + Button, + Pagination, + Empty +} from 'antd'; import { IndexListContext, IndexListDataType, @@ -17,25 +23,110 @@ import { ListData, } from "../../context/IndexListContext.ts"; - +import { + MenuFoldOutlined, + ClearOutlined +} from '@ant-design/icons'; import { useLocation } from 'react-router-dom'; - +import { get } from '../../util/AjaxUtils.ts' import gpsImg from '../../static/right/gps.png' import backImg from '../../static/right/back.png' import { Link } from "react-router-dom"; -import { Input, Breadcrumb } from 'antd'; +import { Input, Breadcrumb, message } from 'antd'; const { Search } = Input; export default function Index() { + const dispath = useDispatch() + //redux的belongArray + const redxuState: any = useSelector(state => state) + const belongArray = redxuState.belongArray + // 获取所属者表格储存至redux 更新表格 + const getProjOwnerList = () => { + get({ + messageApi, + url: `/api/proj-owner/list/self`, + onBefore() { + + }, + onSuccess(data: any) { + // console.log('所属者表格', data.data); + // setBelongPeopleArray(data.data) + // 存redux的belongArray + dispath({ + type: 'uparray', + val: data.data + }) + }, + onFinally() { + + } + }) + } + + // 更新数据 + // const upBelongArray = () => { + // get({ + // messageApi, + // url: `/api/proj-owner/list/self`, + // onBefore() { + + // }, + // onSuccess(data: any) { + // // console.log('所属者表格', data.data); + // setBelongPeopleArray(data.data) + + // }, + // onFinally() { + + // } + // }) + // } + // 监听redux的belongArray + // useEffect(()=>{ + // },[belongArray]) + + const [messageApi, contextHolder] = message.useMessage(); + // 临时关键字 (过度) + const [nowKeyword, setNowKeyWord] = useState('') // 关键字 const [keywords, setKeywords] = useState(''); - const [type, setType] = useState('') - const [chargeAdditionals,setchargeAdditionals] = useState('') + const [type, setType] = useState(null) + const [chargeAdditionals, setchargeAdditionals] = useState(null) + const [progress, setprogress] = useState(null) + const [authorId, setauthorId] = useState('') // const indexListContext = useContext(IndexListContext); + // 所属者信息 + // const [belongPeopleArray, setBelongPeopleArray] = useState([]) + const [currentPage, setCurrentPage] = useState(1); + const itemsPerPage = 5; + // 计算总页数 + const totalItems = belongArray.length; + const totalPages = Math.ceil(totalItems / itemsPerPage); + // 计算当前页数据的起始和结束索引 + const startIndex = (currentPage - 1) * itemsPerPage; + const endIndex = Math.min(startIndex + itemsPerPage, totalItems); + // 提取当前页的数据 + const currentPageData = belongArray.slice(startIndex, endIndex); + + // 处理页码切换 + const handlePageChange = (page: number) => { + if (page >= 1 && page <= totalPages) { + setCurrentPage(page); + } + }; + + // // 初始化搜索条件 + const init = () => { + setNowKeyWord('') + setKeywords('') + setType(null) + setchargeAdditionals(null) + setprogress(null) + } const nav = useNavigate(); const [searchParams] = useSearchParams(); @@ -198,6 +289,8 @@ export default function Index() { const [pathArray, setPathArray] = useState([]) const [showSearchBox, setShowSearchBox] = useState(true) + + useEffect(() => { // const nowname = sessionStorage.getItem('now') if (location.pathname.includes('/home')) { @@ -325,43 +418,61 @@ export default function Index() { }) } - - + getProjOwnerList() }, []); useEffect(() => { + // console.log('监听', '类型:', type, '关键字:', keywords, '额外付费:', chargeAdditionals,'进度:',progress); + // console.log(Boolean(keywords)); + + // if (location.pathname.includes('/home')) { + if (!keywords && !type && !chargeAdditionals && !progress) { + setKeywords('') + setType('') + setchargeAdditionals('') + setprogress('') + } if (location.pathname.includes('/home')) { nav('/home', { state: { keyword: keywords, - name: type + name: type, + chargeAdditionals: chargeAdditionals, + progress: progress, + authorId: authorId } }) } + // } - }, [type]); + }, [type, chargeAdditionals, keywords, progress, authorId]); const handleSearch = (value: string) => { - console.log(value); + // console.log(value); setKeywords(value) nav('/home', { state: { keyword: value, name: type, - chargeAdditionals:chargeAdditionals, + chargeAdditionals: chargeAdditionals, + progress: progress, + authorId: authorId } }) } const handleChange = (e: any) => { - console.log(e.target.value); + setNowKeyWord(e.target.value) + // console.log(e.target.value); if (e.target.value == '') { setKeywords('') nav('/home', { state: { keyword: '', name: type, - chargeAdditionals:chargeAdditionals, + chargeAdditionals: chargeAdditionals, + progress: progress, + authorId: authorId } }) } @@ -373,6 +484,7 @@ export default function Index() { {title: 首页} ]} /> */} + {contextHolder}
    @@ -383,8 +495,91 @@ export default function Index() { button={projMenu.button} list={projMenu.list} handleListItem={projMenu.handleListItem} + keywords={keywords} + type={type ? type : ""} + chargeAdditionals={chargeAdditionals ? chargeAdditionals : ""} /> - +
    +
    + 产权所属者 +
    +
    0 ? 'block' : 'none' }}> +
    + { + currentPageData.map((item: any) => { + return ( +
    { + if (authorId == item.projOwnerId) { + setauthorId('') + nav('/home', { + state: { + keyword: keywords, + name: type, + chargeAdditionals: chargeAdditionals, + progress: progress, + authorId: '' + } + }) + } else { + setauthorId(item.projOwnerId) + nav('/home', { + state: { + keyword: keywords, + name: type, + chargeAdditionals: chargeAdditionals, + progress: progress, + authorId: item.projOwnerId + } + }) + } + }} + style={{ background: authorId == item.projOwnerId ? '#FF9F08' : '', color: authorId == item.projOwnerId ? '#FFF' : '' }} + title={ item.name} // 添加 title 属性以显示完整文本 + > + 名称:{item.name} +
    + ) + }) + } +
    + {/* 分页控件 */} + {/*
    + + + +
    */} +
    + +
    +
    +
    0 ? 'none' : 'block', height: 230 }}> +
    + +
    +
    +
    + {/* */} {/*
    { // console.log(`selected ${value}`); @@ -470,20 +672,57 @@ export default function Index() { state: { keyword: keywords, name: type, - chargeAdditionals:value + chargeAdditionals: value, + progress: progress, + authorId: authorId } }) }} options={[ - { value: '', label: '选择拓展收费' }, + // { value: '', label: '全部项目' }, { value: 'PKG', label: '安装包' }, { value: 'VIDEO_DEMO', label: '演示视频' }, { value: 'URGENT', label: '加急' }, ]} - defaultValue="" - // placeholder={'选择类型'} + // defaultValue="" + placeholder={'选择拓展收费'} /> +