From 53d76ae60199fe1bdf5e1e5c9bafda755afb66bf Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 11:14:37 +0800
Subject: [PATCH] 修改了数据
---
ruoyi-ui/src/views/self/show.vue | 15 +++--
ruoyi-ui/src/api/bignote/index.js | 2
ruoyi-ui/vue.config.js | 4
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 129 +++++++++++++++++++++++++++----------------
ruoyi-ui/src/views/clean/cleanInfo.vue | 1
ruoyi-ui/src/router/index.js | 2
6 files changed, 95 insertions(+), 58 deletions(-)
diff --git a/ruoyi-ui/src/api/bignote/index.js b/ruoyi-ui/src/api/bignote/index.js
index 4d2fc6a..5ab250f 100644
--- a/ruoyi-ui/src/api/bignote/index.js
+++ b/ruoyi-ui/src/api/bignote/index.js
@@ -48,7 +48,7 @@
//涓婁紶鏂囦欢
export function uploadPic(data) {
return request({
- url: '/common/upload',
+ url: '/common/uploads',
method: 'post',
data: data
})
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 38144f8..e143174 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -445,7 +445,7 @@
path: 'memo/:id(\\d+)',
component: () => import('@/views/self/memo'),
name: 'memo',
- meta: { title: '涓汉璁颁簨鏈�'}
+ meta: { title: '涓汉绠�鍘�'}
}
]
},
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 59ce0a7..f5e460f 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -39,21 +39,25 @@
<!-- <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>-->
-
+ <!-- :http-request="requestUpload" -->
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
multiple
- :http-request="requestUpload"
+ ref="upload"
+
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
+ :auto-upload="false"
:disabled="!btn"
:class="{ hide: !btn }"
>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+
+ <!-- <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
@@ -90,8 +94,15 @@
</div>
- </el-upload>
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action="#"
@@ -178,6 +189,7 @@
fileList:[
],
+ fileList1:[],
uploadFileList:[],
fileListOther:[
@@ -271,6 +283,7 @@
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
}
}
+ _this.fileList1 = _this.fileList
}
this.loading = false;
});
@@ -335,12 +348,13 @@
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;
-
- });
+
}
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
},
handleRemove(file) {
for(let i = 0; i < this.fileList.length; i++)
@@ -354,13 +368,15 @@
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;
-
- });
-
+ //alert(this.formData.url)
+
}
+ updateFamilyevent(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -400,54 +416,71 @@
},
//鑷畾涔変笂浼犳柟娉�
- handleChange(file, fileList) {
+ handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
- this.uploadFileList.push(file.raw);
+ // this.uploadFileList.push(file.raw);
console.log("=========5555=========")
//console.log(file)
- console.log(this.uploadFileList)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
},
- async requestUpload(params)
- {
- // alert(124)
- var file = params.file;
+ picUpload()
+ {
+ var formData = new FormData();
+ this.$refs.upload.submit();
+
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- //alert(34)
- this.uploading1 = true;
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ let _this = this
- await 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)
+
+ uploadPic(formData).then(response => {
+ // console.log(response.originalFilenames)
+ // console.log(response.urls)
+ // console.log(response.fileNames)
+ // console.log(response.newFileNames)
+ // 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(",")
+ //console.log(_this.fileList)
+
+ _this.formData.url = _this.formData.url+","+response.fileNames
+
// alert(87)
updateFamilyevent(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
});
- }
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ // }
+ // else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
- }
- })
+ // }
+ });
+ },
+ requestUpload(params)
+ {
+ //alert(124)
+ this.uploadFileList.push(params.file);
+ //alert(34)
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 682cd56..e228639 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -457,6 +457,7 @@
{
var file = params.file;
var formData = new FormData();
+ // console.log(file)
formData.append('uploadFile', file);
let _this = this
this.uploading1 = true;
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index ec4ab2b..fd5e651 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -7,7 +7,7 @@
></el-button>
</el-backtop>
<h1 style="font-size:21px;padding-top:30px;display: flex;">
- <span>涓汉绠�鍘�</span>
+ <span>涓汉璁颁簨鏈�</span>
<div class="button-container" >
<el-button
size="mini"
@@ -41,7 +41,7 @@
<el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
<div class="form" ><el-icon style="padding-right:100px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉璁颁簨鏈�</span></div>
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉绠�鍘�</span></div>
</el-button>
</div>
</h1>
@@ -1246,7 +1246,7 @@
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listNote(this.queryParams1).then(response => {
- alert(321)
+ // alert(321)
// console.log(response.data)
this.noteList = response.data.data;
@@ -1609,11 +1609,13 @@
//鏂板涓昏缁忓巻鐨勪繚瀛�
submitDataScope: function() {
let _this = this
- this.$refs["elForm"].validate(valid => {
+ this.$refs["elForm1"].validate(valid => {
if (valid) {
+ //alert(1235)
+ _this.dialogVisible.open = false;
addExperience(_this.formDat).then(response => {
_this.$modal.msgSuccess("鏂板鎴愬姛");
- _this.dialogVisible.open = false;
+
_this.getList();
});
}
@@ -1627,9 +1629,10 @@
submitDataScope2: function() {
this.$refs["elForm"].validate(valid => {
if (valid) {
+ this.dialogVisible.relation1 = false;
addRelation(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.dialogVisible.relation1 = false;
+
this.getList();
});
}
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 1bde388..4381803 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,8 +35,8 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `https://10.39.18.174:8080/`,
- // target: 'https://www.bendudu.com:8080/',
+ // target: `https://192.168.1.5:8080/`,
+ target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.1