Commit ff0421f5 authored by chenshouchao's avatar chenshouchao

Merge branch 'feat-20220718' of http://120.77.149.83/root/bkunyun into feat-20220718

parents 9e0409f7 a49bd70c
...@@ -120,7 +120,7 @@ const FileItem = observer((props: IProps) => { ...@@ -120,7 +120,7 @@ const FileItem = observer((props: IProps) => {
width: 300, width: 300,
margin: "6px 0", margin: "6px 0",
}} }}
color="error" color="success"
value={itemInfo?.percentage} value={itemInfo?.percentage}
/> />
) : null} ) : null}
......
/* /*
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13 * @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-07-21 11:34:55 * @LastEditTime: 2022-07-29 11:28:09
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -94,6 +94,7 @@ const ChangePermission = observer((props: IProps) => { ...@@ -94,6 +94,7 @@ const ChangePermission = observer((props: IProps) => {
> >
<div style={{ marginTop: 12 }}> <div style={{ marginTop: 12 }}>
<MySelect <MySelect
fullWidth
title="项目权限" title="项目权限"
isTitle={true} isTitle={true}
value={selectValue} value={selectValue}
......
...@@ -395,7 +395,7 @@ const ProjectMembers = observer(() => { ...@@ -395,7 +395,7 @@ const ProjectMembers = observer(() => {
</Box> </Box>
<Box className={styles.tabBoxMiddle}> <Box className={styles.tabBoxMiddle}>
<img alt="" src={jobCost} /> <img alt="" src={jobCost} />
<div className={styles.tabBoxTime}>{item.jobCost}</div> <div className={styles.tabBoxTime}>{item.jobCost.toFixed(2)}</div>
</Box> </Box>
<Box className={styles.tabBoxJobStatus}> <Box className={styles.tabBoxJobStatus}>
<img alt="" src={renderStatusIcon(item.state)} /> <img alt="" src={renderStatusIcon(item.state)} />
......
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