From 3b3add749840ae9e9930822586ae5cad4a35de0a Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 05 十二月 2023 23:02:02 +0800
Subject: [PATCH] 修改了target
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 94 ++++++++++++++++++++++++++++-------------------
1 files changed, 56 insertions(+), 38 deletions(-)
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index be92caf..6cbc6cc 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -4,12 +4,12 @@
<h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
<span>瀹跺涵璁惧璇︽儏</span>
<div style="display: flex; align-items: center;">
- <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+ <el-button size="mini" type="text" @click="checkNote" v-hasPermi="['person:information:memo']">
<div class="form" ><el-icon style="padding-right:110px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">澶囧繕鏈�</span></div>
</el-button>
- <el-button size="mini" type="text" @click="print()" v-hasPermi="['person:information:memo']">
+ <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
<div class="form" ><el-icon style="padding-right:110px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div>
@@ -51,9 +51,7 @@
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
- <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
- </el-form-item>
+
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
@@ -63,6 +61,9 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -114,19 +115,30 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
+ :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}">
- <img
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
class="el-upload-list__item-thumbnail"
- src="../../assets/401_images/401.gif"
- alt=""
+ :src="file.url"
style="width: 147px; height: 147px"
fit="cover"
- >
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/401_images/401.gif"
+ alt=""
+ style="width: 147px; height: 147px"
+ fit="cover">
+
<span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
<span
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
@@ -147,8 +159,7 @@
>
<i class="el-icon-delete"></i>
</span>
- </span>
-
+ </span>
</div>
@@ -161,7 +172,7 @@
</el-form>
<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>
@@ -179,7 +190,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:[
@@ -266,6 +280,7 @@
else{
document.title = "瀹跺涵璁惧璇︾粏淇℃伅";
this.$route.meta.title = "瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.btn = false;
this.isShow=false
}
@@ -369,9 +384,16 @@
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
+ // alert(file.url)
+ // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
+ // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+ //alert(this.dialogFileUrl)
const Base64 = require('js-base64').Base64
- this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- var myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -396,28 +418,6 @@
this.dsb = false
this.btn = true
},
- //鎵撳嵃
- print()
- {
-
- setTimeout(() => {
- // 鑾峰彇寰呮墦鍗扮殑鍐呭
- let printableContent = document.getElementById('printable-content').innerHTML;
- console.log(printableContent)
- // 鍒涘缓涓�涓柊鐨勭獥鍙ｅ苟鍔犺浇鎵撳嵃鍐呭
- let printWindow = window.open('', '_blank');
- printWindow.document.write('<html><head><title>鎵撳嵃鍐呭</title></head><body>' + printableContent + '</body></html>');
-
- // 鎵ц鎵撳嵃鎿嶄綔
- printWindow.document.close();
-
- // 濡傛灉鍐呭涓湁鍥剧墖鎴栧叾浠栭渶瑕佷竴瀹氭椂闂村姞杞界殑锛岃浣跨敤娉ㄩ噴涓殑寤舵椂鎵撳嵃
-
- printWindow.print()
- }, 1000)
- // printWindow.print();
-
- },
//鏌ョ湅澶囧繕鏈�
checkNote(row){
@@ -427,6 +427,7 @@
},
requestUpload(params)
{
+
var file = params.file;
var formData = new FormData();
formData.append('uploadFile', file);
@@ -446,6 +447,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;
+
+ });
})
}
@@ -454,7 +469,7 @@
}
</script>
-<style>
+<style scoped>
.mt
{
position: relative;
@@ -463,6 +478,9 @@
display: block;
}
+.hide /deep/ .el-upload--picture-card {
+ display: none;
+}
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
--
Gitblit v1.9.1