修改图标和名称，重新对接口

config/defaultSettings.ts

@@ -12,9 +12,9 @@ const Settings: LayoutSettings & {
   fixedHeader: false,
   fixSiderbar: true,
   colorWeak: false,
-  title: 'ENRIC看板',
+  title: '希迈看板',
   pwa: false,
-  logo: '/logo.svg',
+  logo: '/logo.png',
   iconfontUrl: '',
 };
 

public/logo.svg

-<svg width="186" height="62" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="64" width="188" y="-1" x="-1"/>
- </g>
-
- <g>
-  <title>Layer 1</title>
-  <text stroke="#0b50a3" transform="matrix(0.9715561685304763,0,0,0.9638915261959784,-0.07736367227020224,0.2781163429653493) " fill="#35b0f8" stroke-width="0" x="0" y="32.92508" id="svg_1" font-size="40" font-family="Helvetica, Arial, sans-serif" text-anchor="start" xml:space="preserve" font-weight="bold">Enric</text>
-  <text stroke="#0b50a3" transform="matrix(0.9996767393159373,0,0,0.9307807378009278,-4.951984760691261,-1.8258802291084146) " fill="#f8505e" stroke-width="0" x="111" y="32" id="svg_2" font-size="24" font-family="Helvetica, Arial, sans-serif" text-anchor="start" xml:space="preserve" font-weight="bold">安瑞科</text>
-  <rect stroke="#0b50a3" id="svg_3" height="21" width="180" ry="3" rx="3" y="38" x="3" stroke-width="1.5" fill="#0e6af3"/>
-  <text stroke="#000" transform="matrix(1.1377474843238815,0,0,1.26778244972229,-24.37044560960436,-15.09205150231719) " fill="#ffffff" stroke-width="0" stroke-opacity="null" fill-opacity="null" x="115.37893" y="54.25" id="svg_5" font-size="10" font-family="Helvetica, Arial, sans-serif" text-anchor="start" xml:space="preserve">CIMC ENRIC</text>
- </g>
-</svg>
\ No newline at end of file

src/locales/zh-TW/pages.ts

 export default {
-  'pages.layouts.userLayout.main': 'ENRIC看板',
+  'pages.layouts.userLayout.main': '希迈看板',
   'pages.layouts.userLayout.title': '讓艾特成為受人尊敬的航空發動機零部件生產企業',
 
-  'pages.welcome.speech': '歡迎登陸ENRIC看板',
+  'pages.welcome.speech': '歡迎登陸希迈看板',
 
   'pages.login.success': '登錄成功！',
   'pages.login.failure': '登錄失敗，請重試！',

src/pages/Welcome.tsx

@@ -11,7 +11,7 @@ const Welcome: React.FC = () => {
         <Alert
           message={intl.formatMessage({
             id: 'pages.welcome.speech',
-            defaultMessage: '欢迎登陆ENRIC看板系统',
+            defaultMessage: '欢迎登陆希迈看板系统',
           })}
           type="success"
           showIcon

src/pages/document.ejs

@@ -22,7 +22,7 @@
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     />
-    <title>ENRIC看板</title>
+    <title>希迈看板</title>
     <link rel="icon" href="<%= context.config.publicPath +'favicon.ico'%>" type="image/x-icon" />
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
@@ -216,7 +216,7 @@
           min-height: 420px;
         "
       >
-        <img src="<%= context.config.publicPath +'pro_icon.svg'%>" alt="logo" width="256" />
+        <img src="<%= context.config.publicPath +'logo.png'%>" alt="logo" width="256" />
         <div class="page-loading-warp">
           <div class="ant-spin ant-spin-lg ant-spin-spinning">
             <span class="ant-spin-dot ant-spin-dot-spin"
@@ -227,11 +227,11 @@
         </div>
         <div style="display: flex; align-items: center; justify-content: center">
           <img
-            src="<%= context.config.publicPath +'favicon.svg'%>"
+            src="<%= context.config.publicPath +'logo.png'%>"
             width="32"
             style="margin-right: 8px"
           />
-          ENRIC看板
+          希迈看板
         </div>
       </div>
     </div>

src/pages/kanban/productionComprehens/index.tsx

@@ -126,9 +126,10 @@ const Main: React.FC = () => {
         dataRange: dataRange,
         planSource: planSource,
       };
-      const { data: { outputList, processMonthlyIndexDto, qualifiedRateList } } = await queryProductionComprehensProcessOutputData(body);
+      const { data: { outputList, processMonthlyIndexDto, qualifiedRateList, abnormalCauseData } } = await queryProductionComprehensProcessOutputData(body);
       setProcessYieldData(outputList);
       setProcessDefectRatioData(qualifiedRateList);
+      setCountWeldingPassRate(abnormalCauseData);
       //相关准时率留整数
       processMonthlyIndexDto.endOnTimeRatio = Math.round(processMonthlyIndexDto.endOnTimeRatio);
       processMonthlyIndexDto.monthPlanConcludeRatio = Math.round(processMonthlyIndexDto.monthPlanConcludeRatio);
@@ -162,7 +163,7 @@ const Main: React.FC = () => {
       setAbnormalOverdueSetting(tt);
 
       // 当月异常分布数据
-      const { data: {equipAbnormal, productAbnormal, equipErrorArr, equipCt, equipErrorCt, abnormalCauseData} } = await currentMonthStat({ settingId });
+      const { data: {equipAbnormal, productAbnormal, equipErrorArr, equipCt, equipErrorCt} } = await currentMonthStat({ settingId });
       setAbnormalDeviceData({
         equipCt,
         equipErrorCt,
@@ -170,7 +171,7 @@ const Main: React.FC = () => {
       });
       setAbnormalProdData(productAbnormal);
       setAbnormalQualityData(equipErrorArr);
-      setCountWeldingPassRate(abnormalCauseData);
+      
     };
 
 

src/pages/user/Login/index.tsx

@@ -83,9 +83,9 @@ const Login: React.FC = () => {
         <div className={styles.top}>
           <div className={styles.header}>
             <Link to="/">
-              <img alt="logo" className={styles.logo} src="/logo.svg" />
+              <img alt="logo" className={styles.logo} src="/logo.png" />
               <span className={styles.title}>
-                <FormattedMessage id="pages.layouts.userLayout.main" defaultMessage="ENRIC看板" />
+                <FormattedMessage id="pages.layouts.userLayout.main" defaultMessage="希迈看板" />
               </span>
             </Link>
           </div>