From 04b13a0cdb319ccddc9ec3d4ec6cd3fd11c6eda6 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 14 九月 2023 17:26:09 +0800
Subject: [PATCH] 面板 样式修改 工序+第一次的倒计时修改为 闪+工序运行时间
---
src/components/AddIssue.vue | 110 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 34 deletions(-)
diff --git a/src/components/AddIssue.vue b/src/components/AddIssue.vue
index 41c8c49..42c7974 100644
--- a/src/components/AddIssue.vue
+++ b/src/components/AddIssue.vue
@@ -3,16 +3,16 @@
<el-dialog
:close-on-click-modal="false"
:visible.sync="islook"
- width="700px"
+ width="753px"
class="add-event-dialog"
:show-close="false"
>
<div class="tank-box">
<div slot="title" class="tac drawerHeader">
<span class="title-l">鏂颁换鍔�</span>
- <span class="title-r" @click="closeClick">
+ <!-- <span class="title-r" @click="closeClick">
<img src="../../public/close.png" />
- </span>
+ </span> -->
</div>
<div class="dialog-content-box">
<div
@@ -69,10 +69,11 @@
宸ユ椂锛� {{ taskData.Procedure.procedure.workHours || "" }}
</div>
<div class="title-item">
- 璧锋鏃堕棿锛� {{ formatDate(taskData.Order.startTime) || "" }}
+ 璁″垝鏃堕棿锛� {{ formatDate(taskData.Order.startTime) || "" }}
-
{{ formatDate(taskData.Order.endTime) }}
</div>
+
<div class="title-item">
瀹㈡埛鍚嶇О锛歿{ taskData.Order.customer || "" }}
</div>
@@ -110,28 +111,40 @@
<div
style="
color: red;
- font-size: 16px;
+ font-size: 26px;
width: 100%;
text-align: center;
- font-weight: 700;
- margin-bottom: 20px;
+ margin-bottom: 15px;
margin-top: 10px;
+ line-height:35px;
"
>
+ <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>
{{ message }}
</div>
- <div class="progress-item">
- <span>{{ parseInt((num / 60) * 100) }}%</span>
- <el-progress
- style="width: calc(100% - 50px); float: right"
- define-back-color="#CDC6C6"
- color="#00cc66"
- text-color="#fff"
- :text-inside="true"
- :stroke-width="20"
- :percentage="parseInt((num / 60) * 100)"
- ></el-progress>
- </div>
+ <template v-if="showBtn == 3&&isLoading">
+ <div class="progress-item">
+ <span>{{ parseInt((num / 60) * 100) }}%</span>
+ <el-progress
+ style="width: calc(100% - 50px); float: right"
+ define-back-color="#CDC6C6"
+ color="#00cc66"
+ text-color="#fff"
+ :text-inside="true"
+ :stroke-width="20"
+ :percentage="parseInt((num / 60) * 100)"
+ ></el-progress>
+ </div>
+ </template>
</div>
</template>
@@ -151,7 +164,7 @@
<template v-else>
<div class="btn" v-if="showBtn == 1" @click="confirmClick1">
- <img src="../../public/confirm3.png" />
+ <img src="../../public/confirm1.png" />
</div>
<div class="btn" v-if="showBtn == 2">
<img src="../../public/confirm2.png" />
@@ -178,7 +191,6 @@
<script>
import {
startTask,
- setProductNumber,
sendProcessParams,
} from "@/api/home/index"; // 浜х嚎
// import ErrorIssue from "@/components/ErrorIssue";
@@ -229,10 +241,18 @@
this.showBtn = 3;
}
},
+ islook(){
+ this.showBtn=1;
+ if (this.timer) {
+ clearInterval(this.timer);
+ }
+ this.num = 0;
+ },
},
methods: {
confirmClick2() {
this.messageError = "";
+ this.isLoading=false;
},
confirmClick1() {
this.num = 0;
@@ -260,7 +280,7 @@
this.islook = true;
} else {
this.islook = false;
- // this.islook = true;
+ this.islook = true;
}
},
getDateObj(date, fmt) {
@@ -317,13 +337,10 @@
return true;
}
this.isLoading=true;
- sendProcessParams({ id: this.taskData.Procedure.ID }).then((res) => {
- console.log(res,'====res')
+ sendProcessParams({ procedureId: this.taskData.Procedure.ID,position: Number(this.taskData.Position), }).then((res) => {
if (res.code == 200) {
- setProductNumber().then((res) => {
- this.resParams = res;
- this.isLoading=false;
- });
+ this.resParams = res;
+ this.isLoading=false;
} else {
this.isLoading=false;
this.resParams = res;
@@ -366,8 +383,8 @@
<style lang="scss" scoped>
.tank-box {
- width: 783px;
- height: 630px;
+ width: 753px;
+ height: 728px;
background: url("../../public/tank.png") no-repeat center center / cover;
position: relative;
.dialog-footer {
@@ -389,10 +406,10 @@
margin-bottom: 13px;
}
.title-box {
- width: calc(100% - 160px);
+ width: calc(100% - 140px);
height: auto;
overflow: hidden;
- padding:0 80px;
+ padding:0 70px;
.title-item {
width: 45%;
float: left;
@@ -547,8 +564,33 @@
overflow: hidden;
}
.title-auto-box {
- height: calc(100% - 150px);
+ height: calc(100% - 180px);
overflow: auto;
+ width:calc(100% - 140px);
+ margin: 0 auto;
+ background:#0E246A;
+ .title-box{
+ padding:0 10px;
+ width:calc(100% - 20px);
+ }
+ }
+ .gif{
+ width:35px;
+ margin:0 auto;
+ display:inline-block;
+ vertical-align: middle;
+ img{
+ width:100%;
+ }
+ .yuandian {
+ width: 35px;
+ height: 35px;
+ display: inline-block;
+ // background: #15d815;
+ background:red;
+ border-radius: 50%;
+ vertical-align: middle;
+ }
}
.progress-item {
width: 55%;
@@ -583,7 +625,7 @@
width:25%;
float:left;
margin-left:30px;
- font-size: 27px;
+ font-size: 25px;
color: #fff;
height: 3.2vw;
line-height: 4.5vw;
--
Gitblit v1.8.0