diff --git a/env/.env.dev b/env/.env.dev index fa95a88..aaf55ce 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -7,9 +7,9 @@ VITE_API_URL = '/proxyApi' # 开发环境接口地址 # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 -VITE_proxyTarget = 'http://192.168.0.234:28080' # 马帅 +# VITE_proxyTarget = 'http://192.168.0.234:28080' # 马帅 # VITE_proxyTarget = 'http://192.168.2.122:28080' # 梁超 -# VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务 +VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试÷服务 # VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务 # VITE_proxyTarget = 'http://192.168.2.75:28080' # 盛旭 diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue index 4196b6c..644e6e8 100644 --- a/src/views/equip/detail.vue +++ b/src/views/equip/detail.vue @@ -174,7 +174,7 @@
- - diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue index 2f504a0..ad1a08e 100644 --- a/src/views/equip/list.vue +++ b/src/views/equip/list.vue @@ -479,7 +479,10 @@ const lowerClassData = async () => { const getCompanyAddressListData = async () => { const res: any = await getCompanyListApi() const addressList = res.data.map((e: any) => { - return { ...e, name: e.companyName, value: e.companyId, isChecked: false, index: 4 } + // console.log('🚀 ~ addressList ~ e:', e) + if (e.isShow) { + return { ...e, name: e.companyName, value: e.companyId, isChecked: false, index: 4 } + } }) screenChooseList[4].list.push(...addressList) } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 771b22d..84c163e 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -527,7 +527,7 @@ onMounted(async () => { margin-top: 10px; // padding: 0 10px; color: #000; - height: 32px; + min-height: 32px; line-height: 32px; text-align: center; padding: 2px 20px; diff --git a/src/views/parity/index.vue b/src/views/parity/index.vue index 634e58c..4fe3a10 100644 --- a/src/views/parity/index.vue +++ b/src/views/parity/index.vue @@ -350,7 +350,9 @@ const getCompanyAddressListData = async () => { return { ...e, name: e.areaName, value: e.areaCode, isChecked: false, index: 1 } }) const companyList = res.data.map((e: any) => { - return { ...e, name: e.companyName, value: e.companyId, isChecked: false, index: 2 } + if (e.isShow) { + return { ...e, name: e.companyName, value: e.companyId, isChecked: false, index: 2 } + } }) screenChooseList[1].list.push(...addressList) diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue index 673b95f..ebd16ca 100644 --- a/src/views/user/goodsManagement/index.vue +++ b/src/views/user/goodsManagement/index.vue @@ -951,12 +951,11 @@ const headerInfo = reactive({ }) // 文件上传前处理-上传大小 const beforeUpload = (file: any) => { - if (file.size / 1024 / 1024 > 2) { + if (file.size / 1024 / 1024 > 10) { ElMessage({ type: 'error', - message: '上传文件大小不能超过5M!', + message: '上传文件大小不能超过10M!', }) - // this.$message.error({ message: `上传文件大小不能超过5M!`,}); return false } } @@ -1210,9 +1209,19 @@ const handleRemove = (file: any, row: any) => { const handleSuccess = (uploadFile: any, row: any) => { console.log('🚀 ~ handleSuccess ~ uploadFile:', uploadFile) if (uploadFile.code == 200) { + let fileUrl = '' + console.log('输出env.VITE_API_URL', import.meta.env.VITE_API_URL) + if (import.meta.env.VITE_API_URL == '/proxyApi') { + console.log('走入公司测试环境----------', uploadFile.data.url) + fileUrl = uploadFile.data.url // 公司-测试环境 + } else { + console.log('走入宏源测试环境----------', uploadFile.data.url) + fileUrl = 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + uploadFile.data.url // 宏源-测试环境 + } + console.log('输出fileUrl----------', fileUrl) row.examinationPdf.push({ fileName: uploadFile.data.name, - fileUrl: uploadFile.data.url, + fileUrl: fileUrl, }) } console.log('🚀 ~ handleSuccess ~ row:', row) diff --git a/src/views/user/lessor/quality-manage/index.vue b/src/views/user/lessor/quality-manage/index.vue index 94b85c5..3247185 100644 --- a/src/views/user/lessor/quality-manage/index.vue +++ b/src/views/user/lessor/quality-manage/index.vue @@ -255,7 +255,8 @@ - 支持格式：.jpg、.png、.pdf、.doc、.docx 单个文件大小不能超过5M，最多可上传1个文件 + 支持格式：.jpg、.png、.pdf、.doc、.docx + 单个文件大小不能超过10M，最多可上传1个文件 @@ -263,7 +264,7 @@ @@ -689,9 +703,19 @@ const onAddQualityRecord = (row: any) => { const onFileChange = (fileList: any) => { addOrEditForm.value.fileInfoTempList = [] const fileListTemp = fileList.map((e: any) => { + let fileUrl = '' + console.log('输出env.VITE_API_URL', import.meta.env.VITE_API_URL) + if (import.meta.env.VITE_API_URL == '/proxyApi') { + console.log('走入公司测试环境----------', e.url) + fileUrl = e.url // 公司-测试环境 + } else { + console.log('走入宏源测试环境----------', e.url) + fileUrl = 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/uploads' + e.url // 宏源-测试环境 + } + console.log('输出fileUrl----------', fileUrl) return { fileName: e.name, - fileUrl: e.url, + fileUrl: fileUrl, } })