From ec44c553382a88f9674dd87f1d1b0ec9a1947e47 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 26 Feb 2024 15:13:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes-ui-admin-vue3/src/layout/components/warnmessage.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue
index 8dea5f46..2ca8b230 100644
--- a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue
@@ -1,8 +1,8 @@
 <template>
   <transition name="slide-right">
-    <div class="warn" v-if="showWarning" :draggable="true" @dragstart="onDragStart" @dragend="onDragEnd" @mousedown.prevent.stop="onMouseDown" @mousemove="onMouseMove" @mouseup="onMouseUp">
+    <div class="warn"  :class="{ 'no-data': !warnings.length }" v-if="showWarning" :style="{ display: warnings.length ? 'block' : 'none' }" :draggable="true" @dragstart="onDragStart" @dragend="onDragEnd" @mousedown.prevent.stop="onMouseDown" @mousemove="onMouseMove" @mouseup="onMouseUp">
       <div class="warntitle">
-        <span class="titleText"> 设计预警通知</span>
+        <span class="titleText">设计预警通知</span>
         <div>
           <span @click="ExpandWran" class="warnclose"> <el-icon>
               <Expand />

From 0517c2bbd3e953634cf6b81dbbb7ff2e6ecb1c01 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 26 Feb 2024 15:16:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue | 2 +-
 mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue
index 997aed35..ca0a8a77 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue
@@ -303,7 +303,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="equipId" align="center" min-width="120">
-                    <template #header> 设备信息 </template>
+                    <template #header> 设备型号 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.equipId`"  class="mb-0px!">
                         <el-select disabled v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
index 0cd0138e..bffcc912 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
@@ -307,7 +307,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="equipId" align="center" min-width="120">
-                    <template #header> 设备信息 </template>
+                    <template #header> 设备型号 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.equipId`" class="mb-0px!">
                         <el-select v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">

From 3dc3812fc3a8e171d720835664189412487d338d Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 26 Feb 2024 15:19:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue
index a4aad45f..e6765536 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue
@@ -6,8 +6,8 @@
     <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
-      <el-form-item label="工序编号" prop="code">
-        <el-input v-model="queryParams.code" placeholder="工序编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      <el-form-item label="工序编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="工序编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item label="工序名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="工序名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
@@ -45,7 +45,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
       <!-- <el-table-column label="自增字段，唯一" align="center" prop="id" /> -->
       <el-table-column type="index" width="100" label="序号" align="center" />
-      <el-table-column label="工序编号" align="center" prop="code" />
+      <el-table-column label="工序编码" align="center" prop="code" />
       <el-table-column label="工序名称" align="center" prop="name" />
       <el-table-column label="所属车间" align="center" prop="wname" />
       <el-table-column label="是否需要报工" align="center" prop="isReport">