From fbca70fb635b386eb0ec09e47bd11c5c51e059c2 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 15 八月 2023 21:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/healthy/healthyInfo.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index c98eddd..7a634b1 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -39,7 +39,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -89,8 +90,8 @@
:http-request="requestUpload"
:show-file-list="true"
>
-
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -129,7 +130,6 @@
</el-upload>
-
<el-form-item size="large">
<el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
@@ -164,6 +164,7 @@
dsb:true,
btn:false,
isShow:true,
+ uploading: false,
formData: {
type: undefined,
happenTime: undefined,
@@ -395,10 +396,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
--
Gitblit v1.9.1