Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/api/pressure2/boilertaskorder/index.ts

@@ -719,4 +719,9 @@ export const BoilerTaskOrderApi = {
     return await request.post({ url: `/pressure2/boiler-task-order/issue-report/batch-issue`, data })
   },
 
+  // 使用标志
+  getIssueReportUseLogoPreviewApi: async (params) => {
+    return await request.download({ url: '/pressure2/boiler-task-order/issue-report/use-logo/preview', params })
+  },
+
 }

yudao-ui-admin-vue3/src/api/pressure2/pipetaskorder/index.ts

@@ -705,4 +705,10 @@ export const PipeTaskOrderApi = {
     return await request.post({ url: `/pressure2/pipe-task-order/issue-report/batch-issue`, data })
   },
 
+  // 使用标志
+  getIssueReportUseLogoPreviewApi: async (params) => {
+    return await request.download({ url: '/pressure2/pipe-task-order/issue-report/use-logo/preview', params })
+  },
+
+
 }

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/FilePreview.vue

@@ -202,7 +202,7 @@ import VuePdfEmbed from 'vue-pdf-embed'
 import 'vue-pdf-embed/dist/styles/annotationLayer.css'
 import 'vue-pdf-embed/dist/styles/textLayer.css'
 import { previewPrepareReport } from '@/api/laboratory/functional/report'
-import { TaskOrderApi } from '@/api/pressure/taskorder'
+import { BoilerTaskOrderApi } from '@/api/pressure2/boilertaskorder'
 
 const props = defineProps({
   modelValue: {
@@ -333,7 +333,7 @@ const loadPreview = async () => {
     // if (props.isEditOtherFileFlag == false) {
     //   delete data.type
     // }
-    const response = await TaskOrderApi.getIssueReportUseLogoPreviewApi(data, {
+    const response = await BoilerTaskOrderApi.getIssueReportUseLogoPreviewApi(data, {
       responseType: 'blob',
       headers: {
         'Accept': 'application/pdf, application/octet-stream, */*'

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/FilePreview.vue

@@ -202,7 +202,7 @@ import VuePdfEmbed from 'vue-pdf-embed'
 import 'vue-pdf-embed/dist/styles/annotationLayer.css'
 import 'vue-pdf-embed/dist/styles/textLayer.css'
 import { previewPrepareReport } from '@/api/laboratory/functional/report'
-import { TaskOrderApi } from '@/api/pressure/taskorder'
+import { PipeTaskOrderApi } from '@/api/pressure2/pipetaskorder'
 
 const props = defineProps({
   modelValue: {
@@ -333,7 +333,7 @@ const loadPreview = async () => {
     // if (props.isEditOtherFileFlag == false) {
     //   delete data.type
     // }
-    const response = await TaskOrderApi.getIssueReportUseLogoPreviewApi(data, {
+    const response = await PipeTaskOrderApi.getIssueReportUseLogoPreviewApi(data, {
       responseType: 'blob',
       headers: {
         'Accept': 'application/pdf, application/octet-stream, */*'