diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 71dca2ff5..ff00d42d8 100644 --- a/public/css/iconfont.css +++ b/public/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2340181 */ - src: url('iconfont.woff2?t=1780902820324') format('woff2'), - url('iconfont.woff?t=1780902820324') format('woff'), - url('iconfont.ttf?t=1780902820324') format('truetype'); + src: url('iconfont.woff2?t=1781227458195') format('woff2'), + url('iconfont.woff?t=1781227458195') format('woff'), + url('iconfont.ttf?t=1781227458195') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zhinengzhushou:before { + content: "\ea08"; +} + +.icon-shine-search:before { + content: "\ea07"; +} + .icon-zuojiantou3:before { content: "\ea05"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index 1f09116a5..a39b779b6 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2340181='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}})(window); \ No newline at end of file +window._iconfont_svg_string_2340181='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}})(window); \ No newline at end of file diff --git a/public/css/iconfont.json b/public/css/iconfont.json index de009d327..bc704fc43 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "45990748", + "name": "智能助手", + "font_class": "zhinengzhushou", + "unicode": "ea08", + "unicode_decimal": 59912 + }, + { + "icon_id": "47826921", + "name": "shine-search", + "font_class": "shine-search", + "unicode": "ea07", + "unicode_decimal": 59911 + }, { "icon_id": "47798947", "name": "左箭头", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index 3a25ea7a3..787951607 100644 Binary files a/public/css/iconfont.ttf and b/public/css/iconfont.ttf differ diff --git a/public/css/iconfont.woff b/public/css/iconfont.woff index 5356b3253..306a322a8 100644 Binary files a/public/css/iconfont.woff and b/public/css/iconfont.woff differ diff --git a/public/css/iconfont.woff2 b/public/css/iconfont.woff2 index c706d0270..2cae34584 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js index 4cc1d372d..f99414a36 100644 --- a/src/forge/Component/SiderBar.js +++ b/src/forge/Component/SiderBar.js @@ -29,7 +29,7 @@ function SiderBar(props) { const [ feedBackModal, setFeedBackModal] = useState(false); const [ feedBackValue, setFeedBackValue] = useState(undefined); const [ failApply, setFailApply] = useState(undefined); - + useEffect(()=>{ user && setLogin(user.login); },[user]) @@ -103,8 +103,28 @@ 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('连接智能助手失败，请稍后重试'); + }) + } + return (
+ {/* 超算智能助手 */} + {/* { location.pathname === "/zone/NSCC" && + +
+ +
+ + } */} {/* 平台反馈 */}
diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx index 680598527..6a8757fdb 100644 --- a/src/forge/Information/Pages/selfList.jsx +++ b/src/forge/Information/Pages/selfList.jsx @@ -233,7 +233,7 @@ function SelfList(props){ {i.name} } { - source === "news" && status === 0 && i.auditType && {statueName(i.auditType.split('-')[0])} + source === "news" && (status === 0 || status===2) && i.auditType && {statueName(i.auditType.split('-')[0])} }
{i.remark && status===2 &&
驳回理由:{i.remark}
} @@ -244,7 +244,7 @@ function SelfList(props){ {source==="projects" ? "更新于":"创建于"}{i.timeAgo || moment(i.createTime).format("YYYY/MM/DD")} - {source!=="projects" && 编辑 } + {source==="source" || (source==="news" && status===1) && 编辑 } { source==="projects"? handleRemove(i.name,i.id)}>移除 diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js index b7b23f9ea..52d69fa3a 100644 --- a/src/forge/Information/fetch.js +++ b/src/forge/Information/fetch.js @@ -15,7 +15,7 @@ function beforeFetch(actionUrl){ service.interceptors.request.use(request => { let deptId = sessionStorage.getItem('deptId'); - // request.headers.Authorization = '8786c89c803fc2420f75c19895f0cee794b6f9a3' + // request.headers.Authorization = '0111aaede5482cd146765f9aa8df16dc3d0ad58c' if (deptId) { // 用于权限区分 request.headers['Dept-Id'] = deptId