From 3b7ed32fb0d22be7d1b7e23e7101e29a5b2dfb40 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 28 二月 2024 20:33:50 +0800
Subject: [PATCH] 修改了备忘录内容
---
ruoyi-ui/src/views/clean/index.vue | 182 ++++++++++++++++++++++++++++++---------------
1 files changed, 122 insertions(+), 60 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 6949e12..05d0701 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -177,6 +177,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:clean:info']"
>淇敼</el-button>
@@ -184,6 +185,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
@@ -252,6 +254,10 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ ref="upload"
+
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
@@ -282,26 +288,41 @@
</span>
</div>
</el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
:file-list="fileListOther"
class="upload-demo"
multiple
-
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
:show-file-list="true"
>
-
+<!--
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div> -->
<template #tip>
<div class="el-upload__tip">
</div>
</template>
</el-upload>
-
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
<h4 class="form-header"> </h4>
@@ -368,6 +389,9 @@
fileList:[
],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
fileListOther:[
],
@@ -383,7 +407,7 @@
location: undefined,
remark: undefined,
happenTime: undefined,
- url: undefined,
+ url: "",
},
// 鑿滃崟鍒楄〃
@@ -523,7 +547,11 @@
for(let i = 0; i < this.fileList.length; i++)
{
if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
+
}
},
@@ -612,19 +640,18 @@
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
+ {
+
this.$delete(this.fileListOther,i);
+ this.$delete(this.uploadFileList1,i);
+
+ }
}
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
+
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -648,54 +675,89 @@
});
},
- requestUpload(params) {
-
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- this.uploading1 = true;
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ //alert(fileList1.length)
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ handleChange1(file, fileOtherList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
+
+ var formData = new FormData();
+ //this.$refs.upload1.submit();
+ // formData.append('uploadFile', file);
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+ return
+ }
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+
+ let _this = this
+
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ _this.uploadFileList1 = []
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ _this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+ })
+
+ },
+ picUpload()
+ {
+ //alert(89)
+ var formData = new FormData();
+ //alert(this.uploadFileList.length)
+ console.log(this.uploadFileList)
+ //this.$refs.upload.submit();
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+ //console.log(this.uploadFileList)
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ //alert(90)
+ let _this = this
+ //alert(9)
uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- this.uploading1 = false;
- this.$modal.msgSuccess("涓婁紶鎴愬姛");
- if(_this.fot.includes(pth) === true)
- {
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
- }
-
- else{
- // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
- }
- })
- },
- requestUpload1(params)
- {
- var file = params.file;
- 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})
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
- }
-
- // else{
- // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
- //
- // }
- })
-
- },
+ // alert("dds")
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ //alert( _this.formDat.url)
+ _this.uploadFileList = []
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+ });
+ },
+ requestUpload(params) {
+
+ // this.uploadFileList.push(params.file);
+ },
+ requestUpload1(params)
+ {
+ // this.uploadFileList1.push(params.file);
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
--
Gitblit v1.9.1