From b075e99a05e05649d24ed59a74cae29fc3192875 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 10 十一月 2024 22:20:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/clean/cleanInfo.vue | 106 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 25cb049..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>
@@ -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">
@@ -281,11 +285,11 @@
},
typeOptions: [{
- value: '0',
+ value: '淇濇磥',
label: '淇濇磥',
},
{
- value: '1',
+ value: '鏀剁撼',
label: '鏀剁撼',
}],
}
@@ -316,6 +320,11 @@
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++)
{
@@ -324,12 +333,26 @@
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()
@@ -345,7 +368,7 @@
}
this.loading = false;
});
- this.getCateInfor()
+ // this.getCateInfor()
}
},
@@ -358,6 +381,11 @@
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++)
{
@@ -380,10 +408,11 @@
}
}
}
+ }
_this.fileListOther = _this.fileListOther1
this.loading = false;
});
- this.getCateInfor()
+ // this.getCateInfor()
}
},
@@ -432,16 +461,27 @@
// 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 = '淇濇磥'
}
}
@@ -515,8 +555,16 @@
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;
});
@@ -560,8 +608,16 @@
})
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 = '淇濇磥'
});
}
@@ -617,6 +673,11 @@
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 = []
@@ -626,6 +687,10 @@
// this.open = false;
this.getData()
this.fileListOther1=[]
+ if(this.formData.kind==1)
+ this.formData.kind = '鏀剁撼'
+ else
+ this.formData.kind = '淇濇磥'
});
})
@@ -646,7 +711,10 @@
})
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)
@@ -672,6 +740,10 @@
// 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;
});
--
Gitblit v1.9.1