From a7d09900629902c8170f639f070fc6da8d168e0b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 17:55:50 +0800
Subject: [PATCH] 测试
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 0ea9816..b8cbcd4 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -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">
@@ -190,7 +193,10 @@
return {
cdi:"瀹跺涵璁惧淇℃伅",
udi:"瀹跺涵璁惧淇敼",
- 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:[
@@ -211,6 +217,16 @@
url: undefined,
happenTime:undefined
},
+ typeOptions2: [
+ {
+ value: '鍚�',
+ label: '鍚�',
+ },
+ {
+ value: '鏄�',
+ label: '鏄�',
+ }
+ ],
desurl:'',
dialogImageUrl: '',
dialogVisible: false,
@@ -271,11 +287,11 @@
this.btn= jd
this.dsb = !jd
this.isShow=true
- document.title = "淇敼瀹跺涵璁惧璇︾粏淇℃伅";
+ // document.title = "淇敼瀹跺涵璁惧璇︾粏淇℃伅";
this.$route.meta.title = "淇敼瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "瀹跺涵璁惧璇︾粏淇℃伅";
+ // document.title = "瀹跺涵璁惧璇︾粏淇℃伅";
this.$route.meta.title = "瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
this.btn = false;
this.isShow=false
@@ -287,6 +303,10 @@
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++)
{
@@ -333,18 +353,28 @@
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("淇敼鎴愬姛");
// this.open = false;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
this.btn=false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
-
+if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
}
}
})
@@ -444,6 +474,20 @@
_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)
+ // alert(87)
+ updateEquipment(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
}
--
Gitblit v1.9.1