From a6c049ce564fe10a83b6f1759035a8c2803c6e18 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 25 九月 2023 15:37:12 +0800
Subject: [PATCH] 看板的 获取任务接口变更， 新任务获取变更，计划时间格式修改
---
src/components/AddIssue.vue | 90 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/src/components/AddIssue.vue b/src/components/AddIssue.vue
index 770bc09..bbd2bfa 100644
--- a/src/components/AddIssue.vue
+++ b/src/components/AddIssue.vue
@@ -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>
@@ -166,7 +173,8 @@
<img src="../../public/btn1.png" />
</div>
<div class="btn" v-if="showBtn == 1" @click="confirmClick1">
- <img src="../../public/confirm1.png" />
+ <img v-if='taskData&&taskData.canStarted' src="../../public/confirm1.png" />
+ <img v-else src="../../public/confirm2.png" />
</div>
<div class="btn" v-if="showBtn == 2">
<img src="../../public/confirm2.png" />
@@ -178,7 +186,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>
@@ -214,6 +223,12 @@
return [];
},
},
+ safeProduce:{
+ type: [String],
+ default: () => {
+ return '';
+ },
+ }
},
data() {
return {
@@ -221,21 +236,23 @@
showBtn:1,
num: 0,
timer: null,
- message: "璇风‘璁ょ敓浜у畨鍏紒",
+ message: this.safeProduce,
messageError: "",
resParams: {},
isLoading:false,
};
},
mounted() {
+ this.message=this.safeProduce;
this.getInfo();
},
watch: {
taskData(val) {
+ this.message=this.safeProduce;
this.getInfo();
},
num() {
- if (this.num == 60) {
+ if (this.num == 30) {
clearInterval(this.timer);
this.showBtn = 3;
}
@@ -258,7 +275,7 @@
confirmClick1() {
this.num = 0;
this.showBtn = 2;
- (this.message = "璇风‘璁ょ敓浜у畨鍏紒"),
+ (this.message = this.safeProduce),
(this.timer = setInterval(() => {
this.num = this.num + 1;
}, 1000));
@@ -271,6 +288,7 @@
this.shutdown();
},
getInfo() {
+ // 1 鏈敓浜� 2鐢熶骇涓� 3鐢熶骇瀹屾垚
if (
Object.keys(this.taskData).length > 0 &&
this.taskData.Procedure.ID &&
@@ -317,7 +335,7 @@
formatDate(value) {
if (value) {
const now = value ? new Date(value * 1000) : new Date();
- let time = this.getDateObj(now, "yyyy-MM-dd");
+ let time = this.getDateObj(now, "MM-dd hh:mm");
return time;
} else {
return "";
@@ -325,13 +343,12 @@
},
onSubmit() {
-
if (this.taskData.Procedure.ID) {
(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);
@@ -355,12 +372,12 @@
},
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 = "璇风‘璁ょ敓浜у畨鍏紒";
+ this.message = this.safeProduce;
this.num = 0;
this.showBtn= 1
@@ -371,9 +388,9 @@
} else {
this.messageError = res.msg ? res.msg : "鎶辨瓑锛屽伐搴忎笅鍙戝け璐ワ紒";
clearInterval(this.timer);
- this.num = 60;
+ this.num = 30;
this.showBtn = 2;
- this.message = "璇风‘璁ょ敓浜у畨鍏紒";
+ this.message =this.safeProduce;
}
},
shutdown() {
@@ -479,11 +496,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;
@@ -572,7 +589,7 @@
overflow: hidden;
}
.title-auto-box {
- height: calc(100% - 160px);
+ height: calc(100% - 220px);
overflow: auto;
width:calc(100% - 140px);
margin: 0 auto;
@@ -582,22 +599,37 @@
width:calc(100% - 20px);
}
}
- .gif{
- width:35px;
+ .gif-box{
+ width:230px;
margin:0 auto;
- display:inline-block;
+ margin-bottom:5px;
+ .gif-right{
+ width:210px;
+ font-size:14px;
+ color:#fff;
+ line-height:28px;
+ span{
+ font-weight: 700;
+ font-size:18px;
+ }
+ }
+ }
+ .gif{
+ width:55px;
vertical-align: middle;
+ float:left;
+ margin-right:20px;
img{
width:100%;
}
.yuandian {
- width: 35px;
- height: 35px;
- display: inline-block;
+ width: 55px;
+ height: 55px;
+ float:left;
// background: #15d815;
background:red;
border-radius: 50%;
- margin-top:-5px;
+ // margin-top:-5px;
vertical-align: middle;
}
}
--
Gitblit v1.8.0