From 21a778b92d17adea3c9e131abbc0b1a3c10df9c4 Mon Sep 17 00:00:00 2001 From: lyp Date: Tue, 31 Dec 2024 18:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/card/CardProj.tsx | 126 ++++++++++++++++++++----------- src/components/list/ListProj.tsx | 7 +- src/route/index/Index.tsx | 53 ++++++++----- 3 files changed, 123 insertions(+), 63 deletions(-) diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx index 15c2131..4069f85 100644 --- a/src/components/card/CardProj.tsx +++ b/src/components/card/CardProj.tsx @@ -337,25 +337,45 @@ export default function CardProj(props: any) { {/* 标签 */}
{props.tagArray.map((item: any) => { - return ( + const [part1, part2] = item.value.split(':'); + if (part2 == 'TAG_NOT') { + return ( + //
{ - - upTag(item.value, data.projId) - // upData(item.value) - // props.updata() + // border: ' 1px dashed #5a5a5a', + // // display: data.projStatus == 'NORMAL' || data.projStatus == 'EXPIRED' ? 'block' : 'none' + // marginBottom: 10, + // // 禁止换行 + // textWrap: 'nowrap' + // }} + // > + // {item.label} + // {/* 提交版权中心 */} + //
+
+ ); + } else { + return ( +
- {item.label} -
+ onClick={() => { + // console.log('查看数据', item.value); + + upTag(part1, data.projId) + // upData(item.value) + // props.updata() + }} + > + {item.label} +
+ + ) + } - ) })} @@ -459,8 +479,8 @@ export default function CardProj(props: any) { } }}> -
登录界面设置
{ @@ -475,7 +495,7 @@ export default function CardProj(props: any) { }}>
系统菜单管理({data.projModCount})
{ @@ -491,39 +511,59 @@ export default function CardProj(props: any) { }}>
菜单排序({data.projModCount})
-
+
{props.tagArray.map((item: any) => { - return ( + const [part1, part2] = item.value.split(':'); + if (part2 == 'TAG_NOT') { + return ( + //
{ - - upTag(item.value, data.projId) - // upData(item.value) - // props.updata() + // border: ' 1px dashed #5a5a5a', + // // display: data.projStatus == 'NORMAL' || data.projStatus == 'EXPIRED' ? 'block' : 'none' + // marginBottom: 10, + // // 禁止换行 + // textWrap: 'nowrap' + // }} + // > + // {item.label} + // {/* 提交版权中心 */} + //
+
+ ); + } else { + return ( +
- {item.label} - {/* 提交版权中心 */} -
+ onClick={() => { + // console.log('查看数据', item.value); + + upTag(part1, data.projId) + // upData(item.value) + // props.updata() + }} + > + {item.label} + {/* 提交版权中心 */} +
+ + ) + } - ) })}
diff --git a/src/components/list/ListProj.tsx b/src/components/list/ListProj.tsx index edf656c..9925703 100644 --- a/src/components/list/ListProj.tsx +++ b/src/components/list/ListProj.tsx @@ -30,7 +30,7 @@ export default function ListProj() { // } const keywords = state ? state.keyword : '' const type = state ? state.type : '' - + // const tagNot = state? state.tagNot : '' const chargeAdditionals = state ? state.chargeAdditionals : '' const tagDataId = state ? state.tagDataId : '' const projRemindId = state? state.projRemindId : '' @@ -55,20 +55,21 @@ export default function ListProj() { // const navigate = useNavigate() const reqData = (currentPage: number) => { setProjs([]) - + const [part1, part2] = tagDataId?tagDataId.split(':'):['', '']; get>({ messageApi: messageApi, // url: '/api/proj/listpage/self', url: '/api/proj/claim/listpage/self', config: { params: { + tagNot:part2 == 'TAG_NOT' ? true : '', page: currentPage, rows: 10, keywords: keywords, // charge: type, chargeType: type, chargeAdditionals: chargeAdditionals, - tagDataId: tagDataId, + tagDataId: part1, projRemindId: projRemindId, authorId: authorId, payStatus: payStatus, diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index bfeb208..3d0262a 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -55,7 +55,7 @@ export default function Index() { // 选项数组 const [tagArray, setTagArray] = useState([]) - + // const[tagNot,setTagNot] = useState(false) // 获取标签 const getTag = () => { get({ @@ -65,11 +65,13 @@ export default function Index() { }, onSuccess(data: any) { - // console.log('标签信息', data); + console.log('标签信息', data); const newarrty: any = (data.data).map((item: any) => ({ value: item.key, label: item.value })); + // console.log('标签信息', newarrty); + setTagArray(newarrty) }, @@ -94,7 +96,7 @@ export default function Index() { value: item.projRemindId, label: item.title })); - // // console.log('标签信息', newarrty); + // console.log('标签信息', newarrty); setRemindTagArray(newarrty) @@ -849,7 +851,8 @@ export default function Index() { tagDataId: tagDataId, authorId: authorId, payStatus: payStatus, - projRemindId: projRemindId + projRemindId: projRemindId, + // tagNot } }) } @@ -891,7 +894,8 @@ export default function Index() { tagDataId: tagDataId, authorId: authorId, payStatus: payStatus, - projRemindId: projRemindId + projRemindId: projRemindId, + // tagNot } }) @@ -909,7 +913,8 @@ export default function Index() { tagDataId: tagDataId, authorId: authorId, payStatus: payStatus, - projRemindId: projRemindId + projRemindId: projRemindId, + // tagNot } }) @@ -1246,7 +1251,8 @@ export default function Index() { tagDataId: tagDataId, authorId: authorId, payStatus: payStatus, - projRemindId: projRemindId + projRemindId: projRemindId, + // tagNot } }) @@ -1279,7 +1285,8 @@ export default function Index() { tagDataId: tagDataId, authorId: authorId, payStatus: payStatus, - projRemindId: projRemindId + projRemindId: projRemindId, + // tagNot } }) @@ -1295,14 +1302,20 @@ export default function Index() { />