diff --git a/src/views/IO/delayPatrol/waitAudit/faultModal.vue b/src/views/IO/delayPatrol/waitAudit/faultModal.vue index efe031e..0b02beb 100644 --- a/src/views/IO/delayPatrol/waitAudit/faultModal.vue +++ b/src/views/IO/delayPatrol/waitAudit/faultModal.vue @@ -359,6 +359,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue index ffec26c..4e5e516 100644 --- a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue +++ b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue @@ -359,6 +359,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/IO/patrolReport/reportModal.vue b/src/views/IO/patrolReport/reportModal.vue index ca359ff..c6d6688 100644 --- a/src/views/IO/patrolReport/reportModal.vue +++ b/src/views/IO/patrolReport/reportModal.vue @@ -180,6 +180,7 @@ fileLists.value.push({ url:i.url, name:i.name, + ossId:i.ossId, status:'done' }) }) @@ -189,6 +190,7 @@ inspectionPhotoLists.value.push({ url:i.url, name:i.name, + ossId:i.ossId, status:'done' }) }) @@ -254,6 +256,7 @@ form.attachments.push({ url:i.response?.data.url || i.url, name:i.response?.data.fileName ||i.name, + ossId:i.response?.data.ossId || i.ossId }) } }) @@ -269,6 +272,7 @@ form.inspectionPhotos.push({ url:i.response?.data.url || i.url, name:i.response?.data.fileName ||i.name, + ossId:i.response?.data.ossId || i.ossId }) } }) diff --git a/src/views/IO/workOrder/delayAudit/auditModal.vue b/src/views/IO/workOrder/delayAudit/auditModal.vue index e11312a..da173c2 100644 --- a/src/views/IO/workOrder/delayAudit/auditModal.vue +++ b/src/views/IO/workOrder/delayAudit/auditModal.vue @@ -118,6 +118,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId:i.ossId, status: 'done', }); }); diff --git a/src/views/IO/workOrder/delayAudit/detailDrawer.vue b/src/views/IO/workOrder/delayAudit/detailDrawer.vue index eb02a2a..135aff4 100644 --- a/src/views/IO/workOrder/delayAudit/detailDrawer.vue +++ b/src/views/IO/workOrder/delayAudit/detailDrawer.vue @@ -81,6 +81,12 @@
故障图片： + 下载
@@ -124,6 +130,8 @@ import { getInfo, queryProcess } from './api'; import AMapLoader from '@amap/amap-jsapi-loader'; import Icon from '@/components/Icon/Icon.vue'; + import { ossDownload } from '@/api/system/oss'; + import { downloadByData } from '@/utils/file/download'; export default defineComponent({ components: { Icon }, setup(props, { emit }) { @@ -216,6 +224,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId: i.ossId, status: 'done', }); }); @@ -227,7 +236,10 @@ initMap(detail.longitude, detail.latitude, detail.faultLocation); } }; - + const handleDownload = async (record) => { + const data = await ossDownload(record.ossId); + downloadByData(data, record.name); + }; // 关闭抽屉的方法 const onClose = () => { visible.value = false; @@ -272,6 +284,7 @@ statusText, progress, fileLists, + handleDownload }; }, }); diff --git a/src/views/IO/workOrder/orderAudit/detailDrawer.vue b/src/views/IO/workOrder/orderAudit/detailDrawer.vue index aa8f0be..b734757 100644 --- a/src/views/IO/workOrder/orderAudit/detailDrawer.vue +++ b/src/views/IO/workOrder/orderAudit/detailDrawer.vue @@ -81,6 +81,12 @@
故障图片： + 下载
@@ -119,6 +125,12 @@
处理图片： + 下载
@@ -166,6 +178,8 @@ import { getInfo, dealInfo, queryProcess, getOrderDelayHistory } from './api'; import AMapLoader from '@amap/amap-jsapi-loader'; import Icon from '@/components/Icon/Icon.vue'; + import { ossDownload } from '@/api/system/oss'; + import { downloadByData } from '@/utils/file/download'; export default defineComponent({ components: { Icon }, setup(props, { emit }) { @@ -321,6 +335,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId: i.ossId, status: 'done', }); }); @@ -340,7 +355,10 @@ } initMap(detail.longitude, detail.latitude, detail.faultLocation); }; - + const handleDownload = async (record) => { + const data = await ossDownload(record.ossId); + downloadByData(data, record.name); + }; // 关闭抽屉的方法 const onClose = () => { visible.value = false; @@ -392,6 +410,7 @@ progress, fileLists, fileLists1, + handleDownload }; }, }); diff --git a/src/views/IO/workOrder/orderHandle/delayModal.vue b/src/views/IO/workOrder/orderHandle/delayModal.vue index 5f72b1a..620a1b5 100644 --- a/src/views/IO/workOrder/orderHandle/delayModal.vue +++ b/src/views/IO/workOrder/orderHandle/delayModal.vue @@ -167,6 +167,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/IO/workOrder/orderHandle/detailDrawer.vue b/src/views/IO/workOrder/orderHandle/detailDrawer.vue index 5f8d982..b8e69a9 100644 --- a/src/views/IO/workOrder/orderHandle/detailDrawer.vue +++ b/src/views/IO/workOrder/orderHandle/detailDrawer.vue @@ -81,6 +81,12 @@
故障图片： + 下载
@@ -119,6 +125,12 @@
处理图片： + 下载
@@ -166,6 +178,8 @@ import { getInfo, getDealInfo, queryProcess, getOrderDelayHistory } from './handleApi'; import AMapLoader from '@amap/amap-jsapi-loader'; import Icon from '@/components/Icon/Icon.vue'; + import { ossDownload } from '@/api/system/oss'; + import { downloadByData } from '@/utils/file/download'; export default defineComponent({ components: { Icon }, setup(props, { emit }) { @@ -312,6 +326,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId: i.ossId, status: 'done', }); }); @@ -340,7 +355,10 @@ } initMap(detail.longitude, detail.latitude, detail.faultLocation); }; - + const handleDownload = async (record) => { + const data = await ossDownload(record.ossId); + downloadByData(data, record.name); + }; // 关闭抽屉的方法 const onClose = () => { visible.value = false; @@ -393,6 +411,7 @@ progress, fileLists, fileLists1, + handleDownload, }; }, }); diff --git a/src/views/IO/workOrder/orderHandle/handleModal.vue b/src/views/IO/workOrder/orderHandle/handleModal.vue index 2ec8e2c..8b3bc6c 100644 --- a/src/views/IO/workOrder/orderHandle/handleModal.vue +++ b/src/views/IO/workOrder/orderHandle/handleModal.vue @@ -150,6 +150,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/IO/workOrder/orderSearch/detailDrawer.vue b/src/views/IO/workOrder/orderSearch/detailDrawer.vue index 676663f..e630775 100644 --- a/src/views/IO/workOrder/orderSearch/detailDrawer.vue +++ b/src/views/IO/workOrder/orderSearch/detailDrawer.vue @@ -81,6 +81,12 @@
故障图片： + 下载
@@ -119,6 +125,12 @@
处理图片： + 下载
@@ -166,6 +178,8 @@ import { getInfo, dealInfo, queryProcess, getOrderDelayHistory } from './api'; import AMapLoader from '@amap/amap-jsapi-loader'; import Icon from '@/components/Icon/Icon.vue'; + import { ossDownload } from '@/api/system/oss'; + import { downloadByData } from '@/utils/file/download'; export default defineComponent({ components: { Icon }, setup(props, { emit }) { @@ -312,6 +326,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId: i.ossId, status: 'done', }); }); @@ -340,7 +355,10 @@ } initMap(detail.longitude, detail.latitude, detail.faultLocation); }; - + const handleDownload = async (record) => { + const data = await ossDownload(record.ossId); + downloadByData(data, record.name); + }; // 关闭抽屉的方法 const onClose = () => { visible.value = false; @@ -393,6 +411,7 @@ progress, fileLists, fileLists1, + handleDownload }; }, }); diff --git a/src/views/IO/workOrder/orderSearch/faultModal.vue b/src/views/IO/workOrder/orderSearch/faultModal.vue index 9dd8589..3fb5ae3 100644 --- a/src/views/IO/workOrder/orderSearch/faultModal.vue +++ b/src/views/IO/workOrder/orderSearch/faultModal.vue @@ -360,6 +360,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/IO/workOrder/orderSend/detailDrawer.vue b/src/views/IO/workOrder/orderSend/detailDrawer.vue index 6e01604..62bba0b 100644 --- a/src/views/IO/workOrder/orderSend/detailDrawer.vue +++ b/src/views/IO/workOrder/orderSend/detailDrawer.vue @@ -81,6 +81,12 @@
故障图片： + 下载
@@ -119,6 +125,12 @@
处理图片： + 下载
@@ -166,6 +178,8 @@ import { getInfo, dealInfo, queryProcess, getOrderDelayHistory } from './api'; import AMapLoader from '@amap/amap-jsapi-loader'; import Icon from '@/components/Icon/Icon.vue'; + import { ossDownload } from '@/api/system/oss'; + import { downloadByData } from '@/utils/file/download'; export default defineComponent({ components: { Icon }, setup(props, { emit }) { @@ -321,6 +335,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId: i.ossId, status: 'done', }); }); @@ -340,7 +355,10 @@ } initMap(detail.longitude, detail.latitude, detail.faultLocation); }; - + const handleDownload = async (record) => { + const data = await ossDownload(record.ossId); + downloadByData(data, record.name); + }; // 关闭抽屉的方法 const onClose = () => { visible.value = false; @@ -393,6 +411,7 @@ progress, fileLists, fileLists1, + handleDownload }; }, }); diff --git a/src/views/IO/workOrder/orderSend/faultModal.vue b/src/views/IO/workOrder/orderSend/faultModal.vue index 8e546c2..b332d03 100644 --- a/src/views/IO/workOrder/orderSend/faultModal.vue +++ b/src/views/IO/workOrder/orderSend/faultModal.vue @@ -360,6 +360,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/document/addModal.vue b/src/views/document/addModal.vue index 89a171b..92013ce 100644 --- a/src/views/document/addModal.vue +++ b/src/views/document/addModal.vue @@ -91,6 +91,7 @@ fileLists.value.push({ url:i.url, name:i.name, + ossId:i.ossId, status:'done' }) }) @@ -141,11 +142,13 @@ const handleChange = (info) => { if (info.fileList.length > 0) { form.attachments = []; + console.log(info) info.fileList.forEach((i) => { if (i.status == 'done') { form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/notice/addModal.vue b/src/views/notice/addModal.vue index 4ba9a6a..3e553a5 100644 --- a/src/views/notice/addModal.vue +++ b/src/views/notice/addModal.vue @@ -130,6 +130,7 @@ fileLists.value.push({ url:i.url, name:i.name, + ossId:i.ossId, status:'done' }) }) @@ -235,6 +236,7 @@ form.attachments.push({ url:i.response?.data.url || i.url, name:i.response?.data.fileName ||i.name, + ossId:i.response?.data.ossId || i.ossId }) } }) diff --git a/src/views/project/contractManage/addModal.vue b/src/views/project/contractManage/addModal.vue index ff66a69..780d6ea 100644 --- a/src/views/project/contractManage/addModal.vue +++ b/src/views/project/contractManage/addModal.vue @@ -241,6 +241,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId:i.ossId, status: 'done', }); }); @@ -314,6 +315,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/project/projectManage/addModal.vue b/src/views/project/projectManage/addModal.vue index 2908e07..cdf85f1 100644 --- a/src/views/project/projectManage/addModal.vue +++ b/src/views/project/projectManage/addModal.vue @@ -156,6 +156,7 @@ fileLists.value.push({ url: i.url, name: i.name, + ossId:i.ossId, status: 'done', }); }); @@ -223,6 +224,7 @@ form.attachments.push({ url: i.response?.data.url || i.url, name: i.response?.data.fileName || i.name, + ossId:i.response?.data.ossId || i.ossId }); } }); diff --git a/src/views/property/point/pointModal.vue b/src/views/property/point/pointModal.vue index 6bada43..041377b 100644 --- a/src/views/property/point/pointModal.vue +++ b/src/views/property/point/pointModal.vue @@ -306,6 +306,7 @@ form.attachments.push({ url:i.response?.data.url || i.url, name:i.response?.data.fileName ||i.name, + ossId:i.response?.data.ossId || i.ossId }) } })