工单信息修正、小程序登录修正
This commit is contained in:
@@ -21,6 +21,10 @@ export const fileAPI = {
|
||||
if (param.uploader) {
|
||||
formData.append('uploader', param.uploader);
|
||||
}
|
||||
// 显式传递原始文件名,确保后端保存正确的文件名
|
||||
if (param.file.name) {
|
||||
formData.append('fileName', param.file.name);
|
||||
}
|
||||
const response = await api.upload<TbSysFileDTO>(`${this.baseUrl}/upload`, formData);
|
||||
return response.data;
|
||||
},
|
||||
|
||||
@@ -9,9 +9,10 @@ export const fileAPI = {
|
||||
* 上传单个文件(uni-app 版本)
|
||||
* @param filePath 文件临时路径
|
||||
* @param param 文件上传参数
|
||||
* @param originalFileName 原始文件名(可选,用于保存正确的文件名)
|
||||
* @returns Promise<ResultDomain<TbSysFileDTO>>
|
||||
*/
|
||||
uploadFile(filePath: string, param?: FileUploadParam): Promise<ResultDomain<TbSysFileDTO>> {
|
||||
uploadFile(filePath: string, param?: FileUploadParam, originalFileName?: string): Promise<ResultDomain<TbSysFileDTO>> {
|
||||
return uploadFile<TbSysFileDTO>({
|
||||
url: `${this.baseUrl}/upload`,
|
||||
filePath: filePath,
|
||||
@@ -19,7 +20,8 @@ export const fileAPI = {
|
||||
formData: {
|
||||
module: param?.module || '',
|
||||
optsn: param?.optsn || '',
|
||||
uploader: param?.uploader || ''
|
||||
uploader: param?.uploader || '',
|
||||
fileName: originalFileName || ''
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
@@ -164,9 +164,9 @@
|
||||
// 开发环境:使用mock数据
|
||||
if (isMockMode.value) {
|
||||
userInfo.value = {
|
||||
wechatId: '17857100377',
|
||||
wechatId: '17857100378',
|
||||
username: '访客用户',
|
||||
phone: '17857100377',
|
||||
phone: '17857100378',
|
||||
userId: ''
|
||||
}
|
||||
await doIdentify()
|
||||
@@ -176,12 +176,12 @@
|
||||
// 切换mock用户(开发调试用)
|
||||
function switchMockUser() {
|
||||
uni.showActionSheet({
|
||||
itemList: ['员工 (17857100375)', '访客 (17857100377)'],
|
||||
itemList: ['员工 (17857100375)', '访客 (17857100378)'],
|
||||
success: (res) => {
|
||||
if (res.tapIndex === 0) {
|
||||
userInfo.value = { wechatId: '17857100375', username: '员工用户', phone: '17857100375', userId: '' }
|
||||
} else {
|
||||
userInfo.value = { wechatId: '17857100377', username: '访客用户', phone: '17857100377', userId: '' }
|
||||
userInfo.value = { wechatId: '17857100378', username: '访客用户', phone: '17857100378', userId: '' }
|
||||
}
|
||||
doIdentify()
|
||||
}
|
||||
@@ -190,6 +190,12 @@
|
||||
|
||||
// 调用identify接口
|
||||
async function doIdentify() {
|
||||
// 先清空本地存储的登录信息,确保重新识别身份
|
||||
uni.removeStorageSync('token')
|
||||
uni.removeStorageSync('userInfo')
|
||||
uni.removeStorageSync('loginDomain')
|
||||
uni.removeStorageSync('wechatId')
|
||||
|
||||
uni.showLoading({ title: '登录中...' })
|
||||
try {
|
||||
const res = await guestAPI.identify({
|
||||
|
||||
@@ -816,7 +816,7 @@ function chooseAssignFile() {
|
||||
const uploadRes = await fileAPI.uploadFile(file.path, {
|
||||
module: 'workcase',
|
||||
optsn: workcase.workcaseId || 'temp'
|
||||
})
|
||||
}, file.name)
|
||||
if (uploadRes.success && uploadRes.data?.fileId) {
|
||||
assignForm.files.push({
|
||||
name: file.name,
|
||||
@@ -842,12 +842,12 @@ function chooseAssignFile() {
|
||||
uni.showLoading({ title: '上传中...' })
|
||||
try {
|
||||
for (const filePath of imgRes.tempFilePaths) {
|
||||
const fileName = filePath.split('/').pop() || '图片.jpg'
|
||||
const uploadRes = await fileAPI.uploadFile(filePath, {
|
||||
module: 'workcase',
|
||||
optsn: workcase.workcaseId || 'temp'
|
||||
})
|
||||
}, fileName)
|
||||
if (uploadRes.success && uploadRes.data?.fileId) {
|
||||
const fileName = filePath.split('/').pop() || '图片'
|
||||
assignForm.files.push({
|
||||
name: fileName,
|
||||
fileId: uploadRes.data.fileId
|
||||
@@ -974,12 +974,13 @@ async function chooseFaultImages() {
|
||||
// 上传图片到服务器
|
||||
uni.showLoading({ title: '上传中...' })
|
||||
try {
|
||||
const uploadPromises = res.tempFilePaths.map(filePath =>
|
||||
fileAPI.uploadFile(filePath, {
|
||||
const uploadPromises = res.tempFilePaths.map((filePath, index) => {
|
||||
const fileName = `故障图片_${Date.now()}_${index}.jpg`
|
||||
return fileAPI.uploadFile(filePath, {
|
||||
module: 'workcase',
|
||||
optsn: workcase.workcaseId || 'temp'
|
||||
})
|
||||
)
|
||||
}, fileName)
|
||||
})
|
||||
|
||||
const results = await Promise.all(uploadPromises)
|
||||
|
||||
@@ -1022,10 +1023,11 @@ async function chooseNameplateImage() {
|
||||
// 上传铭牌照片到服务器
|
||||
uni.showLoading({ title: '上传中...' })
|
||||
try {
|
||||
const fileName = `设备铭牌_${Date.now()}.jpg`
|
||||
const result = await fileAPI.uploadFile(res.tempFilePaths[0], {
|
||||
module: 'workcase',
|
||||
optsn: workcase.workcaseId || 'temp'
|
||||
})
|
||||
}, fileName)
|
||||
|
||||
if (result.success && result.data?.fileId) {
|
||||
workcase.deviceNamePlateImg = result.data.fileId
|
||||
@@ -1187,7 +1189,7 @@ async function chooseProcessFile() {
|
||||
const result = await fileAPI.uploadFile(file.path, {
|
||||
module: 'workcase',
|
||||
optsn: workcase.workcaseId || 'temp'
|
||||
})
|
||||
}, file.name)
|
||||
if (result.success && result.data?.fileId) {
|
||||
return {
|
||||
name: file.name,
|
||||
|
||||
Reference in New Issue
Block a user