Commit dca83651 authored by 沈翠玲's avatar 沈翠玲

修改bug

parent f9f4ce1c
...@@ -52,7 +52,9 @@ export default { ...@@ -52,7 +52,9 @@ export default {
'处理中':'ในการประมวลผล', '处理中':'ในการประมวลผล',
'原因': 'เหตุผล', '原因': 'เหตุผล',
'状态': 'สถานะ', '状态': 'สถานะ',
'产线选择': 'การเลือกสายการผลิต' '产线选择': 'การเลือกสายการผลิต',
'日产出': 'นิสสัน',
'产出率': 'ผลผลิต'
} }
; ;
\ No newline at end of file
...@@ -52,6 +52,8 @@ export default { ...@@ -52,6 +52,8 @@ export default {
'处理中':'处理中', '处理中':'处理中',
'原因': '原因', '原因': '原因',
'状态': '状态', '状态': '状态',
'产线选择': '产线选择' '产线选择': '产线选择',
'日产出': '日产出',
'产出率': '产出率'
}; };
\ No newline at end of file
...@@ -2,6 +2,7 @@ import ProTable, { ActionType } from '@ant-design/pro-table'; ...@@ -2,6 +2,7 @@ import ProTable, { ActionType } from '@ant-design/pro-table';
import { queryEquipmentDetail } from '@/pages/kanban/productionComprehens/services/api'; import { queryEquipmentDetail } from '@/pages/kanban/productionComprehens/services/api';
import React, { useEffect, useRef } from 'react'; import React, { useEffect, useRef } from 'react';
import { Progress } from 'antd'; import { Progress } from 'antd';
import { useIntl } from 'umi';
type ErrorDetailSetting = KANBAN.ProductionComprehens.ErrorDetailSetting; type ErrorDetailSetting = KANBAN.ProductionComprehens.ErrorDetailSetting;
import styles from '../../index.less'; import styles from '../../index.less';
export type InfoProps = { export type InfoProps = {
...@@ -10,6 +11,7 @@ export type InfoProps = { ...@@ -10,6 +11,7 @@ export type InfoProps = {
}; };
const DeviceItem: React.FC<InfoProps> = (props) => { const DeviceItem: React.FC<InfoProps> = (props) => {
const intl = useIntl();
useEffect(() => { useEffect(() => {
console.log('props', props.data) console.log('props', props.data)
}, [props.data]); }, [props.data]);
...@@ -29,8 +31,8 @@ const DeviceItem: React.FC<InfoProps> = (props) => { ...@@ -29,8 +31,8 @@ const DeviceItem: React.FC<InfoProps> = (props) => {
<div className={styles.round} style={{'background': (Number(props.data.state) === 0 ? '#1be223' : Number(props.data.state) === 1 ? '#8497b5' : '#e50105')}}></div> <div className={styles.round} style={{'background': (Number(props.data.state) === 0 ? '#1be223' : Number(props.data.state) === 1 ? '#8497b5' : '#e50105')}}></div>
</div> </div>
<div className={styles.deviceBottom}> <div className={styles.deviceBottom}>
<div><span>日产出: </span><span className={styles.statusNum}>{props.data.output}</span></div> <div><span>{intl.formatMessage({ id: '日产出'})}: </span><span className={styles.statusNum}>{props.data.output}</span></div>
<div><span>产出率: </span> <div><span>{intl.formatMessage({ id: '利用率'})}: </span>
<div> <div>
<Progress percent={props.data.outputRatio} strokeColor={props.data.outputRatio < 50?'#ff561b':props.data.outputRatio<80?'#fef000':'#2f9a91'} className={styles.process} strokeWidth={15} /></div> <Progress percent={props.data.outputRatio} strokeColor={props.data.outputRatio < 50?'#ff561b':props.data.outputRatio<80?'#fef000':'#2f9a91'} className={styles.process} strokeWidth={15} /></div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment