提交
This commit is contained in:
@@ -6,7 +6,8 @@
|
|||||||
<uni-easyinput disabled :value="form.inspectionPoint" placeholder="请输入巡检点"></uni-easyinput>
|
<uni-easyinput disabled :value="form.inspectionPoint" placeholder="请输入巡检点"></uni-easyinput>
|
||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
<uni-forms-item label="巡检要求" name="inspectionRequirements">
|
<uni-forms-item label="巡检要求" name="inspectionRequirements">
|
||||||
<uni-easyinput type="textarea" disabled :value="form.inspectionRequirements" placeholder="请输入巡检要求"></uni-easyinput>
|
<uni-easyinput type="textarea" disabled :value="form.inspectionRequirements"
|
||||||
|
placeholder="请输入巡检要求"></uni-easyinput>
|
||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
<uni-forms-item label="图片上传">
|
<uni-forms-item label="图片上传">
|
||||||
<view class="example-body">
|
<view class="example-body">
|
||||||
@@ -37,192 +38,327 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { addRecord } from "@/api/inspection/record.js"
|
import {
|
||||||
// 如果你已有 uploadImg 封装且内部就是 uni.uploadFile,可以继续用;
|
addRecord
|
||||||
// 但前提是它支持 H5 直接传 File 对象(不是 URL 字符串)。
|
} from "@/api/inspection/record.js"
|
||||||
// 这里我示范“直接用 uni.uploadFile”的写法,更稳妥。
|
// 如果你已有 uploadImg 封装且内部就是 uni.uploadFile,可以继续用;
|
||||||
import { addWatermarkToImage } from "@/utils/watermark.js"
|
// 但前提是它支持 H5 直接传 File 对象(不是 URL 字符串)。
|
||||||
import appConfig from '@/config'
|
// 这里我示范“直接用 uni.uploadFile”的写法,更稳妥。
|
||||||
const UPLOAD_URL = appConfig.baseUrl + "/common/upload" // 按你后端改
|
import {
|
||||||
|
addWatermarkToImage
|
||||||
|
} from "@/utils/watermark.js"
|
||||||
|
import appConfig from '@/config'
|
||||||
|
const UPLOAD_URL = appConfig.baseUrl + "/common/upload" // 按你后端改
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
form: {
|
form: {
|
||||||
inspectionType: 0,
|
inspectionType: 0,
|
||||||
inspectorId: this.$store.state.user.nickName,
|
inspectorId: this.$store.state.user.nickName,
|
||||||
inspectionPoint: "",
|
inspectionPoint: "",
|
||||||
inspectionRequirements: "",
|
inspectionRequirements: "",
|
||||||
inspectionImg: "",
|
inspectionImg: "",
|
||||||
ImgUrl: [], // 存后端返回的文件名/URL
|
ImgUrl: [], // 存后端返回的文件名/URL
|
||||||
remark: ""
|
remark: ""
|
||||||
},
|
},
|
||||||
img: [], // 绑定给 uni-file-picker 的预览列表
|
img: [], // 绑定给 uni-file-picker 的预览列表
|
||||||
sourceType: ['camera'],
|
sourceType: ['camera'],
|
||||||
msgType: '',
|
msgType: '',
|
||||||
messageText: '',
|
messageText: '',
|
||||||
isUploading: false,
|
isUploading: false,
|
||||||
isMobileBrowser: false
|
isMobileBrowser: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
async submit() {
|
async submit() {
|
||||||
if (this.isUploading) {
|
if (this.isUploading) {
|
||||||
this.showMessage('warning', '图片正在上传中,请稍等')
|
this.showMessage('warning', '图片正在上传中,请稍等')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!Array.isArray(this.form.ImgUrl) || this.form.ImgUrl.length === 0) {
|
if (!Array.isArray(this.form.ImgUrl) || this.form.ImgUrl.length === 0) {
|
||||||
this.showMessage('error', '请选择要上传的图片')
|
this.showMessage('error', '请选择要上传的图片')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.form.inspectionImg = this.joinList()
|
this.form.inspectionImg = this.joinList()
|
||||||
try {
|
try {
|
||||||
const res = await addRecord(this.form)
|
const res = await addRecord(this.form)
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.showMessage('success', '打卡成功')
|
this.showMessage('success', '打卡成功')
|
||||||
} else {
|
} else {
|
||||||
this.showMessage('error', '打卡失败')
|
this.showMessage('error', '打卡失败')
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.showMessage('error', `提交失败: ${err.message}`)
|
this.showMessage('error', `提交失败: ${err.message}`)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// uni-file-picker 删除:e.tempFile 里通常有 {url/path},与你传给 value 的结构需一致
|
// uni-file-picker 删除:e.tempFile 里通常有 {url/path},与你传给 value 的结构需一致
|
||||||
deleteImg(e) {
|
deleteImg(e) {
|
||||||
const url = e.tempFile?.url || e.tempFile?.path
|
const url = e.tempFile?.url || e.tempFile?.path
|
||||||
const idx = this.img.findIndex(x => x.url === url)
|
const idx = this.img.findIndex(x => x.url === url)
|
||||||
if (idx !== -1) {
|
if (idx !== -1) {
|
||||||
this.img.splice(idx, 1)
|
this.img.splice(idx, 1)
|
||||||
// 同步移除已上传结果(按你的业务,可以用同索引移除或按返回名移除)
|
// 同步移除已上传结果(按你的业务,可以用同索引移除或按返回名移除)
|
||||||
this.form.ImgUrl.splice(idx, 1)
|
this.form.ImgUrl.splice(idx, 1)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// 选择文件(支持多张)
|
// 选择文件(支持多张)
|
||||||
async upload(e) {
|
async upload(e) {
|
||||||
if (!e?.tempFiles?.length) return
|
if (!e?.tempFiles?.length) return
|
||||||
if (this.isUploading) {
|
if (this.isUploading) {
|
||||||
this.showMessage('warning', '图片正在上传中,请稍等')
|
this.showMessage('warning', '图片正在上传中,请稍等')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
this.isUploading = true
|
this.isUploading = true
|
||||||
try {
|
try {
|
||||||
// 逐张处理
|
// 逐张处理
|
||||||
for (const tf of e.tempFiles) {
|
for (const tf of e.tempFiles) {
|
||||||
await this.handleImageUpload(tf) // 这里传入每个 tempFile
|
await this.handleImageUpload(tf) // 这里传入每个 tempFile
|
||||||
}
|
}
|
||||||
this.showMessage('success', '图片处理/上传完成')
|
// this.showMessage('success', '图片处理/上传完成')
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
this.showMessage('error', `图片上传失败:${err.message || err}`)
|
this.showMessage('error', `图片上传失败:${err.message || err}`)
|
||||||
} finally {
|
} finally {
|
||||||
this.isUploading = false
|
this.isUploading = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// 单张处理:加水印 ->(可选)压缩 -> 上传
|
// 单张处理:加水印 ->(可选)压缩 -> 上传
|
||||||
async handleImageUpload(tempFile) {
|
async handleImageUpload(tempFile) {
|
||||||
// tempFile.file: H5 下是 File 对象;App/小程序是临时路径
|
// tempFile.file: H5 下是 File 对象;App/小程序是临时路径
|
||||||
const raw = tempFile.file || tempFile // 兼容各端
|
const raw = tempFile.file || tempFile // 兼容各端
|
||||||
// 生成水印文字
|
// 生成水印文字
|
||||||
const watermarkText = `${this.form.inspectionPoint || '未命名地点'} \n${this.getCurrentDate()}`
|
const watermarkText = `${this.form.inspectionPoint || '未命名地点'} \n${this.getCurrentDate()}`
|
||||||
// 加水印(返回 File/Blob)
|
// 加水印(返回 File/Blob)
|
||||||
const watermarked = await addWatermarkToImage(raw, watermarkText)
|
const watermarked = await addWatermarkToImage(raw, watermarkText)
|
||||||
// 可选:移动端压缩(你已有方法,按需启用)
|
// 可选:移动端压缩(你已有方法,按需启用)
|
||||||
// const finalFile = await this.compressImageForMobile(watermarked)
|
// const finalFile = await this.compressImageForMobile(watermarked)
|
||||||
|
|
||||||
const finalFile = watermarked
|
const finalFile = watermarked
|
||||||
|
|
||||||
// 预览:用本地 URL,仅供前端显示
|
// 预览:用本地 URL,仅供前端显示
|
||||||
const previewUrl = URL.createObjectURL(finalFile)
|
const previewUrl = URL.createObjectURL(finalFile)
|
||||||
this.img.push({
|
this.img.push({
|
||||||
url: previewUrl, // uni-file-picker 识别 url
|
url: previewUrl, // uni-file-picker 识别 url
|
||||||
name: finalFile.name || `image_${Date.now()}.jpg`,
|
name: finalFile.name || `image_${Date.now()}.jpg`,
|
||||||
extname: 'jpg'
|
extname: 'jpg'
|
||||||
})
|
})
|
||||||
|
|
||||||
// 真正上传:**不要传 previewUrl 字符串**,而是传二进制 `file`
|
// 真正上传:**不要传 previewUrl 字符串**,而是传二进制 `file`
|
||||||
// H5 下:uni.uploadFile 支持传 `file: File`
|
// H5 下:uni.uploadFile 支持传 `file: File`
|
||||||
const uploadedName = await this.uploadFileWithUni(finalFile)
|
const uploadedName = await this.uploadFileWithUni(finalFile)
|
||||||
// 回填后端返回的文件名/URL
|
// 回填后端返回的文件名/URL
|
||||||
this.form.ImgUrl.push(uploadedName)
|
this.form.ImgUrl.push(uploadedName)
|
||||||
},
|
},
|
||||||
|
|
||||||
// 用 uni.uploadFile 直接传二进制
|
// 用 uni.uploadFile 直接传二进制
|
||||||
uploadFileWithUni(file) {
|
uploadFileWithUni(file) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
uni.uploadFile({
|
uni.uploadFile({
|
||||||
url: UPLOAD_URL,
|
url: UPLOAD_URL,
|
||||||
name: 'file', // 后端接收字段名(按你的后端改)
|
name: 'file', // 后端接收字段名(按你的后端改)
|
||||||
file, // H5 直接传 File 对象(重点!)
|
file, // H5 直接传 File 对象(重点!)
|
||||||
// 如果后端还需要额外字段:
|
// 如果后端还需要额外字段:
|
||||||
// formData: { bizType: 'inspection' },
|
// formData: { bizType: 'inspection' },
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
try {
|
try {
|
||||||
const data = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
|
const data = typeof res.data === 'string' ? JSON.parse(res.data) : res
|
||||||
if (data.code === 200) {
|
.data
|
||||||
// 假设后端返回 { code:200, fileName: 'xxx.jpg', url:'...' }
|
if (data.code === 200) {
|
||||||
resolve(data.fileName || data.url)
|
// 假设后端返回 { code:200, fileName: 'xxx.jpg', url:'...' }
|
||||||
} else {
|
resolve(data.fileName || data.url)
|
||||||
reject(new Error(data.msg || '上传失败'))
|
} else {
|
||||||
}
|
reject(new Error(data.msg || '上传失败'))
|
||||||
} catch (e) {
|
}
|
||||||
reject(new Error('上传响应解析失败'))
|
} catch (e) {
|
||||||
}
|
reject(new Error('上传响应解析失败'))
|
||||||
},
|
}
|
||||||
fail: (err) => reject(err)
|
},
|
||||||
})
|
fail: (err) => reject(err)
|
||||||
})
|
})
|
||||||
},
|
})
|
||||||
|
},
|
||||||
|
|
||||||
cancel() {
|
cancel() {
|
||||||
uni.reLaunch({ url: '/pages/work/index' })
|
uni.reLaunch({
|
||||||
},
|
url: '/pages/work/index'
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
joinList() {
|
joinList() {
|
||||||
return this.form.ImgUrl.join(',')
|
return this.form.ImgUrl.join(',')
|
||||||
},
|
},
|
||||||
|
|
||||||
getCurrentDate() {
|
getCurrentDate() {
|
||||||
const now = new Date()
|
const now = new Date()
|
||||||
const y = now.getFullYear()
|
const y = now.getFullYear()
|
||||||
const m = String(now.getMonth() + 1).padStart(2, '0')
|
const m = String(now.getMonth() + 1).padStart(2, '0')
|
||||||
const d = String(now.getDate()).padStart(2, '0')
|
const d = String(now.getDate()).padStart(2, '0')
|
||||||
const hh = String(now.getHours()).padStart(2, '0')
|
const hh = String(now.getHours()).padStart(2, '0')
|
||||||
const mm = String(now.getMinutes()).padStart(2, '0')
|
const mm = String(now.getMinutes()).padStart(2, '0')
|
||||||
const ss = String(now.getSeconds()).padStart(2, '0')
|
const ss = String(now.getSeconds()).padStart(2, '0')
|
||||||
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
|
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
|
||||||
},
|
},
|
||||||
|
|
||||||
dialogConfirm() {
|
dialogConfirm() {
|
||||||
if (this.msgType === 'success') {
|
if (this.msgType === 'success') {
|
||||||
uni.reLaunch({ url: '/pages/work/index' })
|
uni.reLaunch({
|
||||||
}
|
url: '/pages/work/index'
|
||||||
},
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
showMessage(type, text) {
|
showMessage(type, text) {
|
||||||
this.msgType = type
|
this.msgType = type
|
||||||
this.messageText = text
|
this.messageText = text
|
||||||
this.$refs.alertDialog.open()
|
this.$refs.alertDialog.open()
|
||||||
},
|
},
|
||||||
|
|
||||||
checkMobileBrowser() {
|
checkMobileBrowser() {
|
||||||
const ua = navigator.userAgent.toLowerCase()
|
const ua = navigator.userAgent.toLowerCase()
|
||||||
const isMobile = /iphone|ipod|android|windows phone|mobile|blackberry/.test(ua)
|
const isMobile = /iphone|ipod|android|windows phone|mobile|blackberry/.test(ua)
|
||||||
this.isMobileBrowser = isMobile || window.__uniAppWebview
|
this.isMobileBrowser = isMobile || window.__uniAppWebview
|
||||||
}
|
},
|
||||||
},
|
// 计算目标尺寸
|
||||||
onLoad(option) {
|
calcTargetSize(imgW, imgH, maxW, maxH) {
|
||||||
this.form.inspectionPoint = option.inspectionPoint || ''
|
let w = imgW,
|
||||||
this.form.inspectionRequirements = option.inspectionRequirements || ''
|
h = imgH
|
||||||
this.form.inspectionPointId = option.inspectionPointId || ''
|
if (w > maxW || h > maxH) {
|
||||||
},
|
const ratio = Math.min(maxW / w, maxH / h)
|
||||||
mounted() {
|
w = Math.round(w * ratio)
|
||||||
this.checkMobileBrowser()
|
h = Math.round(h * ratio)
|
||||||
}
|
}
|
||||||
}
|
return {
|
||||||
|
w,
|
||||||
|
h
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// iOS 兼容 toBlob(老 Safari)
|
||||||
|
canvasToBlob(canvas, type, quality) {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
if (canvas.toBlob) {
|
||||||
|
canvas.toBlob((blob) => resolve(blob), type, quality)
|
||||||
|
} else {
|
||||||
|
// fallback: toDataURL -> Blob
|
||||||
|
const dataURL = canvas.toDataURL(type, quality)
|
||||||
|
const arr = dataURL.split(',')
|
||||||
|
const mime = arr[0].match(/:(.*?);/)[1]
|
||||||
|
const bstr = atob(arr[1])
|
||||||
|
let n = bstr.length
|
||||||
|
const u8arr = new Uint8Array(n)
|
||||||
|
while (n--) u8arr[n] = bstr.charCodeAt(n)
|
||||||
|
resolve(new Blob([u8arr], {
|
||||||
|
type: mime
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
// H5: DataURL -> File
|
||||||
|
blobToFile(blob, filename) {
|
||||||
|
return new File([blob], filename || `img_${Date.now()}.jpg`, {
|
||||||
|
type: blob.type || 'image/jpeg'
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 压缩图片(移动端友好)
|
||||||
|
* @param {File|Object|String} input H5: File;小程序/APP:tempFile 对象或临时路径
|
||||||
|
* @param {Object} opts { quality: 0.6, maxWidth: 1200, maxHeight: 1200, mime: 'image/jpeg' }
|
||||||
|
* @returns Promise<File|string> H5 返回 File;小程序/APP 返回压缩后的临时路径
|
||||||
|
*/
|
||||||
|
async compressImageForMobile(input, opts = {}) {
|
||||||
|
const {
|
||||||
|
quality = 0.6,
|
||||||
|
maxWidth = 1200,
|
||||||
|
maxHeight = 1200,
|
||||||
|
mime = 'image/jpeg'
|
||||||
|
} = opts
|
||||||
|
|
||||||
|
// #ifdef H5
|
||||||
|
// —— H5:使用 canvas 压缩 —— //
|
||||||
|
const file = input instanceof File ? input : (input?.file instanceof File ? input.file : null)
|
||||||
|
if (!file) return input // 没拿到 File 就直接返回原始值
|
||||||
|
|
||||||
|
// 读取为 dataURL
|
||||||
|
const dataURL = await new Promise((resolve, reject) => {
|
||||||
|
const reader = new FileReader()
|
||||||
|
reader.onload = () => resolve(reader.result)
|
||||||
|
reader.onerror = () => reject(new Error('文件读取失败'))
|
||||||
|
reader.readAsDataURL(file)
|
||||||
|
})
|
||||||
|
|
||||||
|
// 图片加载
|
||||||
|
const img = await new Promise((resolve, reject) => {
|
||||||
|
const image = new Image()
|
||||||
|
image.onload = () => resolve(image)
|
||||||
|
image.onerror = () => reject(new Error('图片加载失败'))
|
||||||
|
image.src = dataURL
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
w,
|
||||||
|
h
|
||||||
|
} = this.calcTargetSize(img.width, img.height, maxWidth, maxHeight)
|
||||||
|
// 如果尺寸本来就不大,直接走质量压缩(或原图)
|
||||||
|
const canvas = document.createElement('canvas')
|
||||||
|
canvas.width = w
|
||||||
|
canvas.height = h
|
||||||
|
const ctx = canvas.getContext('2d')
|
||||||
|
ctx.imageSmoothingQuality = 'high'
|
||||||
|
ctx.drawImage(img, 0, 0, w, h)
|
||||||
|
|
||||||
|
const blob = await this.canvasToBlob(canvas, mime, quality)
|
||||||
|
if (!blob) return file
|
||||||
|
|
||||||
|
// 若压缩后反而更大,则返回原图
|
||||||
|
if (blob.size > file.size) return file
|
||||||
|
|
||||||
|
return this.blobToFile(blob, file.name)
|
||||||
|
// #endif
|
||||||
|
|
||||||
|
// #ifdef MP-WEIXIN || APP-PLUS
|
||||||
|
// —— 小程序 / APP:使用 uni.compressImage —— //
|
||||||
|
// 允许传入 input 为对象(如 tempFile)或字符串路径
|
||||||
|
const srcPath = typeof input === 'string' ?
|
||||||
|
input :
|
||||||
|
(input?.tempFilePath || input?.path || input?.filePath)
|
||||||
|
|
||||||
|
if (!srcPath) return input
|
||||||
|
|
||||||
|
// uni.compressImage 文档:quality 0-100,部分端支持 width/height
|
||||||
|
const q = Math.max(1, Math.min(100, Math.round(quality * 100)))
|
||||||
|
|
||||||
|
// 尝试带上 width/height(端上不支持也会忽略)
|
||||||
|
const compressed = await new Promise((resolve, reject) => {
|
||||||
|
uni.compressImage({
|
||||||
|
src: srcPath,
|
||||||
|
quality: q,
|
||||||
|
width: maxWidth,
|
||||||
|
height: maxHeight,
|
||||||
|
success: (res) => resolve(res.tempFilePath || res.apFilePath || res.target ||
|
||||||
|
res.path),
|
||||||
|
fail: (err) => reject(err)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return compressed
|
||||||
|
// #endif
|
||||||
|
},
|
||||||
|
},
|
||||||
|
onLoad(option) {
|
||||||
|
this.form.inspectionPoint = option.inspectionPoint || ''
|
||||||
|
this.form.inspectionRequirements = option.inspectionRequirements || ''
|
||||||
|
this.form.inspectionPointId = option.inspectionPointId || ''
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.checkMobileBrowser()
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
@@ -273,6 +409,4 @@ export default {
|
|||||||
/* 使按钮平分可用空间 */
|
/* 使按钮平分可用空间 */
|
||||||
/* 可能还需要设置一些其他的样式来确保按钮看起来正确,比如 text-align, padding 等 */
|
/* 可能还需要设置一些其他的样式来确保按钮看起来正确,比如 text-align, padding 等 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
Reference in New Issue
Block a user