From 70ba8aa1df86360e05a9fae3a35893c7c48d2bd8 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 30 Apr 2025 09:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E8=89=BA=E5=8A=A0?=
 =?UTF-8?q?=E7=83=AD=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/craft/AddCraftDialog.vue |  1 -
 src/views/craft/CraftStatus.vue    | 27 +++++++++++++++++++++++----
 src/views/craft/TransferRight.vue  | 12 +++++++-----
 src/views/craft/index.vue          |  4 ++--
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/views/craft/AddCraftDialog.vue b/src/views/craft/AddCraftDialog.vue
index d107116..bff8dd4 100644
--- a/src/views/craft/AddCraftDialog.vue
+++ b/src/views/craft/AddCraftDialog.vue
@@ -64,7 +64,6 @@ function onConfirm() {
     ElMessage.warning('请输入工艺名称')
     return
   }
-
   for (const step of stepStructs.value) {
     if (step.method === 'addLiquid') {
       const list = step.params.tubeSolList
diff --git a/src/views/craft/CraftStatus.vue b/src/views/craft/CraftStatus.vue
index 5223d8d..0f86366 100644
--- a/src/views/craft/CraftStatus.vue
+++ b/src/views/craft/CraftStatus.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { CraftState } from './craftType'
+import type { CraftState, StepStruct } from './craftType'
 import { craftstatus } from '@/apis/crafts'
 import { ref } from 'vue'
 import TransferRight from './TransferRight.vue'
@@ -16,6 +16,11 @@ const stateMap: any = {
 const queryCraftStatus = () => {
   intervalTimes.value = setInterval(() => {
     craftstatus().then((res) => {
+      console.log('res---', res)
+      if (res && res.length === 0) {
+        clearInterval(intervalTimes.value)
+        return
+      }
       const craftStateList: CraftState[] = res
       const uniqueData: CraftState[] = []
       const idMap: any = {}
@@ -58,7 +63,7 @@ const onCloseDialog = () => {
   stateList.value = []
 }
 
-const currentSteps = ref()
+const currentSteps = ref<StepStruct[]>([])
 const onSelectChange = (value: string | number) => {
   const list = craftList.value.filter(item => item.craftsId === value)
   list.forEach((item) => {
@@ -94,13 +99,20 @@ defineExpose({
             </el-select>
           </div>
         </div>
-        <div class="state-log">
+        <div v-if="currentSteps.length" class="state-log">
           <TransferRight v-for="(step, idx) in currentSteps" :key="idx" :order="idx + 1" :step="step" type="showlog" @del="() => {}" @transfer-change="() => {}"  />
         </div>
+        <div v-else class="state-log">
+          <el-empty description="description" style="height:30vh">
+            <template #description>
+              <span style="color:#c2c2c2">没有正在执行的工艺</span>
+            </template>
+          </el-empty>
+        </div>
       </div>
       <div class="item2">
         <div>工艺执行状态</div>
-        <div class="state-log">
+        <div v-if="stateList.length" class="state-log">
           <div v-for="item in stateList" :key="item.state">
             <span class="state-span"><label class="state-log-label">矿石名称：</label><span class="state-log-text">{{ item.oresName }}</span></span>
             <span class="state-span"><label class="state-log-label">工艺名称：</label><span class="state-log-text">{{ item.craftsName }}</span></span>
@@ -108,6 +120,13 @@ defineExpose({
             <span class="state-span"><label class="state-log-label">执行状态：</label><span class="state-log-text">{{ stateMap[item.state] }}</span></span>
           </div>
         </div>
+        <div v-else class="state-log">
+          <el-empty description="description" style="height:30vh">
+            <template #description>
+              <span style="color:#c2c2c2">没有正在执行的工艺</span>
+            </template>
+          </el-empty>
+        </div>
       </div>
     </div>
   </el-dialog>
diff --git a/src/views/craft/TransferRight.vue b/src/views/craft/TransferRight.vue
index 41441d6..471d925 100644
--- a/src/views/craft/TransferRight.vue
+++ b/src/views/craft/TransferRight.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { StepStruct } from './craftType'
 import { useLiquidStore } from '@/stores/useLiquidsStore'
-import { onMounted, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { StepCmdDescMap, tubeSolList } from './craftType'
 
 const props = defineProps<{
@@ -17,12 +17,8 @@ const $emit = defineEmits<{
 
 const liquidStore = useLiquidStore()
 const stepInfo = ref(props.step)
-onMounted(() => {
-  console.log('liquidStore---', props.step)
-})
 
 watch(stepInfo, (newVal) => {
-  console.log('newVale === ', newVal)
   $emit('transferChange', newVal, props.order)
 }, {
   deep: true,
@@ -66,6 +62,12 @@ watch(stepInfo, (newVal) => {
           <span class="ml-2">秒</span>
         </div>
       </section>
+      <section v-if="stepInfo.method === 'startHeating'" class="right-shaking">
+        <div class="flex items-center right-base">
+          加热温度：<el-input v-model.number="stepInfo.params.temperature" style="width: 100px" size="small" />
+          <span class="ml-2">°C</span>
+        </div>
+      </section>
     </template>
   </div>
   <div style="height:5px;background: white;" />
diff --git a/src/views/craft/index.vue b/src/views/craft/index.vue
index 85c6697..82a8368 100644
--- a/src/views/craft/index.vue
+++ b/src/views/craft/index.vue
@@ -171,12 +171,12 @@ const onStart = () => {
     <el-dialog v-model="heatVisible" title="执行工艺" width="30vw">
       <div style="display: flex; justify-content: center;align-items: center;">
         <label>选择加热区：</label>
-        <el-select v-model="heatId" style="width:200px">
+        <el-select v-model="heatId" style="width:200px" size="small">
           <el-option v-for="el in 6" :key="el" :label="`加热区${el}`" :value="el" />
         </el-select>
       </div>
       <div style="display: flex; justify-content: center;align-items: center; height:100px">
-        <el-button type="primary" @click="onStart">
+        <el-button type="primary" @click="onStart" size="small">
           开始执行
         </el-button>
       </div>