From 6a01952b50578ea2b7a7634aefc501ab682ced4c Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 19 Feb 2024 13:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9E=8B=E5=8F=B7=20UI/UX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

设备型号 UI/UX
---
 mes-ui/mes-ui-admin-vue3/src/views/heli/equip/EquipForm.vue | 6 +++---
 mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue     | 6 +++---
 sql/v1.3.0/1.structure.sql                                  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/EquipForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/EquipForm.vue
index 4120705c..6fb2c7c9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/EquipForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/EquipForm.vue
@@ -7,8 +7,8 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="设备名称" prop="name">
-        <el-input v-model="formData.name" placeholder="设备名称" />
+      <el-form-item label="设备型号" prop="name">
+        <el-input v-model="formData.name" placeholder="设备型号" />
       </el-form-item>
       <el-form-item label="模具类型" prop="mouldTypeId">
         <!-- <el-input v-model="formData.mouldTypeId" placeholder="模具类型" /> -->
@@ -58,7 +58,7 @@ const formData = ref({
   status: undefined,
 })
 const formRules = reactive({
-  name: [{ required: true, message: '设备名称 唯一不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '设备型号 唯一不能为空', trigger: 'blur' }],
   mouldTypeId: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue
index cc3373dc..e55b02ba 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue
@@ -8,10 +8,10 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="设备名称" prop="name">
+      <el-form-item label="设备型号" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="设备名称"
+          placeholder="设备型号"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -48,7 +48,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="设备名称" align="center" prop="name" />
+      <el-table-column label="设备型号" align="center" prop="name" />
       <el-table-column label="模具类型" align="center" prop="mouldTypeId" >
         <template #default="scope">
           {{ mouldTypeList.find((mould) => mould.id == scope.row.mouldTypeId)?.name }}
diff --git a/sql/v1.3.0/1.structure.sql b/sql/v1.3.0/1.structure.sql
index f0371415..9587e614 100644
--- a/sql/v1.3.0/1.structure.sql
+++ b/sql/v1.3.0/1.structure.sql
@@ -15,7 +15,7 @@ ALTER TABLE project_sale_order ADD COLUMN `project_name` VARCHAR (255) NOT NULL
 UPDATE project_sale_order set project_name = mould_name;
 ALTER TABLE project_sale_order DROP COLUMN `mould_name`;
 
-
+DROP TABLE IF EXISTS `base_equip`;
 CREATE TABLE `base_equip` (
                               `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增字段，唯一',
                               `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设备名称 唯一',