From 4bb9f72e6caf2a1a5d54d62cca3bcba2ad2de825 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 24 八月 2023 22:37:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/note/propertyInfo.vue | 100 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
index 0e37094..af1442a 100644
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ b/ruoyi-ui/src/views/note/propertyInfo.vue
@@ -16,7 +16,10 @@
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
<el-form-item label="绫诲瀷" prop="type">
- <el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍨�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ :disabled="item.disabled"></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime" >
@@ -44,7 +47,7 @@
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
@@ -52,7 +55,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"
@@ -62,29 +66,29 @@
fit="cover"
:preview-src-list="[file.url]"
>
- <span class="el-upload-list__item-actions" >
- <span
+ <span class="el-upload-list__item-actions">
+ <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
- <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
- class="el-upload-list__item-delete"
- @click="handleDownload(file.url)"
- >
- <i class="el-icon-download"></i>
- </span>
- <span
- v-if="isShow"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
+ class="el-upload-list__item-delete"
+ @click="handleDownload(file.url)"
+ >
+ <i class="el-icon-download"></i>
+ </span>
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
</div>
@@ -102,8 +106,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"
@@ -113,27 +117,28 @@
fit="cover"
>
<span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handleFileCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
- <span
+ <span
- class="el-upload-list__item-delete"
- @click="handleDownload(file.url)"
- >
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleDownload(file.url)"
+ >
<i class="el-icon-download"></i>
</span>
- <span
- v-if="isShow"
- class="el-upload-list__item-delete"
- @click="handleRemoveFile(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
</div>
@@ -174,6 +179,7 @@
dsb:true,
btn:false,
isShow:true,
+ uploading: false,
formData: {
type: undefined,
@@ -238,7 +244,7 @@
else{
document.title = "瀹跺涵璧勪骇璇︾粏淇℃伅";
this.$route.meta.title = "瀹跺涵璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- this.isShow=true
+ this.isShow=false
}
let _this = this
@@ -380,9 +386,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.indexOf(pth) !== -1)
{
_this.fileList.push({"name":response.data.fileName, "url":response.data.url})
--
Gitblit v1.9.1