环境配置 合并代码

This commit is contained in:
13218645326 2023-12-08 19:59:01 +08:00
commit 8a20f51f23
4 changed files with 24 additions and 14 deletions

1
env/.env.dev vendored
View File

@ -13,7 +13,6 @@ VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
# VITE_proxyTarget = 'http://10.40.92.253:8080' # 牛 (个人中心 基础信息企业申请认证) # VITE_proxyTarget = 'http://10.40.92.253:8080' # 牛 (个人中心 基础信息企业申请认证)
VITE_UPLOAD_URL='apiUpload

2
env/.env.serve1 vendored
View File

@ -16,3 +16,5 @@ VITE_LocalFlag = 0

2
env/.env.sit vendored
View File

@ -3,4 +3,4 @@ VITE_ENV = 'production'
VITE_BUILD_MODE = 'sit' VITE_BUILD_MODE = 'sit'
# 线上环境接口地址 # 线上环境接口地址
VITE_API_URL = 'http://192.168.1.3:10086' VITE_API_URL = 'http://112.29.103.165:1619/zlpt/'

View File

@ -2,7 +2,7 @@
<div class="upload_ss_c"> <div class="upload_ss_c">
<!--action="/api/abk/web/v1/resource/file" --> <!--action="/api/abk/web/v1/resource/file" -->
<el-upload <el-upload
:action="props.actionUrl" :action="actionUrl"
:auto-upload="props.autoUpload" :auto-upload="props.autoUpload"
style="width: 100%" style="width: 100%"
:on-success="(response:any, file:any) => successUpload(response, file)" :on-success="(response:any, file:any) => successUpload(response, file)"
@ -20,7 +20,10 @@
:on-progress="(event:any, file:any, fileList:any) => onProgressFn(event, file, fileList)" :on-progress="(event:any, file:any, fileList:any) => onProgressFn(event, file, fileList)"
:list-type="props.listType"> :list-type="props.listType">
<!-- 上传的按钮 或者 icon 通过具名插槽的方式 --> <!-- 上传的按钮 或者 icon 通过具名插槽的方式 -->
<slot name="default"></slot> <div>
<slot name="default"></slot>
</div>
<slot name="textContent"></slot> <slot name="textContent"></slot>
</el-upload> </el-upload>
<el-progress v-if="showProcessFlag && processFlag" :percentage="loadProcess"></el-progress> <el-progress v-if="showProcessFlag && processFlag" :percentage="loadProcess"></el-progress>
@ -31,13 +34,15 @@
import { ref, nextTick } from 'vue' import { ref, nextTick } from 'vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { Base64 } from 'js-base64' import { Base64 } from 'js-base64'
import {apiUpload} from "http/api/myInfo" const tmpUploadUrl = import.meta.env.VITE_API_URL +"/zlpt-file/file/cos/upload"
console.log("tmpUploadUrl",tmpUploadUrl)
const actionUrl = ref(tmpUploadUrl)
const props = defineProps({ const props = defineProps({
actionUrl: { // actionUrl: {
// // //
type: String, // type: String,
default: "" // default: ""
}, // },
width: { width: {
// //
type: String, type: String,
@ -165,6 +170,7 @@
}) })
} }
const beforeUpload = (file:any) => { const beforeUpload = (file:any) => {
console.log("file",file)
const { name = '', size } = file const { name = '', size } = file
if (size > props.maxSize * 1024 * 1000) { if (size > props.maxSize * 1024 * 1000) {
ElMessage({ ElMessage({
@ -173,11 +179,14 @@
}) })
return false return false
} }
let names = name.split(".")
if (!props.acceptTypeList.includes(name.split('.').pop()) + '.') { let currentName = names[names.length-1]
console.log("acceptTypeListacceptTypeList",props.acceptTypeList,currentName)
console.log("name.split().pop()",)
if (!props.acceptTypeList.includes( '.'+currentName) ) {
ElMessage({ ElMessage({
type: 'warning', type: 'warning',
message: `文件格式仅支持${props.acceptTypeList.join(',')}M` message: `文件格式仅支持${props.acceptTypeList.join(',')}`
}) })
return false return false
} }