|
|
@@ -37,7 +37,8 @@
|
|
|
</view>
|
|
|
|
|
|
<!-- 新增弹窗 -->
|
|
|
- <view v-if="isShowAdd" :style="{ padding: imageSrcView ? '295px 0px 10px 0px' : '54px 0px 10px 0px' }"
|
|
|
+ <view v-if="isShowAdd"
|
|
|
+ :style="{ padding: imageSrcView ? '295px 0px 10px 0px' : imageSrc ? '330px 0px 10px 0px' : saveImg ? '330px 0px 10px 0px' : '54px 0px 10px 0px' }"
|
|
|
:class="statusShow == 'edit' ? 'bot-gas-list1' : 'bot-gas-list'">
|
|
|
<view class="top-dialog-area">
|
|
|
<view class="dialog-item">
|
|
|
@@ -358,7 +359,6 @@ export default {
|
|
|
quality: 0.85,
|
|
|
minSize: 640 //最小压缩尺寸，图片尺寸小于该时值不压缩，非H5平台有效。若需要忽略该设置，可设置为一个极小的值，比如负数。
|
|
|
}).then((res) => {
|
|
|
- console.log(res, '9900===')
|
|
|
that.imageSrc = res
|
|
|
// 压缩成功回调
|
|
|
that.loading = true
|
|
|
@@ -2399,40 +2399,30 @@ export default {
|
|
|
getTaskImg() {
|
|
|
let that = this
|
|
|
let apiUrlImg = `${configService.apiUrlP}:6008`
|
|
|
- let form = new FormData()
|
|
|
- // form.append('reportdate', '2025-04-10')
|
|
|
- // form.append('checkpath', '22106工作面')
|
|
|
- // form.append('order', '中班')
|
|
|
- // form.append('checkorder', 1)
|
|
|
- form.append('reportdate', that.searchTime)
|
|
|
- form.append('checkpath', that.deviceName)
|
|
|
- form.append('order', that.classType)
|
|
|
- form.append('checkorder', Number(that.checkNum))
|
|
|
- let formDataStr = ''
|
|
|
- form.forEach((value, key) => {
|
|
|
- if (formDataStr != '') {
|
|
|
- formDataStr += '&'
|
|
|
- }
|
|
|
- formDataStr += encodeURIComponent(key) + '=' + encodeURIComponent(value)
|
|
|
- })
|
|
|
+ // let formDataStr = {
|
|
|
+ // reportdate: '2025-04-10',
|
|
|
+ // checkpath: '22106工作面',
|
|
|
+ // order: '中班',
|
|
|
+ // checkorder: 1,
|
|
|
+ // }
|
|
|
+ let formDataStr = {
|
|
|
+ reportdate: that.searchTime,
|
|
|
+ checkpath: that.deviceName,
|
|
|
+ order: that.classType,
|
|
|
+ checkorder: Number(that.checkNum),
|
|
|
+ }
|
|
|
uni.request({
|
|
|
url: `${apiUrlImg}/gasServerImg`,
|
|
|
method: 'post',
|
|
|
- responseType: 'arraybuffer', // 或者 'blob'
|
|
|
+ responseType: 'arraybuffer', // 确保以二进制形式接收数据
|
|
|
data: formDataStr,
|
|
|
- header: {
|
|
|
- 'content-type': 'application/x-www-form-urlencoded'
|
|
|
- },
|
|
|
success: (res) => {
|
|
|
- if (res.statusCode === 200) {
|
|
|
- let imageData = res.data; // 这里是二进制数据
|
|
|
- // 接下来你可以使用这个二进制数据来显示图片
|
|
|
- // 例如，创建一个Image对象并设置src为imageData的URL
|
|
|
- let img = new Image();
|
|
|
- let blob = new Blob([imageData]); // 如果是arraybuffer，需要转换为Blob
|
|
|
- let url = URL.createObjectURL(blob);
|
|
|
- that.imageSrcView = url;
|
|
|
- // document.body.appendChild(img); // 或者添加到你的页面中
|
|
|
+ if (res.data instanceof ArrayBuffer) {
|
|
|
+ let arrayBufferView = new Uint8Array(res.data);
|
|
|
+ // 你可以在这里对arrayBufferView进行操作
|
|
|
+ console.log(arrayBufferView);
|
|
|
+ const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(arrayBufferView)
|
|
|
+ that.imageSrcView = base64 || '';
|
|
|
}
|
|
|
},
|
|
|
fail: (err) => {
|
|
|
@@ -2455,7 +2445,7 @@ export default {
|
|
|
'checkpath': that.deviceName,
|
|
|
},
|
|
|
success: (res) => {
|
|
|
- if (res.statusCode==200) {
|
|
|
+ if (res.statusCode == 200) {
|
|
|
uni.showToast({
|
|
|
title: JSON.parse(res.data).res,
|
|
|
icon: 'none' // 可选图标，'success', 'loading', 'none'
|
|
|
@@ -2587,7 +2577,7 @@ export default {
|
|
|
|
|
|
.bot-gas-list {
|
|
|
width: 100%;
|
|
|
- height: calc(100% - 293px);
|
|
|
+ height: 100%;
|
|
|
padding: 10px;
|
|
|
box-sizing: border-box;
|
|
|
background-color: #FFF;
|
