From ec88d953dcf33ec0f3f5bf8facbb05878cea5acb Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 21:33:51 +0800
Subject: [PATCH] 修改了代码
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 432 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 360 insertions(+), 72 deletions(-)
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 6e583d4..742076f 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -24,7 +24,7 @@
<el-input v-model="formData.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
- <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
<el-form-item label="璐拱浜�" prop="buyer">
@@ -40,8 +40,11 @@
</el-input>
</el-form-item>
<el-form-item label="鏄惁娉ㄩ攢" prop="status">
- <el-select v-model="formData.status=== 1 ? '鏄�':'鍚�'" placeholder="璇烽�夋嫨鏄惁娉ㄩ攢" clearable :style="{width: '100%'}" :disabled="dsb" >
- </el-select>
+ <el-select v-model="formData.status" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+
</el-form-item>
<!-- <el-form-item label="瀹跺涵鍙�" prop="familyId">
@@ -64,8 +67,10 @@
:disabled="!btn"
:class="{ hide: !btn }"
+ :on-change="handleChange"
+ :auto-upload="false"
>
- <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
@@ -103,23 +108,32 @@
</div>
</el-upload>
-
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ v-if="btn"
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
- :file-list="fileListOther"
+
class="upload-demo"
multiple
list-type="picture-card"
:on-preview="handleFileCardPreview"
- :on-remove="handleRemoveFile"
- :http-request="requestUpload"
- :show-file-list="true"
+ ref="upload1"
+ :on-remove="handleRemoveFile"
+ :http-request="requestUpload1"
+ :file-list="fileListOther"
+ :on-change="handleChange1"
+ :auto-upload="false"
: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 slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -132,7 +146,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">
@@ -165,7 +179,14 @@
</el-upload>
-
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ v-if="btn"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
+ <h4 class="form-header"> </h4>
<el-form-item size="large">
<el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
@@ -193,12 +214,16 @@
// 鏁版嵁鑼冨洿閫夐」
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,
@@ -211,9 +236,19 @@
content: undefined,
remark: undefined,
status:undefined,
- url: undefined,
+ url: "",
happenTime:undefined
},
+ typeOptions2: [
+ {
+ value: '鍚�',
+ label: '鍚�',
+ },
+ {
+ value: '鏄�',
+ label: '鏄�',
+ }
+ ],
desurl:'',
dialogImageUrl: '',
dialogVisible: false,
@@ -283,29 +318,56 @@
this.btn = false;
this.isShow=false
}
-
let _this = this
if (id) {
this.loading = true;
getEquipmentInfo(id).then((response) => {
this.formData = response.data;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
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)
+ 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].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})
+ }
- if (_this.fot.includes(pth) === true)
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
- else {
- // alert(paths[i])
- let nms = paths[i].split("\/")
- let nm = nms[nms.length - 1]
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _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;
});
@@ -315,6 +377,45 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getEquipmentInfo(id).then((response) => {
+
+ this.formData = response.data;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ 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;
+ });
+ }
+ },
/** 鏌ヨ绫诲埆淇℃伅 */
// getCateInfor()
// {
@@ -327,27 +428,48 @@
// })
// },
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
+
this.$refs['elForm'].validate(valid => {
-
+if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
if (valid) {
if (this.formData.id != undefined) {
updateEquipment(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ console.log(this.$route)
+
+ this.$tab.closePage({ path: "/familymodel/zfDevice" })
+ // this.$store.dispatch("tagsView/delView",{ path: "/familymodel/zfDevice" }); //鍏抽棴褰撳墠椤�
+ //this.$store.dispatch('tagsView/addView', { title:"ZfDevice",path: "/familymodel/zfDevice" })
+ //this.$store.dispatch('tagsView/addIframeView', { title:"ZfDevice",ZfDevicepath: "/familymodel/zfDevice" })
+ // this.$tab.refreshPage({ path: "/familymodel/zfDevice" });
+ this.$router.replace({ path: "/familymodel/zfDevice?cache=true" });
+ // this.$router.push("/familymodel/zfDevice");
+ window.location.url="https://www.bendudu.com/familymodel/zfDevice"
+
// this.open = false;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
this.btn=false
+ this.$router.replace({ title:"ZfDevice",path: "/familymodel/zfDevice"});
+ // 鍦ㄤ笅涓�涓簨浠跺惊鐜腑鍒锋柊椤甸潰
+ this.$nextTick(() => {
+ window.location.reload();
+ });
+ //this.$router.push("/familymodel/zfDevice");
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
-
+if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
}
}
})
@@ -369,18 +491,93 @@
})
},
handleRemoveFile(file) {
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
+ {
+ if(this.fileListOther[i].res==false)
+ res = true
+ else
+ {
+ 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)
+ ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ let uls = ""
+ this.fileListOther.map(function (elem){
+ if(elem.res==false)
+ uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ this.formData.url = ul+","+uls;
+ // alert(this.formData.url)
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+
+ if(res==true){
+ updateEquipment(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+
+ });
}
},
handleRemove(file) {
- for(let i = 0; i < this.fileList.length; i++)
- {
- if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
- }
+ //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
+ // alert(this.fileList.length)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ {
+ //鍘熸潵鍥惧儚鏍囪涓篺alse
+ //alert(this.fileList[i].res)
+ if(this.fileList[i].res==false)
+ res = true
+ else
+ {
+ // alert(this.uploadFileList.length)
+ // alert(87)
+ this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+ // alert(this.uploadFileList.length)
+ }
+ this.$delete(this.fileList,i);
+
+ }
+ }
+ let ul = ""
+ this.fileList.map(function (elem){
+ if(elem.res==false)
+ ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ let uls = ""
+ this.fileListOther.map(function (elem){
+ if(elem.res==false)
+ uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ this.formData.url = ul+","+uls;
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+
+ if(res==true){
+ updateEquipment(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ });
+ }
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -425,46 +622,137 @@
this.$router.push("/familymodel/Device/memo/" + id );
},
- requestUpload(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})
+ //鑷畾涔変笂浼犳柟娉�
+ 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, fileListOther12) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ // this.uploadFileList.push(file.raw);
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url,res:true})
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
- }
- 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)
- // alert(87)
- updateEquipment(_this.formData).then(response => {
- this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
- // this.open = false;
-
- });
- })
+ var formData = new FormData();
+ //this.$refs.upload1.submit();
+ // alert(this.uploadFileList1.length)
+ // formData.append('uploadFile', file);
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
- }
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
+ })
+ console.log(this.uploadFileList1)
+ let _this = this
+
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ _this.uploadFileList1 = []
+ if(_this.formData.status=='鏄�')
+ _this.formData.status = 1
+ else
+ _this.formData.status = 0
+
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ updateEquipment(_this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+ this.getData()
+ this.fileListOther1=[]
+ });
+ })
+
+ },
+ 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
+
+
+ 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)
+ // alert(response.fileNames)
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ _this.uploadFileList = []
+ // alert(87)
+ if(_this.formData.status=='鏄�')
+ _this.formData.status = 1
+ else
+ _this.formData.status = 0
+
+ updateEquipment(_this.formData).then(response => {
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
+ // }
+ // 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)
+ {
+ // alert(123)
+ // this.uploadFileList1.push(params.file);
+ // console.log("-----------")
+ //console.log(this.uploadFileList1)
+ },
}
}
--
Gitblit v1.9.1