From e49e5481e62288c7158ca17ed902695e6c0fbf58 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 26 八月 2023 16:10:58 +0800
Subject: [PATCH] 新任务弹框 产品+工艺参数弹框合为一个 增加一个倒计时的操作
---
src/views/visualization.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index fefc625..066ebe2 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,7 +1,8 @@
<template>
<div class="home">
- <template v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID">
+ <!-- v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID" -->
+ <template >
<div class="left">
<p class="title">
鐢熶骇绠＄悊鐪嬫澘
@@ -109,7 +110,7 @@
text-color="#fff"
:text-inside="true"
:stroke-width="30"
- :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):0"
+ :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0"
></el-progress>
</el-descriptions-item>
<!-- <el-descriptions-item label="鍚堟牸鐜�" style="width: 100%">
@@ -198,7 +199,7 @@
</div>
<div class="card_top-3">
<span class="card-top-r-t"
- >瀹屾垚杩涘害锛歿{ taskData.Order?parseInt(finishNumber/taskData.Order.amount):0}}</span
+ >瀹屾垚杩涘害锛歿{ taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0}}</span
>
<span class="card-top-r-b">
<el-progress
@@ -207,7 +208,7 @@
text-color="#fff"
:text-inside="true"
:stroke-width="10"
- :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):0"
+ :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0"
:show-text="false"
></el-progress>
</span>
@@ -364,7 +365,7 @@
</span>
</div>
<div class="right-top-m-btn">
- <el-button type="primary" @click="controlClick"> 鎺у埗</el-button>
+ <!-- <el-button type="primary" @click="controlClick"> 鎺у埗</el-button> -->
</div>
<div class="right_dutyLst">
<div class="right-small-title">褰撳墠鍊肩彮</div>
@@ -418,7 +419,8 @@
</div>
</div>
</template>
- <template v-else>
+ <!-- v-else -->
+ <template >
<div class="home-img-box">
<div class="bg-title">
<img src="../../public/bg-title.png" />
@@ -442,9 +444,9 @@
</div>
</template>
<!-- 鎺у埗鐨勫脊妗� -->
- <AddControl ref="control" :id="taskData.Procedure.ID" />
+ <AddControl ref="control" :Arr="Arr" />
<!-- 鎺у埗鐨勫脊妗� -->
- <AddIssue ref="control" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" />
+ <AddIssue ref="control" :Arr="Arr" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" />
</div>
</template>
@@ -528,6 +530,7 @@
showCountDown:false,
countDownHour:0,
countDownMinute:0,
+ Arr:[],
};
},
mounted() {
@@ -545,6 +548,7 @@
this.getTaskInfo();
},
methods: {
+
reloadPage() {
// window.location.reload();
this.getTaskInfo();
@@ -686,6 +690,7 @@
number: res.data.Number,
name: "宸ヨ壓",
});
+ this.Arr=res.data.Params?res.data.Params:[];
}
});
this.getProgressInfo();
@@ -1257,7 +1262,8 @@
}
.right_dutyLst {
width: calc(100% - 20px);
- height: 270px;
+ // height: 270px;
+ height: 310px;
border-radius: 4px;
line-height: 30px;
overflow: hidden;
--
Gitblit v1.8.0