Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

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--

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: []