From 63403d1ce2a9a5d6d4512568a1913d403c5c2b72 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Thu, 13 Nov 2025 20:40:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alops-ui/src/views/device/files/index.vue      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
index 78a75fb4..4cf8edbe 100644
--- a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
@@ -104,7 +104,7 @@
     </el-row>
 
     <el-dialog :title="title" :visible.sync="open" width="800px"  append-to-body :close-on-click-modal="false">
-  <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+  <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
     <el-row :gutter="20">
       <el-col :span="12">
         <el-form-item label="设备编号" prop="equNumber">
@@ -147,6 +147,13 @@
           <el-input v-model="form.deviceLevel" placeholder="请输入设备级别" maxlength="30" />
         </el-form-item>
       </el-col>
+      <el-col :span="12">
+        <el-form-item label="启用状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择启用状态" style="width: 100%;">
+            <el-option v-for="dict in dict.type.device_disable" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="带外管理IP" prop="ip">
           <el-input v-model="form.ip" placeholder="请输入带外管理IP" maxlength="30" />
@@ -375,6 +382,9 @@ export default {
         equTypeId: [
           { required: true, message: "设备类型不能为空", trigger: "blur" }
         ],
+        status: [
+          { required: true, message: "启用状态不能为空", trigger: "blur" }
+        ],
         deviceLevel: [
           { required: true, message: "设备级别不能为空", trigger: "blur" },
         ],
@@ -521,7 +531,7 @@ export default {
         location: undefined,
         email: undefined,
         sex: undefined,
-        status: "0",
+        status: 1,
         remark: undefined,
         postIds: [],
         roleIds: []

From 7c1edbc1b3f3bd27efffefbd4946d8f7bd2649bc Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Thu, 13 Nov 2025 20:49:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ALOps_sys_fe/alops-ui/src/components/ImageUpload/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ALOps_sys_fe/alops-ui/src/components/ImageUpload/index.vue b/ALOps_sys_fe/alops-ui/src/components/ImageUpload/index.vue
index 075a7efd..44ceecb9 100644
--- a/ALOps_sys_fe/alops-ui/src/components/ImageUpload/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/components/ImageUpload/index.vue
@@ -203,7 +203,12 @@ export default {
     handleUploadSuccess(res, file) {
       console.log("%c 🍍: handleUploadSuccess -> res ", "font-size:16px;background-color:#dca159;color:white;", res)
       if (res.code === 200) {
-        this.uploadList.push({ name: res.fileName, url: res.url })
+        // 确保URL格式正确，添加baseUrl前缀
+        let url = res.url
+        if (url && url.indexOf(this.baseUrl) === -1 && !isExternal(url)) {
+          url = this.baseUrl + url
+        }
+        this.uploadList.push({ name: res.fileName, url: url })
         this.uploadedSuccessfully()
       } else {
         this.number--