From 0edf2cc107cd03e8e007f97f38387d66f480cd3d Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 16:54:53 +0800
Subject: [PATCH] 修改家大事记 的图片文件上传 直调接口
---
ruoyi-ui/src/views/marry/index.vue | 3
ruoyi-ui/src/views/bignote/index.vue | 129 ++++++++++++++++---------
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 109 ++++++++++++++++++---
3 files changed, 177 insertions(+), 64 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index cdd0807..f97c54c 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -35,23 +35,25 @@
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
- <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
- </el-form-item>
+<!-- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">-->
+<!-- <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>-->
+<!-- </el-form-item>-->
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
multiple
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
:http-request="requestUpload"
:file-list="fileList"
:disabled="!btn"
:class="{ hide: !btn }"
+
>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
- <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -67,7 +69,8 @@
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
- <i class="el-icon-zoom-in"></i>
+<!-- <i class="el-icon-zoom-in"></i>-->
+ <i v-if="isImage(file)" class="el-icon-zoom-in"></i>
</span>
<span
@@ -98,7 +101,7 @@
list-type="picture-card"
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
+ :http-request="requestUpload1"
:show-file-list="true"
:disabled="!btn"
:class="{ hide: !btn }"
@@ -178,7 +181,7 @@
btn:false,
isShow:true,
uploading: false,
-
+ uploading1:false,
formData: {
id: undefined,
title: undefined,
@@ -196,11 +199,7 @@
message: '璇疯緭鍏ュぇ浜嬫爣棰�',
trigger: 'blur'
}],
- familyId: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
- trigger: 'blur'
- }],
+
people: [{
required: true,
message: '璇疯緭鍏ヤ汉鐗�',
@@ -320,6 +319,18 @@
{
if(this.fileListOther[i].url==file.url)
this.$delete(this.fileListOther,i);
+ 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.formData.url = ul+","+uls;
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
}
},
handleRemove(file) {
@@ -327,6 +338,19 @@
{
if(this.fileList[i].url==file.url)
this.$delete(this.fileList,i);
+ 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.formData.url = ul+","+uls;
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
+
}
},
handleFileCardPreview(file){
@@ -358,7 +382,50 @@
this.btn = true
this.isShow=false
},
+ isImage(file) {
+
+ let pth = file.name.substr(file.name.length - 4, file.name.length);
+
+ return this.fot.includes(pth) ;
+ },
requestUpload(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+ this.uploading1 = true;
+
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ this.uploading1= false;
+ console.log(_this.fot.includes(pth))
+ // debugger
+ if(_this.fot.includes(pth) === true)
+ {
+ _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ 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.formData.url = ul+","+uls
+ console.log(this.formData.url)
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
+ }
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+
+ },
+ requestUpload1(params)
{
var file = params.file;
var formData = new FormData();
@@ -368,7 +435,7 @@
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("涓婁紶鎴愬姛");
+ // this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -377,7 +444,19 @@
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+ 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.formData.url = ul+","+uls
+ console.log(this.formData.url)
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+ // this.btn=false
+ });
}
})
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 22a487f..0ffa7b8 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -250,40 +250,39 @@
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
:http-request="requestUpload"
:file-list="fileList"
>
-
- <i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url"
- alt=""
- style="width: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{ file }">
+ <template v-if="fileList">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%; object-fit: cover;"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ </template>
<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
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
-
-
+ <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -294,7 +293,7 @@
multiple
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
+ :http-request="requestUpload1"
:show-file-list="true"
>
@@ -369,7 +368,8 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
fileList:[],
fileListOther:[],
dsb:true,
@@ -444,6 +444,13 @@
},
methods: {
+
+ isImage(fileType) {
+ return fileType.startsWith('image/');
+ },
+ isInFot(fileName) {
+ return this.fot.includes(fileName);
+ },
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -568,6 +575,7 @@
{
if(this.fileList[i].url==file.url)
this.$delete(this.fileList,i);
+
}
},
handleRemoveFile(file) {
@@ -597,23 +605,47 @@
addFamilyevent(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ 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]);
+ }
this.getList();
});
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- 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)
+ requestUpload(params) {
+
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+ this.uploading1 = true;
+ 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();
@@ -624,16 +656,17 @@
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)
+ if(_this.fot.includes(pth) !== true)
{
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
- }
-
- else{
+ // _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})
+ //
+ // }
})
},
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 3427608..5a69ee0 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -768,10 +768,11 @@
//涓汉淇℃伅
listMarry(this.queryParams).then(response => {
- if(response.data.length == 0){
+ if(response.data.length === 0){
this.loading = false;
this.marryList={};
this.oldSpouseList = {};
+ console.log(this.marryList)
}
else{
this.marryList = response.data;
--
Gitblit v1.9.1