Merge branch 'factory-hxy' of http://172.20.32.203:3000/durian/forgeplus-react into factory

src/factory/components/Resource2/index.jsx

@@ -6,7 +6,7 @@ import KFIcon from '../../../components/KFIcon';
 import back1 from '../../../images/factory/back1.png'
 import tagIcon from '../../../images/factory/lessons-tag-icon.webp'
 import '../../common.scss'
-import { getSourceList } from '../../api'
+import { getSourceList, httpUrl } from '../../api';
 import { factoryZoneId, manualId, standardId, lessonId  } from '../../../constants/factory'
 import { downloadFunc } from '../../../forge/Utils/utils'
 
@@ -108,7 +108,7 @@ const Resource2 = forwardRef(({ zoneId }, ref) => {
                   <div className="item-info">
                     <h4>{ item.name }</h4>
                     <p>{item.summary}</p>
-                    <button className="shiny-button" onClick={() => { window.open(item.extendDataUrl) }}>查看详情</button>
+                    <button className="shiny-button" onClick={() => { window.open(standard.extendDataUrl) }}>查看详情</button>
                   </div>
                 </div>
               })

src/factory/news/detail/index.jsx

@@ -1,14 +1,12 @@
 import React, { useEffect, useState, useRef } from 'react';
 import './index.scss';
 import { TPMIndexHOC } from '../../../modules/tpm/TPMIndexHOC';
-import imageBack1 from '../../../images/factory/news/news-default.webp'
-import { Link } from 'react-router-dom';
 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'
-
+import { Base64 } from 'js-base64';
 
 
 function Index(props) {

src/factory/news/index.jsx

@@ -120,7 +120,7 @@ function Index(props) {
                       {/* 左边：前一项的图片 */}
                       <div>
                         <img
-                          src={topList[prevIndex].headImg || backList[prevIndex % 3]}
+                          src={topList[prevIndex].headImg || getDefaultImage(topList[prevIndex].id)}
                           alt=""
                         />
                       </div>
@@ -128,7 +128,7 @@ function Index(props) {
                       {/* 中间：当前项的图片 */}
                       <div>
                         <img
-                          src={item.headImg || backList[index % 3]}
+                          src={item.headImg || getDefaultImage(item.id)}
                           alt=""
                         />
                       </div>
@@ -136,7 +136,7 @@ function Index(props) {
                       {/* 右边：后一项的图片 */}
                       <div>
                         <img
-                          src={topList[nextIndex].headImg || backList[nextIndex % 3]}
+                          src={topList[nextIndex].headImg || getDefaultImage([nextIndex].id)}
                           alt=""
                         />
                       </div>

src/factory/resource/developmentTools/detail/index.jsx

@@ -11,7 +11,7 @@ import { getSourceDetail, httpUrl, getSourceList } from '../../../api';
 import { downloadFunc } from '../../../../forge/Utils/utils'
 import { factoryZoneId, } from '../../../../constants/factory'
 import '../../../common.scss'
-
+import { Base64 } from 'js-base64';
 
 
 function Index(props) {

src/factory/resource/softwareProject/index.scss

@@ -294,21 +294,6 @@
             flex-direction: column;
             cursor: pointer;
 
-            &:nth-child(3),
-            &:nth-child(4) {
-              .item-tags {
-                border: none;
-                background: rgba(255, 255, 255, 0.84);
-
-                div {
-                  opacity: 0.13;
-                  width: 6px;
-                  height: 6px;
-                  background: #5d6a80;
-                }
-              }
-            }
-
             div:nth-child(1) {
               height: 100%;
               display: flex;
@@ -373,21 +358,6 @@
             // 最后两个元素添加margin-bottom: 28px;
             &:nth-last-child(-n+2) {
               margin-bottom: 0;
-
-              .item-tag {
-                background: rgba(255, 255, 255, 0.84);
-                color: #091221;
-              }
-
-              .item-desc {
-                color: #ffffff;
-              }
-
-              .item-data {
-                span {
-                  color: #ffffff
-                }
-              }
             }
 
             &:hover {

src/factory/scene/index.jsx

@@ -8,6 +8,7 @@ import RenderHtml from '../../components/render-html';
 import { Breadcrumb } from 'antd';
 import { getSourceDetail, getSourceList } from '../api'
 import { factoryZoneId, sceneId } from '../../constants/factory'
+import { Base64 } from 'js-base64';
 
 function Index(props) {
   const id = props.match.params.sceneId