Merge branch 'master' of ssh://gitea.anxinyun.cn:2022/free-sun/fs-ops

# Conflicts:
#	code/web/client/assets/color.less

code/web/client/src/layout/components/header/index.js

@@ -8,7 +8,8 @@ import lightVars from '$themes/light.json';
 import exampleVars from '$themes/example.json'
 import styles from './style.css';
 import {
-    MenuFoldOutlined, MenuUnfoldOutlined, UserOutlined, LogoutOutlined, SmileOutlined,ApartmentOutlined
+    MenuFoldOutlined, MenuUnfoldOutlined, UserOutlined, LogoutOutlined, SmileOutlined, ApartmentOutlined,SketchOutlined,
+    SlackOutlined,
 } from '@ant-design/icons';
 
 const themeMap = {
@@ -76,11 +77,11 @@ const Header = props => {
                         <Menu.Item key="gatewayProfile" icon={<ApartmentOutlined />} >
                             <Link to="/gateway_profile">网关配置</Link>
                         </Menu.Item>
-                        <Menu.Item key="factorProfile" icon={<ApartmentOutlined />} >
+                        <Menu.Item key="factorProfile" icon={<SketchOutlined />} >
                             <Link to="/factor_profile">监测因素</Link>
                         </Menu.Item>
-                        <Menu.Item key="productProfile" icon={<ApartmentOutlined />} >
-                            <Link to="/product_profile">监测因素</Link>
+                        <Menu.Item key="productProfile" icon={<SlackOutlined />} >
+                            <Link to="/product_profile">设备原型</Link>
                         </Menu.Item>
                     </Menu.SubMenu>
                     <Menu.SubMenu key="theme" title={<div style={{ margin: '0 8px' }}>主题切换</div>}  >