From 7fc578dc2032fac935267e92208f7f11384e3800 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 28 十一月 2024 08:36:36 +0800
Subject: [PATCH] 修改了相关bug
---
ruoyi-ui/src/views/clean/cleanInfo.vue | 217 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 164 insertions(+), 53 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 967a0ac..6fc5633 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -14,15 +14,19 @@
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
<el-form-item label="绫诲瀷" prop="kind">
- <template v-if="dsb">
+ <!-- <template v-if="dsb">
<el-input v-model="formData.kind === 1 ? '鏀剁撼':'淇濇磥'" :disabled="true"></el-input>
</template>
<template v-else>
<el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}">
- <el-option label="鏀剁撼" value="1"></el-option>
- <el-option label="淇濇磥" value="0"></el-option>
+ <el-option label="淇濇磥" value='0'></el-option>
+ <el-option label="鏀剁撼" value='1'></el-option>
</el-select>
- </template>
+ </template> -->
+ <el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼 " clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
<el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -57,7 +61,7 @@
action="#"
list-type="picture-card"
multiple
-
+
:http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
@@ -143,7 +147,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- src="../../assets/401_images/401.gif"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 147px; height: 147px"
fit="cover">
@@ -213,16 +217,17 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
-
-
+
+
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
fileListOther:[
],
+ fileListOther1:[],
dsb:true,
btn:false,
isShow:true,
@@ -280,11 +285,11 @@
},
typeOptions: [{
- value: '0',
+ value: '淇濇磥',
label: '淇濇磥',
},
{
- value: '1',
+ value: '鏀剁撼',
label: '鏀剁撼',
}],
}
@@ -315,20 +320,39 @@
this.loading = true;
getCLeanInfo(id).then((response) => {
this.formData = response.data;
+ console.log(this.formData)
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
if(paths[i]!="") {
-
+
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
// alert(pth)
if (_this.fot.includes(pth) === true)
- {
- if(paths[i][0]=="/")
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
- else
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
- }
+ // {
+ // if(paths[i][0]=="/")
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ // else
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ // }
+ {
+ if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: paths[i],res:false})
+ }else{
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ }
+
+ }
else {
// alert(paths[i])
// alert()
@@ -338,18 +362,60 @@
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
else
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-
+
}
}
}
this.loading = false;
});
- this.getCateInfor()
+ // this.getCateInfor()
}
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getCLeanInfo(id).then((response) => {
+ this.formData = response.data;
+ // if(this.formData.kind==1)
+ // this.formData.kind = '鏀剁撼'
+ // else
+ // this.formData.kind = '淇濇磥'
+ if(response.data.url!=null){
+ let paths = response.data.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ // alert(pth)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+ // this.getCateInfor()
+
+ }
+ },
getSrc1(type) {
if (type === 0) {
return '鍩洪噾'
@@ -386,25 +452,36 @@
},
submitForm() {
- 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
+ // 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
this.$refs['elForm'].validate(valid => {
-
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
if (valid) {
if (this.formData.id != undefined) {
updateClean(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
// this.open = false;
this.btn=false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
}
}
@@ -461,10 +538,10 @@
this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
}
this.$delete(this.fileListOther,i);
-
+
}
}
-
+
let ul = ""
this.fileList.map(function (elem){
if(elem.res==false)
@@ -478,15 +555,23 @@
this.formData.url = ul+","+uls;
// alert(this.formData.url)
if(res==true){
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
updateClean(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
// this.open = false;
-
+
});
}
-
-
+
+
},
handleRemove(file) {
//鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
@@ -508,7 +593,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -523,11 +608,19 @@
})
this.formData.url = ul+","+uls;
if(res==true){
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
updateClean(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
});
}
-
+
},
handleDownload(url) {
var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
@@ -544,16 +637,16 @@
},
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,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -564,7 +657,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -572,14 +665,19 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -587,27 +685,36 @@
updateClean(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData()
+ this.fileListOther1=[]
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
});
})
-
+
},
picUpload()
{
-
+
var formData = new FormData();
//this.$refs.upload.submit();
//alert(this.uploadFileList.length)
if(this.uploadFileList.length==0){
this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
let _this = this
-
-
+
+ if(this.formData.kind=='鏀剁撼')
+ this.formData.kind = 1
+ else
+ this.formData.kind = 0
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -633,17 +740,21 @@
// alert(87)
updateClean(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
-
+
handleEdit()
{
this.dsb = false
@@ -651,12 +762,12 @@
},
requestUpload(params)
{
-
+
},
requestUpload1(params)
{
-
+
},
--
Gitblit v1.9.1