diff --git a/public/css/gitlink.min.css b/public/css/gitlink.min.css index d6c28484f..f0908d1c5 100644 --- a/public/css/gitlink.min.css +++ b/public/css/gitlink.min.css @@ -16,6 +16,10 @@ font-family: "alibabaReg"; src: url("../fonts/ALIBABA-PUHUITI-REGULAR.TTF"); } +@font-face { + font-family: "ziyouwenyihei"; + src: url("../fonts/ziyouwenyihei.ttf"); +} .header { width: 100%; height: 51px; diff --git a/public/fonts/ziyouwenyihei.ttf b/public/fonts/ziyouwenyihei.ttf new file mode 100644 index 000000000..5e392798f Binary files /dev/null and b/public/fonts/ziyouwenyihei.ttf differ diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx index 273d6a4be..ce8c6960f 100644 --- a/src/forge/Information/Component/publicBanner.jsx +++ b/src/forge/Information/Component/publicBanner.jsx @@ -1,4 +1,4 @@ -import React , { useState , useEffect } from 'react'; +import React , { useState , useEffect, Fragment } from 'react'; import { Menu } from 'antd'; import { Link } from 'react-router-dom'; import { tempConfig } from '../tempInfo'; @@ -12,6 +12,7 @@ function PublicBanner(props){ const { deptId } = props.match.params; const { pathname } = props.history.location; const { data:{sectionHomepageShow, sectionHomepageTitle, sectionProjectShow,sectionDataSetShow,sectionDataSetTitle, sectionProjectTitle, sectionResourceShow, sectionResourceTitle, sectionCmsShow, sectionCmsTitle, sectionMemberShow, sectionMemberTitle, sectionHelperShow, sectionHelperTitle}, data , adminUrl, temp } = props; + const isNSCC = deptId === "NSCC"; useEffect(()=>{ if(pathname){ @@ -47,12 +48,19 @@ function PublicBanner(props){ },[pathname]) return( -
+
{ data && deptId !=='xjykyzx' &&
-

{data.mainTitle}

+ {!isNSCC &&

{data.mainTitle}

} + {isNSCC && + +

+ {data.mainTitle} + /SUPERCOMPUTING +

+
}

} diff --git a/src/forge/Information/Pages/source.jsx b/src/forge/Information/Pages/source.jsx index f5ba09396..0190616db 100644 --- a/src/forge/Information/Pages/source.jsx +++ b/src/forge/Information/Pages/source.jsx @@ -1,5 +1,5 @@ -import React , { useEffect , useState } from 'react'; -import { Button, Input , Pagination, Spin, Tag } from 'antd'; +import React , { Fragment, useEffect , useState } from 'react'; +import { Button, Divider, Input , Pagination, Spin, Tag } from 'antd'; import SourceIcon from '../img/sourceIcon.png'; import { Link } from 'react-router-dom'; import axios from 'axios'; @@ -26,6 +26,21 @@ function Source(props){ const [ isSpin , setIsSpin ] = useState(true); const limit = 21; const { id , temp, history, role, sectionResourceTitle } = props; + const isNSCC = deptId === "NSCC"; + + const sourceIconByName = { + "构建工具": "icon1", + "基础组件": "icon2", + "基因表达": "icon3", + "人工智能": "icon4", + "常用工具": "icon5", + "函数库": "icon6", + "地质": "icon7", + "Python包": "icon8", + "自研": "icon9", + "核物理": "icon10", + "全部": "icon11" +} useEffect(()=>{ let uuid = getUniqueIdentifier() @@ -91,20 +106,28 @@ function Source(props){ } return( -
+
-

{sectionResourceTitle}

-
- {sectionResourceTitle}{isNSCC && · 应用集市}

+
+ {isNSCC ?
+ 猜你想问 + + + + + + }/> +
: 搜索 :undefined} - /> - {role && role.role !== "None" &&
+ />} + {role && role.role !== "None" &&
{role.role === "Member" && } @@ -119,13 +142,20 @@ function Source(props){ { zoneList && zoneList.length>0 &&
    -

    资源领域

    +

    {isNSCC ? "软件领域" : "资源领域"}

    -
  • {setChooseZoneId(undefined);window.scrollTo(0,450)}} className={!chooseZoneId ?"active":""}>全部
  • +
  • {setChooseZoneId(undefined);window.scrollTo(0,450)}} className={!chooseZoneId ?"active":""}> + {isNSCC && } + 全部 +
  • { zoneList.map((i,k)=>{ + const icon = `${sourceIconByName[i.name] || "icon12"}${i.id === chooseZoneId ? '_active.png' : '.png'}` return( -
  • {setChooseZoneId(i.id);window.scrollTo(0,450)}} className={`${chooseZoneId && chooseZoneId === i.id ? "active":""} task-hide`}>{i.name}
  • +
  • {setChooseZoneId(i.id);window.scrollTo(0,450)}} className={`${chooseZoneId && chooseZoneId === i.id ? "active":""} task-hide`}> + {isNSCC && } + {i.name} +
  • ) }) } @@ -133,8 +163,19 @@ function Source(props){
} { - typeList && typeList.length>0 && -
    + typeList && typeList.length>0 && (isNSCC ?
    +

    软件分类

    +
    + {setChooseTypeId(undefined);window.scrollTo(0,450)}} className={!chooseTypeId ?"active":""}>全部 + { + typeList.map((i,k)=>{ + return( + {setChooseTypeId(i.id);window.scrollTo(0,450)}} className={`${chooseTypeId && chooseTypeId === i.id ? "active":""} task-hide`}>{i.name} + ) + }) + } +
    +
    :

      资源类别

    • {setChooseTypeId(undefined);window.scrollTo(0,450)}} className={!chooseTypeId ?"active":""}>全部
    • @@ -146,7 +187,7 @@ function Source(props){ }) }
      -
    +
) }
:"" diff --git a/src/forge/Information/img/new.png b/src/forge/Information/img/new.png new file mode 100644 index 000000000..671b1b19f Binary files /dev/null and b/src/forge/Information/img/new.png differ diff --git a/src/forge/Information/img/search.png b/src/forge/Information/img/search.png new file mode 100644 index 000000000..0bbac58a0 Binary files /dev/null and b/src/forge/Information/img/search.png differ diff --git a/src/forge/Information/img/search1.png b/src/forge/Information/img/search1.png new file mode 100644 index 000000000..941a2b586 Binary files /dev/null and b/src/forge/Information/img/search1.png differ diff --git a/src/forge/Information/img/source-bg.png b/src/forge/Information/img/source-bg.png new file mode 100644 index 000000000..9da7fb985 Binary files /dev/null and b/src/forge/Information/img/source-bg.png differ diff --git a/src/forge/Information/img/source/icon1.png b/src/forge/Information/img/source/icon1.png new file mode 100644 index 000000000..017b4addc Binary files /dev/null and b/src/forge/Information/img/source/icon1.png differ diff --git a/src/forge/Information/img/source/icon10.png b/src/forge/Information/img/source/icon10.png new file mode 100644 index 000000000..d4b2e671b Binary files /dev/null and b/src/forge/Information/img/source/icon10.png differ diff --git a/src/forge/Information/img/source/icon10_active.png b/src/forge/Information/img/source/icon10_active.png new file mode 100644 index 000000000..e0ec077fc Binary files /dev/null and b/src/forge/Information/img/source/icon10_active.png differ diff --git a/src/forge/Information/img/source/icon11.png b/src/forge/Information/img/source/icon11.png new file mode 100644 index 000000000..b16b20ded Binary files /dev/null and b/src/forge/Information/img/source/icon11.png differ diff --git a/src/forge/Information/img/source/icon11_active.png b/src/forge/Information/img/source/icon11_active.png new file mode 100644 index 000000000..0284ec34f Binary files /dev/null and b/src/forge/Information/img/source/icon11_active.png differ diff --git a/src/forge/Information/img/source/icon12.png b/src/forge/Information/img/source/icon12.png new file mode 100644 index 000000000..47b420033 Binary files /dev/null and b/src/forge/Information/img/source/icon12.png differ diff --git a/src/forge/Information/img/source/icon12_active.png b/src/forge/Information/img/source/icon12_active.png new file mode 100644 index 000000000..2acd25eb7 Binary files /dev/null and b/src/forge/Information/img/source/icon12_active.png differ diff --git a/src/forge/Information/img/source/icon1_active.png b/src/forge/Information/img/source/icon1_active.png new file mode 100644 index 000000000..954e6e77f Binary files /dev/null and b/src/forge/Information/img/source/icon1_active.png differ diff --git a/src/forge/Information/img/source/icon2.png b/src/forge/Information/img/source/icon2.png new file mode 100644 index 000000000..080f4d259 Binary files /dev/null and b/src/forge/Information/img/source/icon2.png differ diff --git a/src/forge/Information/img/source/icon2_active.png b/src/forge/Information/img/source/icon2_active.png new file mode 100644 index 000000000..ac6a9de83 Binary files /dev/null and b/src/forge/Information/img/source/icon2_active.png differ diff --git a/src/forge/Information/img/source/icon3.png b/src/forge/Information/img/source/icon3.png new file mode 100644 index 000000000..24ace816d Binary files /dev/null and b/src/forge/Information/img/source/icon3.png differ diff --git a/src/forge/Information/img/source/icon3_active.png b/src/forge/Information/img/source/icon3_active.png new file mode 100644 index 000000000..46ff9767a Binary files /dev/null and b/src/forge/Information/img/source/icon3_active.png differ diff --git a/src/forge/Information/img/source/icon4.png b/src/forge/Information/img/source/icon4.png new file mode 100644 index 000000000..4c1609450 Binary files /dev/null and b/src/forge/Information/img/source/icon4.png differ diff --git a/src/forge/Information/img/source/icon4_active.png b/src/forge/Information/img/source/icon4_active.png new file mode 100644 index 000000000..cc8f8cf68 Binary files /dev/null and b/src/forge/Information/img/source/icon4_active.png differ diff --git a/src/forge/Information/img/source/icon5.png b/src/forge/Information/img/source/icon5.png new file mode 100644 index 000000000..ce68afe98 Binary files /dev/null and b/src/forge/Information/img/source/icon5.png differ diff --git a/src/forge/Information/img/source/icon5_active.png b/src/forge/Information/img/source/icon5_active.png new file mode 100644 index 000000000..ec5eb6152 Binary files /dev/null and b/src/forge/Information/img/source/icon5_active.png differ diff --git a/src/forge/Information/img/source/icon6.png b/src/forge/Information/img/source/icon6.png new file mode 100644 index 000000000..62e3b6821 Binary files /dev/null and b/src/forge/Information/img/source/icon6.png differ diff --git a/src/forge/Information/img/source/icon6_active.png b/src/forge/Information/img/source/icon6_active.png new file mode 100644 index 000000000..5163ba617 Binary files /dev/null and b/src/forge/Information/img/source/icon6_active.png differ diff --git a/src/forge/Information/img/source/icon7.png b/src/forge/Information/img/source/icon7.png new file mode 100644 index 000000000..6ad5abc62 Binary files /dev/null and b/src/forge/Information/img/source/icon7.png differ diff --git a/src/forge/Information/img/source/icon7_active.png b/src/forge/Information/img/source/icon7_active.png new file mode 100644 index 000000000..af814f6e9 Binary files /dev/null and b/src/forge/Information/img/source/icon7_active.png differ diff --git a/src/forge/Information/img/source/icon8.png b/src/forge/Information/img/source/icon8.png new file mode 100644 index 000000000..960cbb1cd Binary files /dev/null and b/src/forge/Information/img/source/icon8.png differ diff --git a/src/forge/Information/img/source/icon8_active.png b/src/forge/Information/img/source/icon8_active.png new file mode 100644 index 000000000..c6f373309 Binary files /dev/null and b/src/forge/Information/img/source/icon8_active.png differ diff --git a/src/forge/Information/img/source/icon9.png b/src/forge/Information/img/source/icon9.png new file mode 100644 index 000000000..81a47e13a Binary files /dev/null and b/src/forge/Information/img/source/icon9.png differ diff --git a/src/forge/Information/img/source/icon9_active.png b/src/forge/Information/img/source/icon9_active.png new file mode 100644 index 000000000..2f856326b Binary files /dev/null and b/src/forge/Information/img/source/icon9_active.png differ diff --git a/src/forge/Information/img/sourceCardBack1.png b/src/forge/Information/img/sourceCardBack1.png new file mode 100644 index 000000000..a34a2e49d Binary files /dev/null and b/src/forge/Information/img/sourceCardBack1.png differ diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 299af147b..832aa57b0 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -206,6 +206,27 @@ } } } + &.bannerByNSCC{ + .main_t_nscc{ + line-height: normal; + width: max-content; + color: rgba(255, 255, 255, 0.9); + border-bottom: 1px solid transparent; + border-image: linear-gradient(135deg,#72f4fc 0%,#4ac0f3 39.2%,#468bff 100%) 1; + margin-bottom: -20px !important; + } + .title_n_1{ + font-size: 45px; + background: linear-gradient(135deg,#72f4fc 0%,#beeaff 44.18%,#468bff 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + font-family: "ziyouwenyihei"; + } + .sub_t{ + font-size:15px; + color:#ffffff; + } + } } .main_content{ padding: 40px 0px 80px; @@ -1667,11 +1688,9 @@ .titleButBox{ width: 1200px; margin: 0 auto; - position: relative; + display: flex; + align-items: center; .createButs{ - position: absolute; - right: 0; - top: 0; button{ border-color: var(--primary-color); color: var(--primary-color); @@ -1961,3 +1980,107 @@ } } } +.NSCC_source_box{ + background-image: url('./img/source-bg.png'); + background-size: 100% 100%; + .source_h{ + background: none; + } + &.zone_source_box .sources{ + background: none; + border: none; + } + &.zone_source_box .sources .source_left_ul{ + border-right: 1px solid rgba(76, 88, 118, 0.1); + } + &.zone_source_box .sources .source_left_ul li.active{ + border-radius:10px; + background:linear-gradient(89.98deg,#ffffff 0%,rgba(255, 255, 255, 0.09) 100%); + border: none; + } + &.zone_source_box .sources .source_left_ul p, &.zone_source_box .sources .source_left_ul li{ + padding-left: 26px; + height:48px; + line-height: 48px; + } + &.zone_source_box .sources .source_left_ul li{ + border-right: none; + } + &.zone_source_box .sources .source_left_ul p{ + margin-bottom: 10px !important; + &.borderRight{ + margin-top: 10px !important; + border-right: none; + } + } + &.zone_source_box .sources .source_lists .source_lists_card{ + background-image: url('./img/sourceCardBack1.png'); + background-color: transparent; + } + .source_l_wrap{ + display: flex; + flex-wrap: wrap; + padding-left: 26px; + span{ + display: inline-block; + height: 32px; + line-height: 30px; + padding: 0 10px; + background: #edf1fa; + border-radius: 6px 6px 6px 6px; + margin-right: 10px; + margin-bottom: 10px !important; + border: 1px solid transparent; + font-size: 15px; + color: #4938b9; + cursor: pointer; + &.active{ + background: rgba(73, 56, 185, 0.1); + border: 1px solid #5141bc; + } + } + } +} +.searchByNSCC{ + flex: 1; + border: 1px solid transparent; + border-radius: 12px; + background-clip: padding-box, border-box; + background-origin: padding-box, border-box; + background-image: linear-gradient(to right, white, white),linear-gradient(90deg, #466aff 0%, #8d46ff 100%); + padding: 7px 10px 7px 30px; + display: flex; + align-items: center; + .ant-input-search{ + flex: 1; + } + .ant-input{ + border: none !important; + } + .anticon-search{ + display: none; + } + img{ + width:28px; + } + .hover-icon{ + display: none; + } + &:hover{ + border-color: #4C5876; + .normal-icon{ + display: none; + } + .hover-icon{ + display: inline-block; + } + } +} + +.color-grey-70{ + color: #707992; +} + +.color-grey-aaa{ + color: #aaafbe; +} \ No newline at end of file