From 6d16a5ccbb2737a0725697616af951c6719b4a25 Mon Sep 17 00:00:00 2001 From: amypeng Date: Tue, 16 Jun 2026 10:16:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 置顶文章和项目增加跳转 --- src/forge/Information/Component/pointsDoc.jsx | 7 ++++--- src/forge/Information/Component/pointsProject.jsx | 4 ++-- src/forge/Information/Pages/zoneUser.jsx | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/forge/Information/Component/pointsDoc.jsx b/src/forge/Information/Component/pointsDoc.jsx index 29b4d9edc..6752ad8ab 100644 --- a/src/forge/Information/Component/pointsDoc.jsx +++ b/src/forge/Information/Component/pointsDoc.jsx @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Modal, Form, Input, Button, Spin, Pagination } from 'antd'; +import { Link } from 'react-router-dom'; import Nodata from '../../Nodata'; @@ -13,7 +14,7 @@ import { getImageUrl } from 'educoder' import '../indexUser.scss'; -function PointsDoc({ visible , onCancel , onSure , type , username , choosed , history , showCompeleteDialog , member }) { +function PointsDoc({ visible , onCancel , onSure , type , username , choosed , history , showCompeleteDialog , member, deptId }) { const limit = 5; const [ page , setPage ] = useState(1); @@ -112,7 +113,7 @@ function PointsDoc({ visible , onCancel , onSure , type , username , choosed , h {currentRow && (
- {currentRow.docName} + {window.scrollTo(0,450)}}>{currentRow.docName} @@ -120,7 +121,7 @@ function PointsDoc({ visible , onCancel , onSure , type , username , choosed , h )} {list && list.map((item) => (
- {item.name} + {window.scrollTo(0,450)}}>{item.name} diff --git a/src/forge/Information/Component/pointsProject.jsx b/src/forge/Information/Component/pointsProject.jsx index 699378286..41de46001 100644 --- a/src/forge/Information/Component/pointsProject.jsx +++ b/src/forge/Information/Component/pointsProject.jsx @@ -112,7 +112,7 @@ function PointsDoc({ visible , onCancel , onSure , type , username , choosed , h
{currentRow && (
- {currentRow.name} + {currentRow.name} @@ -120,7 +120,7 @@ function PointsDoc({ visible , onCancel , onSure , type , username , choosed , h )} {list && list.map((item) => (
- {item.projectProperties?.name} + {item.projectProperties?.name} diff --git a/src/forge/Information/Pages/zoneUser.jsx b/src/forge/Information/Pages/zoneUser.jsx index 7eba4e7ea..800b99a34 100644 --- a/src/forge/Information/Pages/zoneUser.jsx +++ b/src/forge/Information/Pages/zoneUser.jsx @@ -56,7 +56,7 @@ function ZoneUser(props){ const [ memberAccountInfo, setMemberAccountInfo ] = useState([]); const [msg, setMsg] = useState(''); - const { id, showNotification, checkIfLogin, showLoginDialog, temp, sectionMemberTitle } = props; + const { id, showNotification, checkIfLogin, showLoginDialog, temp, sectionMemberTitle} = props; useEffect(()=>{ let uuid = getUniqueIdentifier() @@ -399,7 +399,7 @@ function ZoneUser(props){ handleAwardSure(msg)} onCancel={()=>setAwardVisible(false)} /> - setDocVisible(false)} onSure={() => { setDocVisible(false); setMsg('首页新闻推荐'); setSuccessVisible(true);getInfo();}} /> Date: Tue, 16 Jun 2026 11:36:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8A=A9=E6=89=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/SiderBar.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js index f99414a36..8d42c68a1 100644 --- a/src/forge/Component/SiderBar.js +++ b/src/forge/Component/SiderBar.js @@ -105,26 +105,27 @@ function SiderBar(props) { function loginAi(){ const url = `https://testai.trustie.net/login`; - axios.post(url,{username:"chaosuan",password:"12345678"}).then(res=>{ - if(res && res.data){ - window.open(`https://testai.trustie.net/chat`); - } - }).catch(error=>{ - console.error('loginAi请求失败:', error); - message.error('连接智能助手失败，请稍后重试'); - }) + const regurl = `https://testai.trustie.net/register`; + axios.post(regurl,{username:user.login,password:"12345678"}).then(res=>{ + axios.post(url,{username:user.login,password:"12345678"}).then(res=>{ + if(res && res.data){ + window.open(`https://testai.trustie.net/chat`); + } + }).catch(error=>{}) + }).catch(error=>{}) + } return (
{/* 超算智能助手 */} - {/* { location.pathname === "/zone/NSCC" && + { location.pathname === "/zone/NSCC" && user && user.login &&
- } */} + } {/* 平台反馈 */}
From 5dfef69aeb6357e29402f60b8518702bb1fdd990 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 16 Jun 2026 14:04:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8A=A9=E6=89=8B?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=99=BB=E5=BD=95+=E8=B6=85=E7=AE=97?= =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2=E9=83=BD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/SiderBar.js | 6 +++++- src/modules/tpm/TPMIndexHOC.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js index 8d42c68a1..c537b7a0d 100644 --- a/src/forge/Component/SiderBar.js +++ b/src/forge/Component/SiderBar.js @@ -29,6 +29,7 @@ function SiderBar(props) { const [ feedBackModal, setFeedBackModal] = useState(false); const [ feedBackValue, setFeedBackValue] = useState(undefined); const [ failApply, setFailApply] = useState(undefined); + console.log(props); useEffect(()=>{ user && setLogin(user.login); @@ -104,6 +105,9 @@ function SiderBar(props) { } function loginAi(){ + if(!user.login){ + return props.showLoginDialog(); + } const url = `https://testai.trustie.net/login`; const regurl = `https://testai.trustie.net/register`; axios.post(regurl,{username:user.login,password:"12345678"}).then(res=>{ @@ -119,7 +123,7 @@ function SiderBar(props) { return (
{/* 超算智能助手 */} - { location.pathname === "/zone/NSCC" && user && user.login && + { location.pathname.indexOf("/zone/NSCC")>-1 &&
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 6b463218f..8d4fd5e3f 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -299,7 +299,7 @@ export function TPMIndexHOC(WrappedComponent) { let notFullPage = !path.includes('softwareFactory') return (
- {(!path || (path && !path.includes('glcc') )) && } + {(!path || (path && !path.includes('glcc') )) && }