From 2280d3aaaf652a89159efbe196356d9c6c35bbe8 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期一, 23 十月 2023 19:07:44 +0800
Subject: [PATCH] feat: 计划时间取值字段更改; 修复0通道没有任务的情况下1通道的数据跑到左边的问题
---
src/components/TaskControlModal.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/components/TaskControlModal.vue b/src/components/TaskControlModal.vue
index 2134a65..adf7f82 100644
--- a/src/components/TaskControlModal.vue
+++ b/src/components/TaskControlModal.vue
@@ -65,9 +65,9 @@
宸ユ椂锛� {{ currentTaskData.Procedure.procedure.workHours || "" }}
</div>
<div class="title-item">
- 璁″垝鏃堕棿锛� {{ formatDate(currentTaskData.Order.startTime) || "" }}
+ 璁″垝鏃堕棿锛� {{ formatDate(currentTaskData.Procedure.startTime) || "" }}
-
- {{ formatDate(currentTaskData.Order.endTime) }}
+ {{ formatDate(currentTaskData.Procedure.endTime) }}
</div>
<div class="title-item">
@@ -136,8 +136,12 @@
</div>
</template>
<div class="gif-right">
- ----- 鍓╀綑鏃堕棿 -----
- <span>00:00:{{ 30 - Number(num) < 10 ? 0 : '' }}{{ 30 - Number(num) }}</span>
+ <div>
+ ----- 鍓╀綑鏃堕棿 -----
+ </div>
+ <div>
+ <span>00:00:{{ 30 - Number(num) < 10 ? 0 : '' }}{{ 30 - Number(num) }}</span>
+ </div>
</div>
</div>
{{ message }}
@@ -212,6 +216,7 @@
<script>
import {getTaskInfo, sendProcessParams, startTask,} from "@/api/home"; // 浜х嚎
+import {channelNameConfig} from "@/common/constants";
export default {
name: 'TaskControlModal',
components: {},
@@ -243,11 +248,7 @@
isLoading: false,
second: 0,
secondTimer: null,
- // 閫氶亾鍚嶇О閰嶇疆 Channel 0 瀵瑰簲灞曠ず 0, Channel 1 瀵瑰簲灞曠ず A,鏆傛椂蹇界暐鍏朵綑鎯呭喌
- channelNameConfig: {
- 0: '0',
- 1: 'A'
- }
+ channelNameConfig: channelNameConfig
};
},
mounted() {
@@ -366,6 +367,8 @@
getCurrentTaskProduceParams(id) {
// const id = this.currentTaskData?.Procedure?.ID
if (id) {
+ this.currentProcessParams = []
+ this.getProcessParamsErrMsg = ""
startTask({id}).then((res) => {
if (res.code === 200) {
this.currentProcessParams = res.data.Params ?? []
@@ -424,9 +427,9 @@
if (this.currentTaskData?.Procedure?.ID && this.currentTaskData?.Procedure?.Status === 1) {
this.num = 0;
this.showBtn = 1;
- this.show = true;
+ // this.show = true;
} else {
- this.show = false;
+ // this.show = false;
}
},
getDateObj(date, fmt) {
--
Gitblit v1.8.0