Merge branch 'master' of https://gitea.s1f.ren/lin/007_back

src/views/acs/images/ContainerImages.vue

@@ -211,6 +211,7 @@
           <div class="image-icon-upload">
             <img v-if="form.image_ico" :src="mainUrl + form.image_ico" class="preview-icon" />
             <el-upload
+              ref="uploadRef"
               class="image-upload"
               action="#"
               :auto-upload="false"
@@ -442,6 +443,7 @@ const selectedFileName = ref(null)
 
 // 表单对象和规则
 const imageFormRef = ref(null)
+const uploadRef = ref(null)
 const planlist = ref([])
 
 const form = reactive({
@@ -691,7 +693,26 @@ const handleFileChange = (file) => {
         ElMessage.success('上传成功')
         selectedFileName.value = null
         form.image_ico = '/v1/attachment/get_attachment?aid=' + res.data.data.attachment_id
+        // 清空文件列表，允许再次选择文件
+        if (uploadRef.value) {
+          uploadRef.value.clearFiles()
+        }
+      } else {
+        ElMessage.error(res.data.message || '上传失败')
+        // 失败时也清空文件列表
+        if (uploadRef.value) {
+          uploadRef.value.clearFiles()
+        }
+        selectedFileName.value = null
       }
+    }).catch((error) => {
+      console.error('上传文件失败:', error)
+      ElMessage.error('上传文件失败，请重试')
+      // 异常时也清空文件列表
+      if (uploadRef.value) {
+        uploadRef.value.clearFiles()
+      }
+      selectedFileName.value = null
     })
   } else {
     selectedFileName.value = null // 如果用户取消选择，清空文件名
@@ -1093,6 +1114,7 @@ onMounted(() => {
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-line-clamp: 2;
+  line-clamp: 2;
   -webkit-box-orient: vertical;
 }
 

src/views/acs/nodes/VmDetail.vue

@@ -2385,7 +2385,7 @@ const submitAddVolume = async () => {
   const userInfoRes = await getUserInfo();
   console.log("获取用户信息",userInfoRes)
   user_id.value = userInfoRes.data.user_id;
-  console.log("user_id",user_id)
+  console.log("user_id",user_id.value)
   console.log("size",volumeForm.size)
   await volumeFormRef.value.validate(async (valid) => {
     if (valid) {
@@ -2394,7 +2394,7 @@ const submitAddVolume = async () => {
         const res = await addVolume({
           instance_id: route.query.instance_id,
           size: String(volumeForm.size),
-          user_id:user_id
+          user_id: user_id.value
         });
         console.log("添加数据卷112",res)