From f1928380ea636d2cf7e7fbf6a30a894500d04642 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 4 Feb 2026 11:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/dev-type/index.vue                  | 2 +-
 src/views/basic/device-manage/addOrEditForm.vue     | 3 ++-
 src/views/basic/model-manage/useOrReturnFormNew.vue | 3 ++-
 src/views/basic/project/index.vue                   | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/dev-type/index.vue b/src/views/basic/dev-type/index.vue
index 51386a3..4e79b03 100644
--- a/src/views/basic/dev-type/index.vue
+++ b/src/views/basic/dev-type/index.vue
@@ -180,7 +180,7 @@ export default {
 
     // 删除按钮
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除设备类型编号为"' + row.id + '"的数据项？').then(async () => {
+      this.$modal.confirm('是否确认删除设备类型名称为"' + row.typeName + '"的数据项？').then(async () => {
         var data ={id:row.id}
         const res = await delDeviceTypeApi(data)
         if (res.code === 200) {
diff --git a/src/views/basic/device-manage/addOrEditForm.vue b/src/views/basic/device-manage/addOrEditForm.vue
index 5dfe334..59138ea 100644
--- a/src/views/basic/device-manage/addOrEditForm.vue
+++ b/src/views/basic/device-manage/addOrEditForm.vue
@@ -125,8 +125,9 @@ export default {
 
     setFormData(data) {
       const {deviceType, deviceCode, userId, remark ,id} = data
+      
       this.addOrEditForm = {
-        deviceType,
+        deviceType: deviceType ?? '',
         deviceCode,
         userId,
         remark,
diff --git a/src/views/basic/model-manage/useOrReturnFormNew.vue b/src/views/basic/model-manage/useOrReturnFormNew.vue
index aa8346e..a482ec2 100644
--- a/src/views/basic/model-manage/useOrReturnFormNew.vue
+++ b/src/views/basic/model-manage/useOrReturnFormNew.vue
@@ -11,7 +11,7 @@
       <el-form-item label="模型文件" prop="files">
         <el-upload
           class="upload-demo"
-          action="/dev-api/common/upload"
+          action="/water-design-api/common/upload"
           :on-success="handleSuccess"
           :on-remove="handleRemove"
           :before-upload="beforeUpload"
@@ -107,6 +107,7 @@ export default {
         files: [],
         modelUrl: '',
         projectId: '',
+        uploadFileUrl: process.env.VUE_APP_BASE_API + '/common/upload',
       },
       useOrReturnFormRules: {
         files: [{required: true, message: '请上传模型文件', trigger: 'change'}],
diff --git a/src/views/basic/project/index.vue b/src/views/basic/project/index.vue
index db64137..f0e060e 100644
--- a/src/views/basic/project/index.vue
+++ b/src/views/basic/project/index.vue
@@ -377,7 +377,8 @@ export default {
         this.open = true
         this.title = '修改项目'
         // this.form.unit = response.data.unitId
-        this.form.level = response.data.proId
+       const level = response.data.level;
+        this.form.level = level ? Number(level) : '';
       })
     },
     /** 提交按钮 */
@@ -462,7 +463,7 @@ export default {
     handleDelete(row) {
       const proIds = row.proId || this.ids
       this.$modal
-        .confirm('是否确认删除项目编号为"' + proIds + '"的数据项？')
+        .confirm('是否确认删除项目名称为"' + row.proName + '"的数据项？')
         .then(function () {
           return delProject(proIds)
         })