+
diff --git a/src/components/step/step-proj-edit.css b/src/components/step/step-proj-edit.css
index 1e9c8e2..0b05633 100644
--- a/src/components/step/step-proj-edit.css
+++ b/src/components/step/step-proj-edit.css
@@ -1,155 +1,293 @@
.step-proj {
- width: 300px;
+ width: 317px;
position: relative;
+ /* overflow: scroll; */
}
-
-.step-proj .fiestStep {
- width: 282px;
- height: 56px;
+.downBox{
+ width: 25px;
+ height: 8px;
background-color: pink;
- position: relative;
- display: flex;
- align-items: center;
-}
-/* style={{
- background:props.process != Process.PENDING?'#3790FF':'#8B919D',
- }} */
-.step-proj .fiestStep:before {
- content: "";
position: absolute;
- right: -28px;
- top: 0;
- width: 0;
- height: 0;
- border-left: 28px solid ;
- border-top: 28px solid transparent;
- border-bottom: 28px solid transparent;
-}
+ bottom: -20px;
+ background: url(../../static/editPro/bot.png);
+ background-size: 100% 100%;
-.step-proj .fiestStep .complete {
- margin-left: 10px;
}
-
.step-proj .step {
- /* margin-top: 30px;
+ width: 309px;
+ height: 56px;
+ /* background-color: rgb(248, 213, 219); */
+ margin-top: 10px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: start;
- position: relative; */
- width: 282px;
- height: 56px;
- background-color: pink;
position: relative;
+}
+
+/* Top 状态:已完成 开始---------------------------------------------------------------*/
+.step-proj .step .complete-one {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
display: flex;
align-items: center;
+ background: url('../../static/editPro/one.png');
+ background-size: 100% 100%;
}
-.step-proj .step:after {
- content: "";
+/* 已完成状态序号 */
+.step-proj .step .complete-num {
+ width: 30px;
+ height: 30px;
+ background: #FFFFFF;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-left: 44px;
+}
+
+/* 已完成状态第一个序号 */
+.step-proj .step .complete-one .complete-num {
+ margin-left: 16px;
+
+}
+
+/* 已完成状态标题 */
+.step-proj .step .complete-text {
+ font-family: Microsoft YaHei UI;
+ font-weight: 700;
+ font-size: 16px;
+ color: #FFFFFF;
+ margin-left: 47px;
+}
+
+/* 已完成状态第一个标题 */
+.step-proj .step .complete-one .complete-text {
+ margin-left: 61px;
+}
+
+.step-proj .step .complete-two {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/two.png');
+ background-size: 100% 100%;
+}
+
+.step-proj .step .complete-three {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/three.png');
+ background-size: 100% 100%;
+}
+
+.step-proj .step .complete-four {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/four.png');
+ background-size: 100% 100%;
+}
+/* 已完成状态连接线 */
+.step-proj .step .setLine {
+ width: 49px;
+ height: 22px;
+ background-color: pink;
position: absolute;
- left: 0;
- bottom: 0;
- width: 0;
- height: 0;
- border-left: 28px solid var(--color-light);
- border-top: 28px solid transparent;
- border-bottom: 28px solid transparent;
+ right: -67px;
+ top: 17px;
+}
+.step-proj .step .complete-oneLine{
+ background:url('../../static/editPro/lineone.png');
+ background-size: 100% 100%;
+}
+.step-proj .step .complete-twoLine{
+ background:url('../../static/editPro/linetwo.png');
+ background-size: 100% 100%;
+}
+.step-proj .step .complete-threeLine{
+ background:url('../../static/editPro/linethree.png');
+ background-size: 100% 100%;
}
-.step-proj .step:before {
- content: "";
- position: absolute;
- right: -28px;
- top: 0;
- width: 0;
- height: 0;
- border-left: 28px solid red;
- border-top: 28px solid transparent;
- border-bottom: 28px solid transparent;
+/* Top 状态:已完成 结束----------------------------------------------------------- */
+
+
+
+/* Top 状态:进行中 开始----------------------------------------------------------- */
+.step-proj .step .processing-one {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/processingOne.png');
+ background-size: 100% 100%;
}
-.step-proj .step .no {
- /* width: 38px;
+.step-proj .step .processing-two {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/processingTwo.png');
+ background-size: 100% 100%;
+}
+
+.step-proj .step .processing-three {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/processingThree.png');
+ background-size: 100% 100%;
+}
+
+.step-proj .step .processing-four {
+ width: 309px;
+ height: 56px;
+ /* background-color: pink; */
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/processingFour.png');
+ background-size: 100% 100%;
+}
+.step-proj .step .processing-num {
+ width: 21px;
+ height: 21px;
+ background: #FFFFFF;
+ border-radius: 50%;
+ margin-left: 46px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-family: Microsoft YaHei UI;
+ font-weight: 500;
+ font-size: 14px;
+ color: #B5B5B5;
+}
+
+.step-proj .step .processing-text {
+ font-family: Microsoft YaHei UI;
+ font-weight: 700;
+ font-size: 16px;
+ color: #71757E;
+ margin-left: 47px;
+}
+
+/* Top 状态:进行中 结束----------------------------------------------------------- */
+
+
+
+/* Top 状态:未操作 开始 ------------------------------------------------------------ */
+.step-proj .step .pending {
+ width: 309px;
+ height: 56px;
+ display: flex;
+ align-items: center;
+ background: url('../../static/editPro/no.png');
+ background-size: 100% 100%;
+}
+
+.step-proj .step .pending .pending-num {
+ width: 21px;
+ height: 21px;
+ background: #FFFFFF;
+ border-radius: 50%;
+ margin-left: 46px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-family: Microsoft YaHei UI;
+ font-weight: 300;
+ font-size: 14px;
+ color: #B5B5B5;
+}
+
+.step-proj .step .pending .pending-text {
+ font-family: Microsoft YaHei UI;
+ font-weight: 700;
+ font-size: 16px;
+ color: #71757E;
+ margin-left: 47px;
+}
+.step-proj .step .no-line{
+ background:url('../../static/editPro/lineno.png');
+ background-size: 100% 100%;
+}
+/* Top 状态:未操作 结束 ------------------------------------------------------------ */
+
+
+
+
+/* .step-proj .step:nth-child(1){
+ background: url(../../static/editPro/one.png);
+ background-size: 100% 100%;
+}
+.step-proj .step:nth-child(2){
+ background: url(../../static/editPro/two.png);
+ background-size: 100% 100%;
+}
+
+.step-proj .step:nth-child(3){
+
+}
+.step-proj .step:nth-child(4){
+
+} */
+/* .step-proj .step .no {
+ width: 38px;
height: 38px;
border-radius: 50%;
font-size: 16px;
display: flex;
align-items: center;
- justify-content: center; */
+ justify-content: center;
}
-.step-proj .complete {
- width: 30px;
- height: 30px;
- background-color: white;
- border-radius: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
+.step-proj .step .complete {
border: 1px solid var(--color-primary);
color: var(--color-primary);
- color: #3790FF;
}
-.step-proj .processing {
- /* border: 1px solid var(--color-primary);
+.step-proj .step .processing {
+ border: 1px solid var(--color-primary);
background-color: var(--color-primary);
- color: var(--color-light); */
- width: 21px;
- height: 21px;
- border-radius: 50%;
- background-color: white;
- display: flex;
- align-items: center;
- justify-content: center;
- color: #B5B5B5;
-
+ color: var(--color-light);
}
-.step-proj .notop {
- width: 21px;
- height: 21px;
- border-radius: 50%;
- background-color: white;
- display: flex;
- align-items: center;
- justify-content: center;
- color: #B5B5B5;
-}
-
-.step-proj .pending {
+.step-proj .step .pending {
border: 1px solid var(--color-disabled);
color: var(--color-disabled);
-}
+} */
-.step-proj .desc {
+.step-proj .step .desc {
margin-left: 15px;
width: 150px;
border: none;
- /* background-color: #3790FF; */
- display: flex;
-
}
-.step-proj .desc .title {
+.step-proj .step .desc .title {
+ margin-top: 8px;
font-weight: bold;
- /* background-color: #3790FF; */
-
}
-.step-proj .fiestStep .desc .title {
- margin-left: 60px;
- font-weight: 300;
- font-size: 16px;
- color: #FFFFFF;
-}
-
-.step-proj .pending .title {
+.step-proj .step .pending .title {
color: var(--color-text-disabled);
}
-.step-proj .desc .detail {
+.step-proj .step .desc .detail {
margin-top: 10px;
font-size: 12px;
width: 100%;
@@ -179,7 +317,7 @@
.step-proj .step-card {
margin-top: 40px;
padding: 10px 0;
- border: 1px solid var(--color-border);
+ /* border: 1px solid var(--color-border); */
overflow: auto;
}
@@ -194,7 +332,7 @@
.step-proj .step-card .step-card-list .card-proj-result,
.step-proj .step-card .step-card-list .card-proj-download,
.step-proj .step-card .step-card-list .card-proj-jump {
- border-bottom: 1px solid var(--color-border);
+ /* border-bottom: 1px solid var(--color-border); */
}
.step-proj .step-card .step-card-list .card-proj-edit:last-child,
diff --git a/src/interfaces/card/ICardProj.ts b/src/interfaces/card/ICardProj.ts
index 9997a70..2e8b3ca 100644
--- a/src/interfaces/card/ICardProj.ts
+++ b/src/interfaces/card/ICardProj.ts
@@ -10,7 +10,8 @@ export interface IProjEdit {
status: EditStepEnum;
btnName?: string;
canBtnClick?: boolean;
-
+ background?:string;
+ shadow?:string;
handleEdit(): void;
}
diff --git a/src/route/index/index.css b/src/route/index/index.css
index 8769e51..c7605dc 100644
--- a/src/route/index/index.css
+++ b/src/route/index/index.css
@@ -6,7 +6,7 @@
.index .left {
position: fixed;
- width: 268px;
+ width: 267px;
height: 100%;
/* overflow: auto; */
top: 80px;
@@ -20,6 +20,7 @@
height: 100%;
position: fixed;
width:calc(100vw - 330px);
+ /* width: 1575px; */
}
.index .right .top{
margin-top: 26px;
diff --git a/src/route/proj/ProjEdit.tsx b/src/route/proj/ProjEdit.tsx
index ba23eb2..a5f653d 100644
--- a/src/route/proj/ProjEdit.tsx
+++ b/src/route/proj/ProjEdit.tsx
@@ -53,7 +53,7 @@ export default function ProjEdit() {
});
- const height = window.innerHeight - 240;
+ // const height = window.innerHeight - 240;
const renderEditStep = (editSteps: any[], isEdited: boolean, isGenerateSuccess: boolean) => {
const editStepArray: IProjEdit[] = [];
@@ -244,7 +244,8 @@ export default function ProjEdit() {
{title: '编辑项目'},
]}
/> */}
-
+ {/*
*/}
+
})
}
@@ -276,6 +279,9 @@ export default function ProjEdit() {
canBtnClick={item.status == EditStepEnum.EDITED}
status={item.status}
handleEdit={item.handleEdit}
+ background = {item.status == EditStepEnum.EDITED?'#F5FEFA':'#f3f3f3'}
+ shadow = {item.status == EditStepEnum.EDITED?' 0px 3px 0px 0px rgba(55,215,138,0.18)':''}
+
/>
})
}
@@ -308,6 +314,9 @@ export default function ProjEdit() {
window.location.reload();
}, 1000)
}}
+ // background = {status == EditStepEnum.EDITED?'#F5FAFE':'#f3f3f3'}
+ // shadow = {status == EditStepEnum.EDITED?'0px 3px 0px 0px rgba(55,144,215,0.18)':''}
+ background = '#f3f3f3'
/>
) : <>>
}
diff --git a/src/route/proj/proj-edit.css b/src/route/proj/proj-edit.css
index 74d8c3c..b35caa4 100644
--- a/src/route/proj/proj-edit.css
+++ b/src/route/proj/proj-edit.css
@@ -1,15 +1,13 @@
.proj-edit-box{
margin-top: 21px;
- /* background-color: red; */
- overflow: scroll;
-
+ overflow: auto;
+
}
.proj-edit {
background-color: var(--color-light);
padding: 15px;
display: flex;
justify-content: space-around;
-
}
.btn-container {
diff --git a/src/static/editPro/bot.png b/src/static/editPro/bot.png
new file mode 100644
index 0000000..7cce6fc
Binary files /dev/null and b/src/static/editPro/bot.png differ
diff --git a/src/static/editPro/four.png b/src/static/editPro/four.png
new file mode 100644
index 0000000..7f9a68d
Binary files /dev/null and b/src/static/editPro/four.png differ
diff --git a/src/static/editPro/lineno.png b/src/static/editPro/lineno.png
new file mode 100644
index 0000000..71aa0dc
Binary files /dev/null and b/src/static/editPro/lineno.png differ
diff --git a/src/static/editPro/lineone.png b/src/static/editPro/lineone.png
new file mode 100644
index 0000000..1b606e8
Binary files /dev/null and b/src/static/editPro/lineone.png differ
diff --git a/src/static/editPro/linethree.png b/src/static/editPro/linethree.png
new file mode 100644
index 0000000..d628fb8
Binary files /dev/null and b/src/static/editPro/linethree.png differ
diff --git a/src/static/editPro/linetwo.png b/src/static/editPro/linetwo.png
new file mode 100644
index 0000000..44f7b0d
Binary files /dev/null and b/src/static/editPro/linetwo.png differ
diff --git a/src/static/editPro/no.png b/src/static/editPro/no.png
new file mode 100644
index 0000000..c948c9f
Binary files /dev/null and b/src/static/editPro/no.png differ
diff --git a/src/static/editPro/one.png b/src/static/editPro/one.png
new file mode 100644
index 0000000..9eba1a0
Binary files /dev/null and b/src/static/editPro/one.png differ
diff --git a/src/static/editPro/processingFour.png b/src/static/editPro/processingFour.png
new file mode 100644
index 0000000..2a4c332
Binary files /dev/null and b/src/static/editPro/processingFour.png differ
diff --git a/src/static/editPro/processingOne.png b/src/static/editPro/processingOne.png
new file mode 100644
index 0000000..b8528dd
Binary files /dev/null and b/src/static/editPro/processingOne.png differ
diff --git a/src/static/editPro/processingThree.png b/src/static/editPro/processingThree.png
new file mode 100644
index 0000000..d014981
Binary files /dev/null and b/src/static/editPro/processingThree.png differ
diff --git a/src/static/editPro/processingTwo.png b/src/static/editPro/processingTwo.png
new file mode 100644
index 0000000..04ade63
Binary files /dev/null and b/src/static/editPro/processingTwo.png differ
diff --git a/src/static/editPro/three.png b/src/static/editPro/three.png
new file mode 100644
index 0000000..0466e66
Binary files /dev/null and b/src/static/editPro/three.png differ
diff --git a/src/static/editPro/two.png b/src/static/editPro/two.png
new file mode 100644
index 0000000..43fd4d4
Binary files /dev/null and b/src/static/editPro/two.png differ