Skip to content

B
bkunyun
Commit 16ec17aa authored by chenshouchao's avatar chenshouchao
Browse files
Options

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

parents afbdcf76 21e72c99
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 56 deletions
src/views/Project/ProjectOverview/TaskCard/index.module.css
View file @ 16ec17aa
......@@ -120,6 +120,7 @@
.result {
box-sizing: border-box;
font-size: 12px;
align-items: center;
color: #1e2633;
cursor: pointer;
height: 30px;
......@@ -152,6 +153,12 @@
}
.outputLeftImg {
vertical-align: middle;
vertical-align: top;
margin-right: 8px;
}
.outputTitle{
display: inline-block;
height: 22px;
line-height: 22px;
}
src/views/Project/ProjectOverview/TaskCard/index.tsx
View file @ 16ec17aa
......@@ -48,7 +48,7 @@ const TaskCard = (props: TaskCardProps) => {
}, [outputs])
// 结果文件跳转
const goToProjectData = (info: any) => {
let { path = '' , type = '' } = info
let { path = '', type = '' } = info
const lastIndex = path.lastIndexOf("/");
// /projectData
// dataType
......@@ -87,7 +87,7 @@ const TaskCard = (props: TaskCardProps) => {
const renderStatusText = (data: string) => {
switch (data) {
case "SUBMITTED":
return "正在启动";
return "正在启动";
case "RUNNING":
return '正在运行'
case "ABORTED":
......@@ -190,7 +190,8 @@ const TaskCard = (props: TaskCardProps) => {
}
alt=""
/>
{item?.name}</div>
<span className={style.outputTitle}>{item?.name}</span>
</div>
})}
</div>
}
......
src/views/Project/ProjectOverview/index.module.css
View file @ 16ec17aa
.topFixed {
position: sticky;
top: 0;
z-index: 10;
background-color: #fff;
}
.basicInformation {
display: flex;
justify-content: space-between;
margin: 24px 24px 0 24px;
padding-bottom: 20px;
margin: 0 24px;
padding: 20px 0;
border-bottom: 1px solid #EDEFF2;
}
......@@ -39,7 +46,7 @@
color: #565C66;
}
.otherInformationBoxRight{
.otherInformationBoxRight {
line-height: 22px;
margin-bottom: 4px;
color: #565C66;
......@@ -63,6 +70,7 @@
display: flex;
justify-content: space-between;
margin: 24px 24px 0 24px;
padding-bottom: 20px;
}
.searchLineLeft {
......@@ -85,7 +93,7 @@
.taskDisplay {
position: relative;
margin: 20px 24px;
margin: 0 24px 20px;
padding-bottom: 16px;
overflow: hidden;
background: #F7F8FA;
......
src/views/Project/ProjectOverview/index.tsx
View file @ 16ec17aa
......@@ -72,7 +72,7 @@ const ProjectOverview = observer(() => {
}
}
const handleKeyWordChangeBlur=(e:any)=>{
const handleKeyWordChangeBlur = (e: any) => {
setJobName(e.target.value);
}
......@@ -100,58 +100,60 @@ const ProjectOverview = observer(() => {
} else {
return (
<>
<div className={style.basicInformation}>
<div>
<div className={style.titleBox}>
<img src={projectImg} alt="项目logo" style={{ width: 30, height: 30 }} />
<span className={style.projectName}>
{currentProjectStore.currentProjectInfo.name}
</span>
</div>
<div className={style.otherInformation}>
<div className={style.otherInformationBox}><span>角色：</span><span className={style.informationcolor}>{overviewInfo.projectRoleExhibit}</span></div>
<div className={style.otherInformationBox}><span>计算区：</span><span className={style.informationcolor}>{overviewInfo.zoneIdExhibit}</span></div>
<div className={style.otherInformationBox}><span>创建日期：</span><span className={style.informationcolor}>{moment(overviewInfo.createdAt).format('yyyy-MM-DD')}</span></div>
</div>
</div>
<div className={style.basicInformationRight}>
<div>
<div className={style.otherInformationBoxRight}>项目总消费</div>
<div><span className={style.numberDisplay}>{overviewInfo.projectCost?.toFixed(2)}</span>元</div>
</div>
<div className={style.verticalLine}></div>
<div className={style.topFixed}>
<div className={style.basicInformation}>
<div>
<div className={style.otherInformationBoxRight}>项目剩余预算</div>
<div><span className={style.numberDisplay}>{overviewInfo.projectRemainingBudget?.toFixed(2)}</span>元</div>
<div className={style.titleBox}>
<img src={projectImg} alt="项目logo" style={{ width: 30, height: 30 }} />
<span className={style.projectName}>
{currentProjectStore.currentProjectInfo.name}
</span>
</div>
<div className={style.otherInformation}>
<div className={style.otherInformationBox}><span>角色：</span><span className={style.informationcolor}>{overviewInfo.projectRoleExhibit}</span></div>
<div className={style.otherInformationBox}><span>计算区：</span><span className={style.informationcolor}>{overviewInfo.zoneIdExhibit}</span></div>
<div className={style.otherInformationBox}><span>创建日期：</span><span className={style.informationcolor}>{moment(overviewInfo.createdAt).format('yyyy-MM-DD')}</span></div>
</div>
</div>
<div className={style.verticalLine}></div>
<div>
<div className={style.otherInformationBoxRight} style={{ marginRight: '20px' }}>项目存储大小</div>
<div className={style.basicInformationRight}>
<div>
<span className={style.numberDisplay}>{overviewInfo.projectStorage !== undefined ? storageUnitFromB(overviewInfo.projectStorage).data : ''}</span>
{overviewInfo.projectStorage !== undefined ? storageUnitFromB(overviewInfo.projectStorage).unit : ''}
<div className={style.otherInformationBoxRight}>项目总消费</div>
<div><span className={style.numberDisplay}>{overviewInfo.projectCost?.toFixed(2)}</span>元</div>
</div>
<div className={style.verticalLine}></div>
<div>
<div className={style.otherInformationBoxRight}>项目剩余预算</div>
<div><span className={style.numberDisplay}>{overviewInfo.projectRemainingBudget?.toFixed(2)}</span>元</div>
</div>
<div className={style.verticalLine}></div>
<div>
<div className={style.otherInformationBoxRight} style={{ marginRight: '20px' }}>项目存储大小</div>
<div>
<span className={style.numberDisplay}>{overviewInfo.projectStorage !== undefined ? storageUnitFromB(overviewInfo.projectStorage).data : ''}</span>
{overviewInfo.projectStorage !== undefined ? storageUnitFromB(overviewInfo.projectStorage).unit : ''}
</div>
</div>
</div>
</div>
</div>
<div className={style.searchBox}>
<div className={style.searchLineLeft}>
<div className={style.taskOverview}>任务概览</div>
<RadioGroupOfButtonStyle
value={day}
radioOptions={[
{ value: "7", label: "近7天" },
{ value: "15", label: "近15天" },
{ value: "30", label: "近30天" },
]}
handleRadio={setDay}
></RadioGroupOfButtonStyle>
<div className={style.searchBox}>
<div className={style.searchLineLeft}>
<div className={style.taskOverview}>任务概览</div>
<RadioGroupOfButtonStyle
value={day}
radioOptions={[
{ value: "7", label: "近7天" },
{ value: "15", label: "近15天" },
{ value: "30", label: "近30天" },
]}
handleRadio={setDay}
></RadioGroupOfButtonStyle>
</div>
<SearchInput
onKeyUp={handleKeyWordChangeKeyUp}
onBlur={handleKeyWordChangeBlur}
sx={{ width: 340 }}
/>
</div>
<SearchInput
onKeyUp={handleKeyWordChangeKeyUp}
onBlur={handleKeyWordChangeBlur}
sx={{ width: 340 }}
/>
</div>
<div className={style.taskDisplay}>
{/* 任务列表为空展示 */}
......
src/views/Project/ProjectWorkbench/workbenchList/index.tsx
View file @ 16ec17aa
......@@ -419,7 +419,7 @@ const ProjectMembers = observer(() => {
<Box className={styles.tabBoxMiddle}>
<img alt="" src={jobCost} />
<div className={styles.tabBoxTime}>
{item.jobCost ? item.jobCost.toFixed(2) : "--"}
{item.jobCost?.toFixed(2)}元
</div>
</Box>
<Box className={styles.tabBoxJobStatus}>
......@@ -452,7 +452,7 @@ const ProjectMembers = observer(() => {
<Box className={styles.tabBoxJobOperate}>
{currentProjectStore.currentProjectInfo.projectRole ===
"USER" &&
item.creator !==
item.creator !==
JSON.parse(localStorage.getItem("userInfo") || "{}")
?.name ? (
""
......
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