From cf2391a86bdea88196d49cd33949570f74c0985d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 22 九月 2025 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
frontWuhu/.env.development | 4 ++--
frontWuhu/src/components/business/OperaApplicationInfoWindow.vue | 44 ++++++++++++++++++++++++++++++++++++++++++--
frontWuhu/src/components/business/OperaDetailsBWindow.vue | 4 ++++
3 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/frontWuhu/.env.development b/frontWuhu/.env.development
index 60e8a48..efb6344 100644
--- a/frontWuhu/.env.development
+++ b/frontWuhu/.env.development
@@ -8,8 +8,8 @@
# VVUE_APP_API_BASE_URL='http://192.168.0.102:10031'
# 浠诲悍鏈湴
-# VUE_APP_API_BASE_URL='http://192.168.1.54:10031'
-VUE_APP_API_BASE_URL = 'http://wuhu.dtkey.cn/hfznzzzd'
+VUE_APP_API_BASE_URL='http://192.168.1.54:10031'
+# VUE_APP_API_BASE_URL = 'http://wuhu.dtkey.cn/hfznzzzd'
#鐒︽澗鏈湴
# VUE_APP_API_BASE_URL='http://192.168.0.36:10011'
diff --git a/frontWuhu/src/components/business/OperaApplicationInfoWindow.vue b/frontWuhu/src/components/business/OperaApplicationInfoWindow.vue
index 0a370c2..c981c58 100644
--- a/frontWuhu/src/components/business/OperaApplicationInfoWindow.vue
+++ b/frontWuhu/src/components/business/OperaApplicationInfoWindow.vue
@@ -12,6 +12,21 @@
<el-form-item label="搴旂敤LOGO" prop="logo">
<UploadAvatarImage :uploadData="uploadData" :file="file" @uploadSuccess="getFiles" />
</el-form-item>
+ <el-form-item label="搴旂敤闄勪欢" prop="mutifileUrl">
+ <el-upload
+ class="upload-demo"
+ :action="uploadImgUrl"
+ :data="uploadData"
+ accept=".pdf,.jpg,.png,.jpeg,.zip,.rar"
+ :limit="1"
+ :on-exceed="exceed"
+ :on-remove="remove"
+ :on-success="getFileSuccess"
+ :file-list="fileList">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶PDF銆佸浘鐗囥�佸帇缂╁寘鏍煎紡鏂囦欢</div>
+ </el-upload>
+ </el-form-item>
<el-form-item label="鏈嶅姟鍟�" prop="serverId">
<el-select v-model="form.serverId" placeholder="璇烽�夋嫨">
<el-option
@@ -47,12 +62,14 @@
components: { GlobalWindow, UploadAvatarImage, RichEditor },
data () {
return {
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadPicture',
// 琛ㄥ崟鏁版嵁
form: {
id: null,
serverId: '',
name: '',
logo: '',
+ mutifileUrl: '',
lables: '',
introduction: '',
details: ''
@@ -78,6 +95,7 @@
imgurl: '',
imgurlfull: ''
},
+ fileList: []
}
},
created () {
@@ -89,12 +107,13 @@
methods: {
open (title, target) {
this.title = title
+ this.file.imgurl = ''
+ this.file.imgurlfull = ''
+ this.fileList = []
this.getFetchList()
this.visible = true
// 鏂板缓
if (target == null) {
- this.file.imgurl = ''
- this.file.imgurlfull = ''
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
@@ -111,8 +130,29 @@
}, 500)
this.file.imgurl = target.logo
this.file.imgurlfull = target.fullLog
+ if (target.fullMutifileUrl) {
+ this.fileList.push({
+ name: '搴旂敤闄勪欢',
+ url: target.fullMutifileUrl
+ })
+ }
})
},
+ getFileSuccess(response) {
+ this.form.mutifileUrl = response.data.imgaddr
+ // response.data.originname
+ this.fileList.push({
+ name: '搴旂敤闄勪欢',
+ url: response.data.url
+ })
+ },
+ exceed() {
+ this.$message.warning('鍙兘涓婁紶涓�涓檮浠�')
+ },
+ remove() {
+ this.form.mutifileUrl = ''
+ this.fileList = []
+ },
getFiles(e) {
this.file.imgurl = e.imgurl
this.file.imgurlfull = e.imgurlfull
diff --git a/frontWuhu/src/components/business/OperaDetailsBWindow.vue b/frontWuhu/src/components/business/OperaDetailsBWindow.vue
index 59b2fcd..e11756e 100644
--- a/frontWuhu/src/components/business/OperaDetailsBWindow.vue
+++ b/frontWuhu/src/components/business/OperaDetailsBWindow.vue
@@ -16,6 +16,7 @@
</div>
<div class="com_info_text1">鏈嶅姟鍟嗭細{{info.serverName}}</div>
<div class="com_info_text">{{info.introduction}}</div>
+ <div class="com_info_text" style="color: #216EEE; cursor: pointer;" v-if="info.fullMutifileUrl" @click="openFile">搴旂敤闄勪欢</div>
<div class="com_info_btn" @click="openT" v-if="[1, 2].includes(userInfo.type)">鑱旂郴鎴戜滑</div>
<div class="com_info_x"></div>
<div class="com_info_content" v-html="info.details"></div>
@@ -87,6 +88,9 @@
this.info.lablesList = this.info.lables.split(',') || []
this.visible = true
},
+ openFile() {
+ window.open(this.info.fullMutifileUrl)
+ },
openT() {
this.formData.name = ''
this.formData.phone = ''
--
Gitblit v1.9.3