From eaafe26cb6aa070b002037ede1c7de74b6b5600b Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 26 三月 2024 16:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/travel/travelInfo.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
index 6ffd7a3..977ca4e 100644
--- a/ruoyi-ui/src/views/travel/travelInfo.vue
+++ b/ruoyi-ui/src/views/travel/travelInfo.vue
@@ -148,7 +148,7 @@
class="el-upload-list__item-thumbnail"
src="../../assets/401_images/401.gif"
alt=""
- style="width: 100%; height: 100%"
+ style="width: 147px; height: 147px"
fit="cover">
<span class="el-upload-list__item-actions">
@@ -186,7 +186,7 @@
</el-form>
</div>
<el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
</el-dialog>
</div>
</template>
@@ -205,7 +205,10 @@
return {
cdi:"瀹跺涵澶т簨璁颁俊鎭�",
udi:"瀹跺涵澶т簨璁颁慨鏀�",
- fot:[".jpg",".jif","png"],
+ // 鏁版嵁鑼冨洿閫夐」
+ 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:[
@@ -276,11 +279,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.isShow=true
this.btn = false;
@@ -299,12 +302,21 @@
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
if (_this.fot.includes(pth) === true)
+ {
+ if(paths[i].includes("https"))
+ _this.fileList.push({name:paths[i],url: paths[i]})
+ else
_this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ }
else {
// alert(paths[i])
+ if(paths[i].includes("https"))
+ _this.fileListOther.push({name:paths[i],url: paths[i]})
+ else{
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]})
+ }
}
}
}
@@ -465,7 +477,7 @@
display: block;
position: absolute;
}
-.hide .el-upload--picture-card {
+.hide /deep/ .el-upload--picture-card {
display: none;
}
.form{
--
Gitblit v1.9.1