diff --git a/src/factory/components/Feature/index.jsx b/src/factory/components/Feature/index.jsx index 2fcc77d4..c236472a 100644 --- a/src/factory/components/Feature/index.jsx +++ b/src/factory/components/Feature/index.jsx @@ -52,7 +52,9 @@ function Feature(props) {

数字化纳管，掌控研发全链路

研发活动及制品全流程数字化纳管，支持精准决策和持续优化

- +
+ +
diff --git a/src/factory/components/Feature/index.scss b/src/factory/components/Feature/index.scss index 9f292513..abb1ff46 100644 --- a/src/factory/components/Feature/index.scss +++ b/src/factory/components/Feature/index.scss @@ -14,6 +14,7 @@ background-size: 100% 100%; background-position: center -0px; } + h1 { color: #ffffff !important; } @@ -57,6 +58,7 @@ .content-top-left, .content-top-right { flex-direction: column; + h3 { margin-top: 58px; @@ -106,16 +108,25 @@ background-image: url('../../../images/factory/feature-right-bg.webp'); img { - width: 723px; - height: 280px; - margin-top: 40px; + width: 735px; } - &-gif { - width: 80px !important; - height: 60px !important; + + div { position: absolute; - left: 151px; - top: 249px + left: 170px; + top: 273px; + border-radius: 50%; + width: 60px; + height: 60px; + overflow: hidden; + .content-top-right-gif { + position: absolute; + width: 80px !important; + margin: 0; + left: -10px; + + } + } } } @@ -141,13 +152,14 @@ width: 1016px; height: 315px; } + &-gif { - width: 93px !important; - height: 70px !important; - position: absolute; - left: 608px; - top: 125px - } + width: 93px !important; + height: 70px !important; + position: absolute; + left: 608px; + top: 125px + } } } } \ No newline at end of file diff --git a/src/factory/components/News/index.jsx b/src/factory/components/News/index.jsx index fc499dda..5c691a33 100644 --- a/src/factory/components/News/index.jsx +++ b/src/factory/components/News/index.jsx @@ -2,15 +2,10 @@ import React, { useEffect, useState, useRef } from 'react'; import './index.scss'; import { Anchor, Carousel } from 'antd'; import { gethomePageDocList, getSubDocList } from '../../api' -import back1 from '../../../images/factory/back1.png' -import back2 from '../../../images/factory/back2.png' -import back3 from '../../../images/factory/back3.png' import { Link } from 'react-router-dom'; import KFIcon from '../../../components/KFIcon'; import { factoryZoneId, dirId } from '../../../constants/factory' - - -const backList = [back1, back2, back3] +import { getDefaultImage } from '../../../forge/Utils/utils' function News(props) { @@ -81,7 +76,7 @@ function News(props) { {mainList.map(item => { return
- +
@@ -95,7 +90,7 @@ function News(props) {

热门新闻

- +
{news.name}
diff --git a/src/factory/components/Resource/index.jsx b/src/factory/components/Resource/index.jsx index b7f480ec..118d5518 100644 --- a/src/factory/components/Resource/index.jsx +++ b/src/factory/components/Resource/index.jsx @@ -175,8 +175,8 @@ const Resource = forwardRef(({ zoneId }, ref) => { }
{projectProperties.description}
- {projectProperties.praisesCount} - {projectProperties.forkedCount} + {projectProperties.forkedCount} + {projectProperties.praisesCount}
}) diff --git a/src/factory/lessons/index.jsx b/src/factory/lessons/index.jsx index 99909d5f..3feaeeb7 100644 --- a/src/factory/lessons/index.jsx +++ b/src/factory/lessons/index.jsx @@ -16,6 +16,7 @@ import moment from 'moment'; import { getSourceList, httpUrl } from '../api' import { downloadFunc } from '../../forge/Utils/utils' import chapterBg from '../../images/factory/lessons/chapter-bg.webp' +import { message } from 'antd'; const backList = [back1, back2, back3] @@ -99,9 +100,9 @@ function Index(props) {

学习专区，多样资源服务工厂应用

从核心课程到规范标准，构建持续进化的工程能力体系。

-
+ {/*
-
+
*/}
@@ -241,7 +242,8 @@ function Index(props) { return

{item.name}

- + {/* */} +

{item.summary}

diff --git a/src/factory/lessons/index.scss b/src/factory/lessons/index.scss index 32881f64..2d01e4da 100644 --- a/src/factory/lessons/index.scss +++ b/src/factory/lessons/index.scss @@ -41,7 +41,7 @@ flex-direction: column; align-items: center; height: 400px; - background-image: url('../../images/factory/lessons/header-bg.webp'); + background-image: url('../../images/factory/lessons/header-bg.png'); background-repeat: no-repeat; background-size: 100% 100%; position: relative; diff --git a/src/factory/news/detail/index.jsx b/src/factory/news/detail/index.jsx index 6c55971a..70efef52 100644 --- a/src/factory/news/detail/index.jsx +++ b/src/factory/news/detail/index.jsx @@ -7,6 +7,7 @@ import RenderHtml from '../../../components/render-html'; import { Breadcrumb } from 'antd'; import { getNewsDetail } from '../../api'; import headerMp4 from '../../../images/factory/news/detail-head-bg.mp4'; +import { getDefaultImage } from '../../../forge/Utils/utils' @@ -40,7 +41,7 @@ function Index(props) {

实时汇聚前沿技术、项目进展与开发者故事，助你第一时间掌握社区脉搏，不错过每一次灵感与成长机会。

- +
diff --git a/src/factory/news/index.jsx b/src/factory/news/index.jsx index 6e117418..f02ae8f9 100644 --- a/src/factory/news/index.jsx +++ b/src/factory/news/index.jsx @@ -5,18 +5,13 @@ import KFIcon from '../../components/KFIcon/index'; import { factoryZoneId, dirId } from '../../constants/factory' import { gethomePageDocList, getNewsHotList, getSubDocList } from '../api' import { Carousel } from 'antd'; -import back1 from '../../images/factory/back1.png' -import back2 from '../../images/factory/back2.png' -import back3 from '../../images/factory/back3.png' import headerBottom from '../../images/factory/news/header-bottom.png' import bodyBg from '../../images/factory/news/news-bg.webp' import '../common.scss' import { Link } from "react-router-dom"; import moment from "moment"; import InfiniteScroll from 'react-infinite-scroller'; - -const backList = [back1, back2, back3] - +import { getDefaultImage } from '../../forge/Utils/utils' function Index(props) { const [topList, setTopList] = useState([]) @@ -166,7 +161,7 @@ function Index(props) {
- +
@@ -228,7 +223,7 @@ function Index(props) { newsList3.map((item, index) => { return
- +

{item.name}

diff --git a/src/factory/resource/components/Search/index.jsx b/src/factory/resource/components/Search/index.jsx index 6708f62a..12f7666a 100644 --- a/src/factory/resource/components/Search/index.jsx +++ b/src/factory/resource/components/Search/index.jsx @@ -165,7 +165,7 @@ function Index({searchValue, searchType},ref) {
{item.name}

{item.summary}

- {item.createTime} + {item.createTime}
}) diff --git a/src/factory/resource/developmentTools/detail/index.jsx b/src/factory/resource/developmentTools/detail/index.jsx index fbf69d3b..e862e62b 100644 --- a/src/factory/resource/developmentTools/detail/index.jsx +++ b/src/factory/resource/developmentTools/detail/index.jsx @@ -40,8 +40,15 @@ function Index(props) { const getDetail = () => { getSourceDetail(id).then(response => { if (response) { + let extendData = {} + if (response.data.data.extendData) { + extendData = JSON.parse(response.data.data.extendData) + } document.title = response.data.data.name - setDetail(response.data.data); + if (extendData.content) { + setContent(Base64.decode(extendData.content)) + } + setDetail({...response.data.data, ...extendData}); } }).catch(error => { }) } @@ -59,7 +66,7 @@ function Index(props) { 首页 开发工具 - {detail.name} + {detail.name}

{detail.name}

@@ -93,15 +100,14 @@ function Index(props) {
- - + + {!detail.headImg && }
-

{detail.name}

{ content && } diff --git a/src/factory/resource/developmentTools/detail/index.scss b/src/factory/resource/developmentTools/detail/index.scss index c1bfd8fa..7ccba662 100644 --- a/src/factory/resource/developmentTools/detail/index.scss +++ b/src/factory/resource/developmentTools/detail/index.scss @@ -23,6 +23,16 @@ span { color: #091221; + + .breacrumb-name { + max-width: 200px; + display: inline-block; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + vertical-align: middle; + } + } } @@ -211,6 +221,8 @@ height: 100%; margin: 52px auto; margin-top: -100px; + position: relative; + z-index: 1; .ant-breadcrumb { line-height: 20px; diff --git a/src/factory/resource/softwareProject/index.jsx b/src/factory/resource/softwareProject/index.jsx index e9bf543d..c7f05784 100644 --- a/src/factory/resource/softwareProject/index.jsx +++ b/src/factory/resource/softwareProject/index.jsx @@ -92,8 +92,8 @@ function Index(props) { }
- {project.praisesCount} - {project.forkedCount} + {project.forkedCount} + {project.praisesCount}
@@ -134,8 +134,8 @@ function Index(props) { {project.description}
- {project.praisesCount} - {project.forkedCount} + {project.forkedCount} + {project.praisesCount}
}) @@ -184,8 +184,8 @@ function Index(props) {
- {project.praisesCount} - {project.forkedCount} + {project.forkedCount} + {project.praisesCount}
diff --git a/src/forge/Utils/utils.js b/src/forge/Utils/utils.js index 0a559958..df37b84c 100644 --- a/src/forge/Utils/utils.js +++ b/src/forge/Utils/utils.js @@ -1,3 +1,12 @@ +import default1 from '../../images/factory/default/1.png' +import default2 from '../../images/factory/default/2.png' +import default3 from '../../images/factory/default/3.png' +import default4 from '../../images/factory/default/4.png' +import default5 from '../../images/factory/default/5.png' +import default6 from '../../images/factory/default/6.png' +import default7 from '../../images/factory/default/7.png' +import default8 from '../../images/factory/default/8.png' + export function formatNumber(num) { if (num === undefined || num === null) return if (num >= 1e9) { @@ -37,3 +46,8 @@ export const downloadFunc = (url, name) => { document.body.removeChild(link) }, 50) } + +export const getDefaultImage = (id) => { + const defaultList = [default1, default2, default3, default4, default5, default6, default7, default8] + return defaultList[ id % 8 ] +} diff --git a/src/images/factory/default/1.png b/src/images/factory/default/1.png new file mode 100644 index 00000000..e4a1b8af Binary files /dev/null and b/src/images/factory/default/1.png differ diff --git a/src/images/factory/default/2.png b/src/images/factory/default/2.png new file mode 100644 index 00000000..7f5609bf Binary files /dev/null and b/src/images/factory/default/2.png differ diff --git a/src/images/factory/default/3.png b/src/images/factory/default/3.png new file mode 100644 index 00000000..a7f3c748 Binary files /dev/null and b/src/images/factory/default/3.png differ diff --git a/src/images/factory/default/4.png b/src/images/factory/default/4.png new file mode 100644 index 00000000..0a63ba60 Binary files /dev/null and b/src/images/factory/default/4.png differ diff --git a/src/images/factory/default/5.png b/src/images/factory/default/5.png new file mode 100644 index 00000000..9a17f330 Binary files /dev/null and b/src/images/factory/default/5.png differ diff --git a/src/images/factory/default/6.png b/src/images/factory/default/6.png new file mode 100644 index 00000000..77fe1269 Binary files /dev/null and b/src/images/factory/default/6.png differ diff --git a/src/images/factory/default/7.png b/src/images/factory/default/7.png new file mode 100644 index 00000000..e5640331 Binary files /dev/null and b/src/images/factory/default/7.png differ diff --git a/src/images/factory/default/8.png b/src/images/factory/default/8.png new file mode 100644 index 00000000..a7eb121f Binary files /dev/null and b/src/images/factory/default/8.png differ diff --git a/src/images/factory/feature-gif-2.gif b/src/images/factory/feature-gif-2.gif index 6aec4ac0..cb6b0ca2 100644 Binary files a/src/images/factory/feature-gif-2.gif and b/src/images/factory/feature-gif-2.gif differ diff --git a/src/images/factory/feature-right-1.png b/src/images/factory/feature-right-1.png index 79a8734f..a36137e4 100644 Binary files a/src/images/factory/feature-right-1.png and b/src/images/factory/feature-right-1.png differ diff --git a/src/images/factory/lessons/header-bg.png b/src/images/factory/lessons/header-bg.png index 41a1b0e9..7fb352a0 100644 Binary files a/src/images/factory/lessons/header-bg.png and b/src/images/factory/lessons/header-bg.png differ diff --git a/src/images/iconfont/iconfont.css b/src/images/iconfont/iconfont.css index a92a828f..26752496 100644 --- a/src/images/iconfont/iconfont.css +++ b/src/images/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 5081288 */ - src: url('iconfont.woff2?t=1765507764789') format('woff2'), - url('iconfont.woff?t=1765507764789') format('woff'), - url('iconfont.ttf?t=1765507764789') format('truetype'); + src: url('iconfont.woff2?t=1766461445149') format('woff2'), + url('iconfont.woff?t=1766461445149') format('woff'), + url('iconfont.ttf?t=1766461445149') format('truetype'); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.icon-dianzan:before { + content: "\e796"; +} + +.icon-shijian:before { + content: "\e797"; +} + +.icon-guanzhu:before { + content: "\e798"; +} + .icon-xiazai:before { content: "\e794"; } @@ -41,10 +53,6 @@ content: "\e7a1"; } -.icon-shoucang:before { - content: "\e7a0"; -} - .icon-liulanliang:before { content: "\e79e"; } diff --git a/src/images/iconfont/iconfont.js b/src/images/iconfont/iconfont.js index b2c7d3a7..5bde3fdd 100644 --- a/src/images/iconfont/iconfont.js +++ b/src/images/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_5081288='',(l=>{var a=(t=(t=document.getElementsByTagName("script"))[t.length-1]).getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,e,o,h,n,d=function(a,t){t.parentNode.insertBefore(a,t)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}i=function(){var a,t=document.createElement("div");t.innerHTML=l._iconfont_svg_string_5081288,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(a=document.body).firstChild?d(t,a.firstChild):a.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(e=function(){document.removeEventListener("DOMContentLoaded",e,!1),i()},document.addEventListener("DOMContentLoaded",e,!1)):document.attachEvent&&(o=i,h=l.document,n=!1,s(),h.onreadystatechange=function(){"complete"==h.readyState&&(h.onreadystatechange=null,c())})}function c(){n||(n=!0,o())}function s(){try{h.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}c()}})(window); \ No newline at end of file +window._iconfont_svg_string_5081288='',(t=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var i,e,h,o,n,d=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}i=function(){var a,l=document.createElement("div");l.innerHTML=t._iconfont_svg_string_5081288,(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?d(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(e=function(){document.removeEventListener("DOMContentLoaded",e,!1),i()},document.addEventListener("DOMContentLoaded",e,!1)):document.attachEvent&&(h=i,o=t.document,n=!1,m(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,c())})}function c(){n||(n=!0,h())}function m(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}c()}})(window); \ No newline at end of file diff --git a/src/images/iconfont/iconfont.json b/src/images/iconfont/iconfont.json index f5ee9338..4f6601d1 100644 --- a/src/images/iconfont/iconfont.json +++ b/src/images/iconfont/iconfont.json @@ -5,6 +5,27 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "46425347", + "name": "点赞", + "font_class": "dianzan", + "unicode": "e796", + "unicode_decimal": 59286 + }, + { + "icon_id": "46425348", + "name": "时间", + "font_class": "shijian", + "unicode": "e797", + "unicode_decimal": 59287 + }, + { + "icon_id": "46425349", + "name": "关注", + "font_class": "guanzhu", + "unicode": "e798", + "unicode_decimal": 59288 + }, { "icon_id": "46331570", "name": "下载", @@ -54,13 +75,6 @@ "unicode": "e7a1", "unicode_decimal": 59297 }, - { - "icon_id": "46258084", - "name": "收藏", - "font_class": "shoucang", - "unicode": "e7a0", - "unicode_decimal": 59296 - }, { "icon_id": "46258085", "name": "浏览量", diff --git a/src/images/iconfont/iconfont.ttf b/src/images/iconfont/iconfont.ttf index 66168440..479a3fe5 100644 Binary files a/src/images/iconfont/iconfont.ttf and b/src/images/iconfont/iconfont.ttf differ diff --git a/src/images/iconfont/iconfont.woff b/src/images/iconfont/iconfont.woff index e15e785b..db5a2753 100644 Binary files a/src/images/iconfont/iconfont.woff and b/src/images/iconfont/iconfont.woff differ diff --git a/src/images/iconfont/iconfont.woff2 b/src/images/iconfont/iconfont.woff2 index 493da390..a46e2f10 100644 Binary files a/src/images/iconfont/iconfont.woff2 and b/src/images/iconfont/iconfont.woff2 differ