From b8670cd94a61846ac63573f724fcf91d8dd7be88 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 29 八月 2023 21:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/collection/index.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 2ea46c5..c5dbaa9 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -209,6 +209,9 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<template slot-scope="scope" >
@@ -315,7 +318,7 @@
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
@@ -365,6 +368,7 @@
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -395,8 +399,8 @@
//瀵煎叆鎺ュ彛鍑芥暟
-import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index";
-import {enload} from "@/api/doctor";
+import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel,enload} from "@/api/collection/index";
+
import {Message} from "element-ui";
@@ -443,7 +447,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鏀惰棌涓庤崳瑾夎褰�
id:undefined,
@@ -765,8 +769,13 @@
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
},
requestUpload(params)
{
@@ -774,10 +783,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