Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
岳佳鑫
2022-10-21 10:03:42 +08:00
7 changed files with 2213 additions and 35 deletions

View File

@@ -74,9 +74,7 @@
</div>
<div
class="taskbox"
style="
background: linear-gradient(180deg,#DDEAFF,#F0F8FE);
"
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
>
<div class="leftt">
<img src="../../assets/images/taskpage/left2.png" />
@@ -95,9 +93,7 @@
<div
class="taskbox"
@click="showModal"
style="
background: linear-gradient(180deg,#E5F6EC,#EEF9F3);
"
style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
>
<div class="leftt">
<img src="../../assets/images/taskpage/left3.png" />
@@ -1490,23 +1486,25 @@ export default {
customRender: (text) => {
if (text.record.rank == "1") {
return (
<div
style={{
width: 24,
height: 24,
backgroundImage:
"url(" +
require("../../assets/images/taskpage/one.png") +
")",
}}
>
fewfwe
</div>
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")}
/>
);
} else if (text.record.rank == "2") {
return <div>ggg</div>;
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")}
/>
);
} else if (text.record.rank == "3") {
return <div>ggg</div>;
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")}
/>
);
} else {
return <div>{text.record.rank}</div>;
}
@@ -1592,6 +1590,32 @@ export default {
width: 50,
align: "center",
className: "h",
customRender: (text) => {
if (text.record.rank == "1") {
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")}
/>
);
} else if (text.record.rank == "2") {
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")}
/>
);
} else if (text.record.rank == "3") {
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")}
/>
);
} else {
return <div>{text.record.rank}</div>;
}
},
},
{
title: "名称",
@@ -1673,6 +1697,32 @@ export default {
width: 50,
align: "center",
className: "h",
customRender: (text) => {
if (text.record.rank == "1") {
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")}
/>
);
} else if (text.record.rank == "2") {
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")}
/>
);
} else if (text.record.rank == "3") {
return (
<img
style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")}
/>
);
} else {
return <div>{text.record.rank}</div>;
}
},
},
{
title: "名称",
@@ -1798,10 +1848,10 @@ export default {
padding: 0;
.modalHeader {
background: linear-gradient(
0deg,
rgba(78, 166, 255, 0) 0%,
rgba(78, 166, 255, 0.2) 100%
);
0deg,
rgba(78, 166, 255, 0) 0%,
rgba(78, 166, 255, 0.2) 100%
);
}
.modalMain {
.projectname {