From 2096f22b858727a449947ffaa68197ad96104d71 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 09 十一月 2023 15:28:10 +0800
Subject: [PATCH] feat: 添加设备配置弹窗, 调整任务控制弹窗适配无工艺参数时允许不允许生产的情况
---
src/views/dashboard/components/TaskControlModal.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/dashboard/components/TaskControlModal.vue b/src/views/dashboard/components/TaskControlModal.vue
index c51b154..e984ea7 100644
--- a/src/views/dashboard/components/TaskControlModal.vue
+++ b/src/views/dashboard/components/TaskControlModal.vue
@@ -40,6 +40,10 @@
<div class="info-item-two">
<div style="color: #4efefa; font-size: 18px; margin-bottom: 10px; margin-top: 20px">宸ヨ壓鍙傛暟</div>
+ <!-- 鏈幏鍙栧埌宸ヨ壓鍙傛暟, 涓斿綋鍓嶈澶囧厑璁稿湪娌℃湁宸ヨ壓鍙傛暟鐨勬儏鍐典笅鐢熶骇, 鍒欐彁绀�-->
+ <div v-if="getCraftParamsTip && currentDeviceAllowNoParams" class="info-item info-item-two">
+ 鏈幏鍙栧埌宸ヨ壓鍙傛暟, 璇锋墜鍔ㄨ缃垨鍦ㄤ簯绔伐鑹烘ā鍨嬩腑涓婁紶
+ </div>
<div v-for="(item, index) in craftParams" :key="index" class="info-item info-item-two">
{{ item.Key }}锛歿{ item.Value || '' }}
</div>
@@ -52,7 +56,7 @@
</template>
<!-- 鍙湁鑾峰彇鍒板伐鑹哄弬鏁版墠鍙互杩涜鎿嶄綔-->
- <template v-if="getCraftParamsTip">
+ <template v-if="getCraftParamsTip && !currentDeviceAllowNoParams">
<div class="content-tips">
<div class="craft-params-error">
<div class="error-icon">
@@ -108,7 +112,7 @@
</template>
</div>
<template #footer>
- <template v-if="getCraftParamsTip">
+ <template v-if="getCraftParamsTip && !currentDeviceAllowNoParams">
<div class="btn">
<BigButton bg-color="#4765c0" @click="closeModal"> 鍏抽棴 </BigButton>
</div>
@@ -160,6 +164,7 @@
import { createMachine } from 'xstate'
import { useMachine } from '@xstate/vue'
import { CircleCloseFilled, Loading, SuccessFilled } from '@element-plus/icons-vue'
+import { useDevicesStore } from '@/stores/devices'
export interface TaskControlModalProps {
task?: Task
@@ -196,7 +201,8 @@
const craftParams = ref<CraftParam[]>()
// 鑾峰彇宸ヨ壓鍙傛暟缁撴灉淇℃伅
const getCraftParamsTip = ref('')
-
+// 褰撳墠璁惧鑻ユ病鏈夊伐鑹哄弬鏁版槸鍚﹀厑璁镐笅鍙�
+const { currentDeviceAllowNoParams } = storeToRefs(useDevicesStore())
/**
* 鑾峰彇褰撳墠灞曠ず鐨勪换鍔＄殑宸ヨ壓鍙傛暟
*/
@@ -204,6 +210,7 @@
if (taskId) {
craftParams.value = []
getCraftParamsTip.value = ''
+
getCraftParams({ id: taskId }).then(
(res) => {
craftParams.value = res.data.Params ?? []
--
Gitblit v1.8.0