From 0ff14f558473544c9145735524fb671743c716bb Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 九月 2023 19:05:29 +0800
Subject: [PATCH] 看板改版
---
src/components/AddIssue.vue | 81 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 28 deletions(-)
diff --git a/src/components/AddIssue.vue b/src/components/AddIssue.vue
index be37b28..41ab225 100644
--- a/src/components/AddIssue.vue
+++ b/src/components/AddIssue.vue
@@ -29,7 +29,7 @@
褰撳墠浠诲姟锛歿{ taskData.Procedure.procedure.procedureName || "" }}
</div>
<div class="title-item title-bng color_4efefa font_size_20">
- 鐢熶骇鏁伴噺锛�<span>{{ taskData.Order.amount || 0 }}</span>
+ 鐢熶骇鏁伴噺锛�<span style="color:#fff;">{{ taskData.Order.amount || 0 }}</span>
</div>
</div>
<template v-if="messageError">
@@ -119,21 +119,28 @@
"
:class="showBtn == 3&&isLoading?'margin-top-10px':'margin-top-40px'"
>
- <template v-if="showBtn == 2">
+ <div class="gif-box" v-if="showBtn == 2||(showBtn == 3&&!isLoading)">
+ <template v-if="showBtn == 2">
<div class="gif">
<img src="../../public/shan.gif" />
</div>
+
</template>
<template v-if="showBtn == 3&&!isLoading">
<div class="gif">
<span class="yuandian"></span>
</div>
</template>
+ <div class="gif-right">
+ ----- 鍓╀綑鏃堕棿 -----
+ <span>00:00:{{30 - Number(num)<10?0:''}}{{ 30 - Number(num) }}</span>
+ </div>
+ </div>
{{ message }}
</div>
<template v-if="showBtn == 3&&isLoading">
<div class="progress-item">
- <span>{{ parseInt((num / 60) * 100) }}%</span>
+ <span>{{ parseInt((num / 30) * 100) }}%</span>
<el-progress
style="width: calc(100% - 50px); float: right"
define-back-color="#CDC6C6"
@@ -141,7 +148,7 @@
text-color="#fff"
:text-inside="true"
:stroke-width="20"
- :percentage="parseInt((num / 60) * 100)"
+ :percentage="parseInt((num / 30) * 100)"
></el-progress>
</div>
</template>
@@ -158,7 +165,7 @@
<div slot="footer" class="dialog-footer tac" style="overflow: hidden">
<template v-if="messageError">
<div class="btn" @click="confirmClick2">
- <img src="../../public/confirm3.png" />
+ <img src="../../public/agin.png" />
</div>
</template>
<template v-else>
@@ -178,7 +185,8 @@
@click="onSubmit()"
>
<i class="el-icon-loading icon-loading" v-if="isLoading"/>
- <img src="../../public/confirm1.png" />
+ <img src="../../public/loading.png" v-if="isLoading"/>
+ <img src="../../public/confirm3.png" v-if="!isLoading"/>
</div>
</template>
</div>
@@ -235,17 +243,19 @@
this.getInfo();
},
num() {
- if (this.num == 60) {
+ if (this.num == 30) {
clearInterval(this.timer);
this.showBtn = 3;
}
},
islook(){
- this.showBtn=1;
if (this.timer) {
clearInterval(this.timer);
}
this.num = 0;
+ this.showBtn=1;
+ this.isLoading=false
+ this.$emit('isTip',this.islook)
},
},
methods: {
@@ -269,6 +279,7 @@
this.shutdown();
},
getInfo() {
+ // 1 鏈敓浜� 2鐢熶骇涓� 3鐢熶骇瀹屾垚
if (
Object.keys(this.taskData).length > 0 &&
this.taskData.Procedure.ID &&
@@ -279,8 +290,9 @@
this.islook = true;
} else {
this.islook = false;
- this.islook = true;
+ // this.islook = true;
}
+
},
getDateObj(date, fmt) {
if (/(y+)/.test(fmt)) {
@@ -322,13 +334,12 @@
},
onSubmit() {
-
if (this.taskData.Procedure.ID) {
- (this.message = "鍙傛暟涓嬪彂涓�..."), (this.num = 0);
+ (this.message = "宸ヨ壓鍙傛暟涓嬪彂涓�..."), (this.num = 0);
this.timer = setInterval(() => {
this.num = this.num + 1;
- if (this.num == 60 || this.resParams) {
- this.num = 60;
+ if (this.num == 30 || this.resParams) {
+ this.num = 30;
this.getCode(this.resParams);
}
}, 1000);
@@ -352,10 +363,10 @@
},
getCode(res) {
if (res.code == 200) {
- if (this.num == 60) {
+ if (this.num == 30) {
this.messageError = "涓嬪彂鎴愬姛锛�";
clearInterval(this.timer);
- // this.num = 60;
+ // this.num = 30;
// this.showBtn = 2;
this.message = "璇风‘璁ょ敓浜у畨鍏紒";
@@ -368,7 +379,7 @@
} else {
this.messageError = res.msg ? res.msg : "鎶辨瓑锛屽伐搴忎笅鍙戝け璐ワ紒";
clearInterval(this.timer);
- this.num = 60;
+ this.num = 30;
this.showBtn = 2;
this.message = "璇风‘璁ょ敓浜у畨鍏紒";
}
@@ -388,7 +399,7 @@
position: relative;
.dialog-footer {
position: absolute;
- bottom: 30px;
+ bottom: 25px;
width:100%;
text-align:center;
}
@@ -476,11 +487,11 @@
width: 100%;
}
.icon-loading{
- font-size:19px;
+ font-size:32px;
color:#333;
position:absolute;
- line-height:3.4;
- left:15%;
+ line-height:2.0;
+ left:38%;
}
&:nth-of-type(1) {
// margin-right: 30px;
@@ -562,14 +573,14 @@
width: 100%;
}
.dialog-content-box {
- height: calc(100% - 200px);
+ height: calc(100% - 190px);
// overflow: hidden;
- padding: 20px 0px 20px;
+ padding: 20px 0px 10px;
.el-form {
overflow: hidden;
}
.title-auto-box {
- height: calc(100% - 180px);
+ height: calc(100% - 220px);
overflow: auto;
width:calc(100% - 140px);
margin: 0 auto;
@@ -579,17 +590,31 @@
width:calc(100% - 20px);
}
}
- .gif{
- width:35px;
+ .gif-box{
+ width:230px;
margin:0 auto;
- display:inline-block;
+ .gif-right{
+ width:210px;
+ font-size:14px;
+ color:#fff;
+ line-height:28px;
+ span{
+ font-weight: 700;
+ font-size:18px;
+ }
+ }
+ }
+ .gif{
+ width:56px;
vertical-align: middle;
+ float:left;
+ margin-right:20px;
img{
width:100%;
}
.yuandian {
- width: 35px;
- height: 35px;
+ width: 56px;
+ height: 56px;
display: inline-block;
// background: #15d815;
background:red;
--
Gitblit v1.8.0