diff --git a/src/utils/download.ts b/src/utils/download.ts index 2254411..8446dd0 100644 --- a/src/utils/download.ts +++ b/src/utils/download.ts @@ -1,4 +1,4 @@ -import { getDictByCode } from '@/api/system/dict' +// import { getDictByCode } from '@/api/system/dict' /** * 下载本地图片 href为 127.0.0.1/xxxx @@ -124,62 +124,66 @@ */ export async function download(url: string, getName: string) { let name = getName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex( - (item: { value: string | null }) => item.value === level, + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex( + // (item: { value: string | null }) => item.value === level, + // ) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // name = `【${response.data[index].name}】${name}` + // name = `【内部】${name}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + name = `【内部】${name}` + } + return new Promise((resolve) => { + // 下载图片 + const photo = ['jpg', 'jpeg', 'png'] + const fileType = url.split('.')[url.split('.').length - 1] + console.log(fileType, 'fileType') + if (photo.includes(fileType)) { + // 图片 将服务器图片地址转化成本地地址 + const image = new Image() + image.setAttribute('crossOrigin', 'anonymous') + image.src = url + image.onload = () => { + const canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + const ctx = canvas.getContext('2d') + ;(ctx as CanvasRenderingContext2D).drawImage( + image, + 0, + 0, + image.width, + image.height, ) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // name = `【${response.data[index].name}】${name}` - name = `【内部】${name}` - } - } - } - return new Promise((resolve) => { - // 下载图片 - const photo = ['jpg', 'jpeg', 'png'] - const fileType = url.split('.')[url.split('.').length - 1] - console.log(fileType, 'fileType') - if (photo.includes(fileType)) { - // 图片 将服务器图片地址转化成本地地址 - const image = new Image() - image.setAttribute('crossOrigin', 'anonymous') - image.src = url - image.onload = () => { - const canvas = document.createElement('canvas') - canvas.width = image.width - canvas.height = image.height - const ctx = canvas.getContext('2d') - ;(ctx as CanvasRenderingContext2D).drawImage( - image, - 0, - 0, - image.width, - image.height, - ) - canvas.toBlob((blob) => { - const url = URL.createObjectURL(blob as Blob) - downloadImg(url, name) - // 用完释放URL对象 - URL.revokeObjectURL(url) - console.log('111111111111111111') - resolve(' ') - console.log('2222222222') - }) - } - } - else { - // 预览一般都是用的a标签，文件下载用的window.open - // 1.pdf文件路径放到window.open里面，点击是进行在线预览 - // 2.word文件和excel文件通过a标签打开时，是直接下载了 - // 将网络地址转化为 blob地址 并下载 - urlToBlob(url, name).then(() => { + canvas.toBlob((blob) => { + const url = URL.createObjectURL(blob as Blob) + downloadImg(url, name) + // 用完释放URL对象 + URL.revokeObjectURL(url) + console.log('111111111111111111') resolve(' ') + console.log('2222222222') }) } - }) + } + else { + // 预览一般都是用的a标签，文件下载用的window.open + // 1.pdf文件路径放到window.open里面，点击是进行在线预览 + // 2.word文件和excel文件通过a标签打开时，是直接下载了 + // 将网络地址转化为 blob地址 并下载 + urlToBlob(url, name).then(() => { + resolve(' ') + }) + } }) + // }) } diff --git a/src/utils/download.ts b/src/utils/download.ts index 2254411..8446dd0 100644 --- a/src/utils/download.ts +++ b/src/utils/download.ts @@ -1,4 +1,4 @@ -import { getDictByCode } from '@/api/system/dict' +// import { getDictByCode } from '@/api/system/dict' /** * 下载本地图片 href为 127.0.0.1/xxxx @@ -124,62 +124,66 @@ */ export async function download(url: string, getName: string) { let name = getName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex( - (item: { value: string | null }) => item.value === level, + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex( + // (item: { value: string | null }) => item.value === level, + // ) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // name = `【${response.data[index].name}】${name}` + // name = `【内部】${name}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + name = `【内部】${name}` + } + return new Promise((resolve) => { + // 下载图片 + const photo = ['jpg', 'jpeg', 'png'] + const fileType = url.split('.')[url.split('.').length - 1] + console.log(fileType, 'fileType') + if (photo.includes(fileType)) { + // 图片 将服务器图片地址转化成本地地址 + const image = new Image() + image.setAttribute('crossOrigin', 'anonymous') + image.src = url + image.onload = () => { + const canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + const ctx = canvas.getContext('2d') + ;(ctx as CanvasRenderingContext2D).drawImage( + image, + 0, + 0, + image.width, + image.height, ) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // name = `【${response.data[index].name}】${name}` - name = `【内部】${name}` - } - } - } - return new Promise((resolve) => { - // 下载图片 - const photo = ['jpg', 'jpeg', 'png'] - const fileType = url.split('.')[url.split('.').length - 1] - console.log(fileType, 'fileType') - if (photo.includes(fileType)) { - // 图片 将服务器图片地址转化成本地地址 - const image = new Image() - image.setAttribute('crossOrigin', 'anonymous') - image.src = url - image.onload = () => { - const canvas = document.createElement('canvas') - canvas.width = image.width - canvas.height = image.height - const ctx = canvas.getContext('2d') - ;(ctx as CanvasRenderingContext2D).drawImage( - image, - 0, - 0, - image.width, - image.height, - ) - canvas.toBlob((blob) => { - const url = URL.createObjectURL(blob as Blob) - downloadImg(url, name) - // 用完释放URL对象 - URL.revokeObjectURL(url) - console.log('111111111111111111') - resolve(' ') - console.log('2222222222') - }) - } - } - else { - // 预览一般都是用的a标签，文件下载用的window.open - // 1.pdf文件路径放到window.open里面，点击是进行在线预览 - // 2.word文件和excel文件通过a标签打开时，是直接下载了 - // 将网络地址转化为 blob地址 并下载 - urlToBlob(url, name).then(() => { + canvas.toBlob((blob) => { + const url = URL.createObjectURL(blob as Blob) + downloadImg(url, name) + // 用完释放URL对象 + URL.revokeObjectURL(url) + console.log('111111111111111111') resolve(' ') + console.log('2222222222') }) } - }) + } + else { + // 预览一般都是用的a标签，文件下载用的window.open + // 1.pdf文件路径放到window.open里面，点击是进行在线预览 + // 2.word文件和excel文件通过a标签打开时，是直接下载了 + // 将网络地址转化为 blob地址 并下载 + urlToBlob(url, name).then(() => { + resolve(' ') + }) + } }) + // }) } diff --git a/src/utils/exportUtils.ts b/src/utils/exportUtils.ts index 6503713..c6465d5 100644 --- a/src/utils/exportUtils.ts +++ b/src/utils/exportUtils.ts @@ -7,32 +7,36 @@ */ export function exportFile(blob: Blob, getFileName: string) { let fileName = getFileName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex((item: { value: string | null }) => item.value === level) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // fileName = `【${response.data[index].name}】${fileName}` - fileName = `【内部】${fileName}` - } - } - } - if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { - (navigator as any).msSaveBlob(blob, fileName) - } - else { - const downloadElement = document.createElement('a') - const href = window.URL.createObjectURL(blob) // 创建下载的链接 - downloadElement.href = href - downloadElement.download = fileName - document.body.appendChild(downloadElement) - downloadElement.click() // 点击下载 - document.body.removeChild(downloadElement) // 下载完成移除元素 - window.URL.revokeObjectURL(href) // 释放blob对象 - } - }) + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex((item: { value: string | null }) => item.value === level) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // fileName = `【${response.data[index].name}】${fileName}` + // fileName = `【内部】${fileName}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + fileName = `【内部】${fileName}` + } + if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { + (navigator as any).msSaveBlob(blob, fileName) + } + else { + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = fileName + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 + } + // }) } export const base64ToBlob = (dataurl) => { diff --git a/src/utils/download.ts b/src/utils/download.ts index 2254411..8446dd0 100644 --- a/src/utils/download.ts +++ b/src/utils/download.ts @@ -1,4 +1,4 @@ -import { getDictByCode } from '@/api/system/dict' +// import { getDictByCode } from '@/api/system/dict' /** * 下载本地图片 href为 127.0.0.1/xxxx @@ -124,62 +124,66 @@ */ export async function download(url: string, getName: string) { let name = getName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex( - (item: { value: string | null }) => item.value === level, + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex( + // (item: { value: string | null }) => item.value === level, + // ) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // name = `【${response.data[index].name}】${name}` + // name = `【内部】${name}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + name = `【内部】${name}` + } + return new Promise((resolve) => { + // 下载图片 + const photo = ['jpg', 'jpeg', 'png'] + const fileType = url.split('.')[url.split('.').length - 1] + console.log(fileType, 'fileType') + if (photo.includes(fileType)) { + // 图片 将服务器图片地址转化成本地地址 + const image = new Image() + image.setAttribute('crossOrigin', 'anonymous') + image.src = url + image.onload = () => { + const canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + const ctx = canvas.getContext('2d') + ;(ctx as CanvasRenderingContext2D).drawImage( + image, + 0, + 0, + image.width, + image.height, ) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // name = `【${response.data[index].name}】${name}` - name = `【内部】${name}` - } - } - } - return new Promise((resolve) => { - // 下载图片 - const photo = ['jpg', 'jpeg', 'png'] - const fileType = url.split('.')[url.split('.').length - 1] - console.log(fileType, 'fileType') - if (photo.includes(fileType)) { - // 图片 将服务器图片地址转化成本地地址 - const image = new Image() - image.setAttribute('crossOrigin', 'anonymous') - image.src = url - image.onload = () => { - const canvas = document.createElement('canvas') - canvas.width = image.width - canvas.height = image.height - const ctx = canvas.getContext('2d') - ;(ctx as CanvasRenderingContext2D).drawImage( - image, - 0, - 0, - image.width, - image.height, - ) - canvas.toBlob((blob) => { - const url = URL.createObjectURL(blob as Blob) - downloadImg(url, name) - // 用完释放URL对象 - URL.revokeObjectURL(url) - console.log('111111111111111111') - resolve(' ') - console.log('2222222222') - }) - } - } - else { - // 预览一般都是用的a标签，文件下载用的window.open - // 1.pdf文件路径放到window.open里面，点击是进行在线预览 - // 2.word文件和excel文件通过a标签打开时，是直接下载了 - // 将网络地址转化为 blob地址 并下载 - urlToBlob(url, name).then(() => { + canvas.toBlob((blob) => { + const url = URL.createObjectURL(blob as Blob) + downloadImg(url, name) + // 用完释放URL对象 + URL.revokeObjectURL(url) + console.log('111111111111111111') resolve(' ') + console.log('2222222222') }) } - }) + } + else { + // 预览一般都是用的a标签，文件下载用的window.open + // 1.pdf文件路径放到window.open里面，点击是进行在线预览 + // 2.word文件和excel文件通过a标签打开时，是直接下载了 + // 将网络地址转化为 blob地址 并下载 + urlToBlob(url, name).then(() => { + resolve(' ') + }) + } }) + // }) } diff --git a/src/utils/exportUtils.ts b/src/utils/exportUtils.ts index 6503713..c6465d5 100644 --- a/src/utils/exportUtils.ts +++ b/src/utils/exportUtils.ts @@ -7,32 +7,36 @@ */ export function exportFile(blob: Blob, getFileName: string) { let fileName = getFileName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex((item: { value: string | null }) => item.value === level) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // fileName = `【${response.data[index].name}】${fileName}` - fileName = `【内部】${fileName}` - } - } - } - if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { - (navigator as any).msSaveBlob(blob, fileName) - } - else { - const downloadElement = document.createElement('a') - const href = window.URL.createObjectURL(blob) // 创建下载的链接 - downloadElement.href = href - downloadElement.download = fileName - document.body.appendChild(downloadElement) - downloadElement.click() // 点击下载 - document.body.removeChild(downloadElement) // 下载完成移除元素 - window.URL.revokeObjectURL(href) // 释放blob对象 - } - }) + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex((item: { value: string | null }) => item.value === level) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // fileName = `【${response.data[index].name}】${fileName}` + // fileName = `【内部】${fileName}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + fileName = `【内部】${fileName}` + } + if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { + (navigator as any).msSaveBlob(blob, fileName) + } + else { + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = fileName + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 + } + // }) } export const base64ToBlob = (dataurl) => { diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue index 0038682..88b5ce5 100644 --- a/src/views/alarm/dangerAssessment/assessment/list.vue +++ b/src/views/alarm/dangerAssessment/assessment/list.vue @@ -287,7 +287,7 @@ top: 50, left: 20, right: 20, - bottom: 20, + bottom: 0, containLabel: true, // 是否包含坐标轴的刻度标签 }" /> diff --git a/src/utils/download.ts b/src/utils/download.ts index 2254411..8446dd0 100644 --- a/src/utils/download.ts +++ b/src/utils/download.ts @@ -1,4 +1,4 @@ -import { getDictByCode } from '@/api/system/dict' +// import { getDictByCode } from '@/api/system/dict' /** * 下载本地图片 href为 127.0.0.1/xxxx @@ -124,62 +124,66 @@ */ export async function download(url: string, getName: string) { let name = getName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex( - (item: { value: string | null }) => item.value === level, + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex( + // (item: { value: string | null }) => item.value === level, + // ) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // name = `【${response.data[index].name}】${name}` + // name = `【内部】${name}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + name = `【内部】${name}` + } + return new Promise((resolve) => { + // 下载图片 + const photo = ['jpg', 'jpeg', 'png'] + const fileType = url.split('.')[url.split('.').length - 1] + console.log(fileType, 'fileType') + if (photo.includes(fileType)) { + // 图片 将服务器图片地址转化成本地地址 + const image = new Image() + image.setAttribute('crossOrigin', 'anonymous') + image.src = url + image.onload = () => { + const canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + const ctx = canvas.getContext('2d') + ;(ctx as CanvasRenderingContext2D).drawImage( + image, + 0, + 0, + image.width, + image.height, ) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // name = `【${response.data[index].name}】${name}` - name = `【内部】${name}` - } - } - } - return new Promise((resolve) => { - // 下载图片 - const photo = ['jpg', 'jpeg', 'png'] - const fileType = url.split('.')[url.split('.').length - 1] - console.log(fileType, 'fileType') - if (photo.includes(fileType)) { - // 图片 将服务器图片地址转化成本地地址 - const image = new Image() - image.setAttribute('crossOrigin', 'anonymous') - image.src = url - image.onload = () => { - const canvas = document.createElement('canvas') - canvas.width = image.width - canvas.height = image.height - const ctx = canvas.getContext('2d') - ;(ctx as CanvasRenderingContext2D).drawImage( - image, - 0, - 0, - image.width, - image.height, - ) - canvas.toBlob((blob) => { - const url = URL.createObjectURL(blob as Blob) - downloadImg(url, name) - // 用完释放URL对象 - URL.revokeObjectURL(url) - console.log('111111111111111111') - resolve(' ') - console.log('2222222222') - }) - } - } - else { - // 预览一般都是用的a标签，文件下载用的window.open - // 1.pdf文件路径放到window.open里面，点击是进行在线预览 - // 2.word文件和excel文件通过a标签打开时，是直接下载了 - // 将网络地址转化为 blob地址 并下载 - urlToBlob(url, name).then(() => { + canvas.toBlob((blob) => { + const url = URL.createObjectURL(blob as Blob) + downloadImg(url, name) + // 用完释放URL对象 + URL.revokeObjectURL(url) + console.log('111111111111111111') resolve(' ') + console.log('2222222222') }) } - }) + } + else { + // 预览一般都是用的a标签，文件下载用的window.open + // 1.pdf文件路径放到window.open里面，点击是进行在线预览 + // 2.word文件和excel文件通过a标签打开时，是直接下载了 + // 将网络地址转化为 blob地址 并下载 + urlToBlob(url, name).then(() => { + resolve(' ') + }) + } }) + // }) } diff --git a/src/utils/exportUtils.ts b/src/utils/exportUtils.ts index 6503713..c6465d5 100644 --- a/src/utils/exportUtils.ts +++ b/src/utils/exportUtils.ts @@ -7,32 +7,36 @@ */ export function exportFile(blob: Blob, getFileName: string) { let fileName = getFileName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex((item: { value: string | null }) => item.value === level) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // fileName = `【${response.data[index].name}】${fileName}` - fileName = `【内部】${fileName}` - } - } - } - if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { - (navigator as any).msSaveBlob(blob, fileName) - } - else { - const downloadElement = document.createElement('a') - const href = window.URL.createObjectURL(blob) // 创建下载的链接 - downloadElement.href = href - downloadElement.download = fileName - document.body.appendChild(downloadElement) - downloadElement.click() // 点击下载 - document.body.removeChild(downloadElement) // 下载完成移除元素 - window.URL.revokeObjectURL(href) // 释放blob对象 - } - }) + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex((item: { value: string | null }) => item.value === level) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // fileName = `【${response.data[index].name}】${fileName}` + // fileName = `【内部】${fileName}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + fileName = `【内部】${fileName}` + } + if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { + (navigator as any).msSaveBlob(blob, fileName) + } + else { + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = fileName + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 + } + // }) } export const base64ToBlob = (dataurl) => { diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue index 0038682..88b5ce5 100644 --- a/src/views/alarm/dangerAssessment/assessment/list.vue +++ b/src/views/alarm/dangerAssessment/assessment/list.vue @@ -287,7 +287,7 @@ top: 50, left: 20, right: 20, - bottom: 20, + bottom: 0, containLabel: true, // 是否包含坐标轴的刻度标签 }" /> diff --git a/src/views/alarm/securityAlarm/list copy.vue b/src/views/alarm/securityAlarm/list copy.vue new file mode 100644 index 0000000..b6768f8 --- /dev/null +++ b/src/views/alarm/securityAlarm/list copy.vue @@ -0,0 +1,268 @@ + + + + + + diff --git a/src/utils/download.ts b/src/utils/download.ts index 2254411..8446dd0 100644 --- a/src/utils/download.ts +++ b/src/utils/download.ts @@ -1,4 +1,4 @@ -import { getDictByCode } from '@/api/system/dict' +// import { getDictByCode } from '@/api/system/dict' /** * 下载本地图片 href为 127.0.0.1/xxxx @@ -124,62 +124,66 @@ */ export async function download(url: string, getName: string) { let name = getName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex( - (item: { value: string | null }) => item.value === level, + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex( + // (item: { value: string | null }) => item.value === level, + // ) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // name = `【${response.data[index].name}】${name}` + // name = `【内部】${name}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + name = `【内部】${name}` + } + return new Promise((resolve) => { + // 下载图片 + const photo = ['jpg', 'jpeg', 'png'] + const fileType = url.split('.')[url.split('.').length - 1] + console.log(fileType, 'fileType') + if (photo.includes(fileType)) { + // 图片 将服务器图片地址转化成本地地址 + const image = new Image() + image.setAttribute('crossOrigin', 'anonymous') + image.src = url + image.onload = () => { + const canvas = document.createElement('canvas') + canvas.width = image.width + canvas.height = image.height + const ctx = canvas.getContext('2d') + ;(ctx as CanvasRenderingContext2D).drawImage( + image, + 0, + 0, + image.width, + image.height, ) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // name = `【${response.data[index].name}】${name}` - name = `【内部】${name}` - } - } - } - return new Promise((resolve) => { - // 下载图片 - const photo = ['jpg', 'jpeg', 'png'] - const fileType = url.split('.')[url.split('.').length - 1] - console.log(fileType, 'fileType') - if (photo.includes(fileType)) { - // 图片 将服务器图片地址转化成本地地址 - const image = new Image() - image.setAttribute('crossOrigin', 'anonymous') - image.src = url - image.onload = () => { - const canvas = document.createElement('canvas') - canvas.width = image.width - canvas.height = image.height - const ctx = canvas.getContext('2d') - ;(ctx as CanvasRenderingContext2D).drawImage( - image, - 0, - 0, - image.width, - image.height, - ) - canvas.toBlob((blob) => { - const url = URL.createObjectURL(blob as Blob) - downloadImg(url, name) - // 用完释放URL对象 - URL.revokeObjectURL(url) - console.log('111111111111111111') - resolve(' ') - console.log('2222222222') - }) - } - } - else { - // 预览一般都是用的a标签，文件下载用的window.open - // 1.pdf文件路径放到window.open里面，点击是进行在线预览 - // 2.word文件和excel文件通过a标签打开时，是直接下载了 - // 将网络地址转化为 blob地址 并下载 - urlToBlob(url, name).then(() => { + canvas.toBlob((blob) => { + const url = URL.createObjectURL(blob as Blob) + downloadImg(url, name) + // 用完释放URL对象 + URL.revokeObjectURL(url) + console.log('111111111111111111') resolve(' ') + console.log('2222222222') }) } - }) + } + else { + // 预览一般都是用的a标签，文件下载用的window.open + // 1.pdf文件路径放到window.open里面，点击是进行在线预览 + // 2.word文件和excel文件通过a标签打开时，是直接下载了 + // 将网络地址转化为 blob地址 并下载 + urlToBlob(url, name).then(() => { + resolve(' ') + }) + } }) + // }) } diff --git a/src/utils/exportUtils.ts b/src/utils/exportUtils.ts index 6503713..c6465d5 100644 --- a/src/utils/exportUtils.ts +++ b/src/utils/exportUtils.ts @@ -7,32 +7,36 @@ */ export function exportFile(blob: Blob, getFileName: string) { let fileName = getFileName || '' - getDictByCode('secretUserLevel').then((response) => { - if (response.code === 200) { - if (Array.isArray(response.data) && response.data.length) { - const level = window.sessionStorage.getItem('secretUserLevel') - const index = response.data.findIndex((item: { value: string | null }) => item.value === level) - const systemType = window.localStorage.getItem('systemType') as string - if (index !== -1 && systemType === 'gm') { - // fileName = `【${response.data[index].name}】${fileName}` - fileName = `【内部】${fileName}` - } - } - } - if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { - (navigator as any).msSaveBlob(blob, fileName) - } - else { - const downloadElement = document.createElement('a') - const href = window.URL.createObjectURL(blob) // 创建下载的链接 - downloadElement.href = href - downloadElement.download = fileName - document.body.appendChild(downloadElement) - downloadElement.click() // 点击下载 - document.body.removeChild(downloadElement) // 下载完成移除元素 - window.URL.revokeObjectURL(href) // 释放blob对象 - } - }) + // getDictByCode('secretUserLevel').then((response) => { + // if (response.code === 200) { + // if (Array.isArray(response.data) && response.data.length) { + // const level = window.sessionStorage.getItem('secretUserLevel') + // const index = response.data.findIndex((item: { value: string | null }) => item.value === level) + // const systemType = window.localStorage.getItem('systemType') as string + // if (index !== -1 && systemType === 'gm') { + // // fileName = `【${response.data[index].name}】${fileName}` + // fileName = `【内部】${fileName}` + // } + // } + // } + const systemType = window.localStorage.getItem('systemType') as string + if (systemType === 'gm') { + fileName = `【内部】${fileName}` + } + if (window.navigator && (window.navigator as any).msSaveOrOpenBlob) { + (navigator as any).msSaveBlob(blob, fileName) + } + else { + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) // 创建下载的链接 + downloadElement.href = href + downloadElement.download = fileName + document.body.appendChild(downloadElement) + downloadElement.click() // 点击下载 + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放blob对象 + } + // }) } export const base64ToBlob = (dataurl) => { diff --git a/src/views/alarm/dangerAssessment/assessment/list.vue b/src/views/alarm/dangerAssessment/assessment/list.vue index 0038682..88b5ce5 100644 --- a/src/views/alarm/dangerAssessment/assessment/list.vue +++ b/src/views/alarm/dangerAssessment/assessment/list.vue @@ -287,7 +287,7 @@ top: 50, left: 20, right: 20, - bottom: 20, + bottom: 0, containLabel: true, // 是否包含坐标轴的刻度标签 }" /> diff --git a/src/views/alarm/securityAlarm/list copy.vue b/src/views/alarm/securityAlarm/list copy.vue new file mode 100644 index 0000000..b6768f8 --- /dev/null +++ b/src/views/alarm/securityAlarm/list copy.vue @@ -0,0 +1,268 @@ + + + + + + diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue index b6768f8..296d8fb 100644 --- a/src/views/alarm/securityAlarm/list.vue +++ b/src/views/alarm/securityAlarm/list.vue @@ -3,6 +3,7 @@ import dayjs from 'dayjs' import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList' import { getDictByCode } from '@/api/system/dict' +import type { TableColumn } from '@/components/NormalTable/table_interface' import img from '@/assets/image/loading.gif' // 获取页面高度 const { proxy } = getCurrentInstance() as any @@ -26,6 +27,14 @@ offset: 1, limit: 20, }) +// 表格表头 +const columns = [ + { text: '摄像头名称', value: 'deviceName', align: 'center' }, + { text: '识别类型', value: 'recognitionTypeName', align: 'center' }, + { text: '区域', value: 'areaName', align: 'center' }, + { text: '单位', value: 'deptName', align: 'center' }, + { text: '记录时间', value: 'alarmTime', align: 'center' }, +] // 开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -72,19 +81,19 @@ } fetchData() } -// 改变条数 -const handleSizeChange = (value: number) => { - listQuery.value.limit = value - fetchData() -} -// 改变页码 -const handleCurrentChange = (value: number) => { - listQuery.value.offset = value +// 搜索 +function search() { fetchData() } -// 搜索 -function search() { +// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 +function changePage(val: { size: number; page: number }) { + if (val && val.size) { + listQuery.value.limit = val.size + } + if (val && val.page) { + listQuery.value.offset = val.page + } fetchData() } @@ -100,12 +109,6 @@ } getDict() // -------------------------------------------------------------------------------------- -// 点击视频会议 -const clickVideoConference = () => { - console.log('跳转链接', videoLink.value) - window.open(videoLink.value) -} -// -------------------------------------------------------------------------------------- const imgHeight = ref(160) onMounted(() => { const width = window.innerWidth * 0.22 @@ -122,14 +125,14 @@ - + - + - + -
- - - - -
- {{ item.recognitionTypeName || item.sceneName }} -
{{ item.deviceName }}
-
-
{{ item.areaName }}
-
{{ item.deptName }}
-
{{ item.alarmTime }}
- -
-
- - - - -
- -
- -
+ + + + + + + - diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue index b6768f8..296d8fb 100644 --- a/src/views/alarm/securityAlarm/list.vue +++ b/src/views/alarm/securityAlarm/list.vue @@ -3,6 +3,7 @@ import dayjs from 'dayjs' import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList' import { getDictByCode } from '@/api/system/dict' +import type { TableColumn } from '@/components/NormalTable/table_interface' import img from '@/assets/image/loading.gif' // 获取页面高度 const { proxy } = getCurrentInstance() as any @@ -26,6 +27,14 @@ offset: 1, limit: 20, }) +// 表格表头 +const columns = [ + { text: '摄像头名称', value: 'deviceName', align: 'center' }, + { text: '识别类型', value: 'recognitionTypeName', align: 'center' }, + { text: '区域', value: 'areaName', align: 'center' }, + { text: '单位', value: 'deptName', align: 'center' }, + { text: '记录时间', value: 'alarmTime', align: 'center' }, +] // 开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -72,19 +81,19 @@ } fetchData() } -// 改变条数 -const handleSizeChange = (value: number) => { - listQuery.value.limit = value - fetchData() -} -// 改变页码 -const handleCurrentChange = (value: number) => { - listQuery.value.offset = value +// 搜索 +function search() { fetchData() } -// 搜索 -function search() { +// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 +function changePage(val: { size: number; page: number }) { + if (val && val.size) { + listQuery.value.limit = val.size + } + if (val && val.page) { + listQuery.value.offset = val.page + } fetchData() } @@ -100,12 +109,6 @@ } getDict() // -------------------------------------------------------------------------------------- -// 点击视频会议 -const clickVideoConference = () => { - console.log('跳转链接', videoLink.value) - window.open(videoLink.value) -} -// -------------------------------------------------------------------------------------- const imgHeight = ref(160) onMounted(() => { const width = window.innerWidth * 0.22 @@ -122,14 +125,14 @@ - + - + - + -
- - - - -
- {{ item.recognitionTypeName || item.sceneName }} -
{{ item.deviceName }}
-
-
{{ item.areaName }}
-
{{ item.deptName }}
-
{{ item.alarmTime }}
- -
-
- - - - -
- -
- -
+ + + + + + + - diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue index b6768f8..296d8fb 100644 --- a/src/views/alarm/securityAlarm/list.vue +++ b/src/views/alarm/securityAlarm/list.vue @@ -3,6 +3,7 @@ import dayjs from 'dayjs' import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList' import { getDictByCode } from '@/api/system/dict' +import type { TableColumn } from '@/components/NormalTable/table_interface' import img from '@/assets/image/loading.gif' // 获取页面高度 const { proxy } = getCurrentInstance() as any @@ -26,6 +27,14 @@ offset: 1, limit: 20, }) +// 表格表头 +const columns = [ + { text: '摄像头名称', value: 'deviceName', align: 'center' }, + { text: '识别类型', value: 'recognitionTypeName', align: 'center' }, + { text: '区域', value: 'areaName', align: 'center' }, + { text: '单位', value: 'deptName', align: 'center' }, + { text: '记录时间', value: 'alarmTime', align: 'center' }, +] // 开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -72,19 +81,19 @@ } fetchData() } -// 改变条数 -const handleSizeChange = (value: number) => { - listQuery.value.limit = value - fetchData() -} -// 改变页码 -const handleCurrentChange = (value: number) => { - listQuery.value.offset = value +// 搜索 +function search() { fetchData() } -// 搜索 -function search() { +// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 +function changePage(val: { size: number; page: number }) { + if (val && val.size) { + listQuery.value.limit = val.size + } + if (val && val.page) { + listQuery.value.offset = val.page + } fetchData() } @@ -100,12 +109,6 @@ } getDict() // -------------------------------------------------------------------------------------- -// 点击视频会议 -const clickVideoConference = () => { - console.log('跳转链接', videoLink.value) - window.open(videoLink.value) -} -// -------------------------------------------------------------------------------------- const imgHeight = ref(160) onMounted(() => { const width = window.innerWidth * 0.22 @@ -122,14 +125,14 @@ - + - + - + -
- - - - -
- {{ item.recognitionTypeName || item.sceneName }} -
{{ item.deviceName }}
-
-
{{ item.areaName }}
-
{{ item.deptName }}
-
{{ item.alarmTime }}
- -
-
- - - - -
- -
- -
+ + + + + + + - diff --git a/src/views/alarm/securityAlarm/list.vue b/src/views/alarm/securityAlarm/list.vue index b6768f8..296d8fb 100644 --- a/src/views/alarm/securityAlarm/list.vue +++ b/src/views/alarm/securityAlarm/list.vue @@ -3,6 +3,7 @@ import dayjs from 'dayjs' import { getSecurityAlarmList } from '@/api/alarm/securityAlarm/securityAlarmList' import { getDictByCode } from '@/api/system/dict' +import type { TableColumn } from '@/components/NormalTable/table_interface' import img from '@/assets/image/loading.gif' // 获取页面高度 const { proxy } = getCurrentInstance() as any @@ -26,6 +27,14 @@ offset: 1, limit: 20, }) +// 表格表头 +const columns = [ + { text: '摄像头名称', value: 'deviceName', align: 'center' }, + { text: '识别类型', value: 'recognitionTypeName', align: 'center' }, + { text: '区域', value: 'areaName', align: 'center' }, + { text: '单位', value: 'deptName', align: 'center' }, + { text: '记录时间', value: 'alarmTime', align: 'center' }, +] // 开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { @@ -72,19 +81,19 @@ } fetchData() } -// 改变条数 -const handleSizeChange = (value: number) => { - listQuery.value.limit = value - fetchData() -} -// 改变页码 -const handleCurrentChange = (value: number) => { - listQuery.value.offset = value +// 搜索 +function search() { fetchData() } -// 搜索 -function search() { +// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 +function changePage(val: { size: number; page: number }) { + if (val && val.size) { + listQuery.value.limit = val.size + } + if (val && val.page) { + listQuery.value.offset = val.page + } fetchData() } @@ -100,12 +109,6 @@ } getDict() // -------------------------------------------------------------------------------------- -// 点击视频会议 -const clickVideoConference = () => { - console.log('跳转链接', videoLink.value) - window.open(videoLink.value) -} -// -------------------------------------------------------------------------------------- const imgHeight = ref(160) onMounted(() => { const width = window.innerWidth * 0.22 @@ -122,14 +125,14 @@ - + - + - + -
- - - - -
- {{ item.recognitionTypeName || item.sceneName }} -
{{ item.deviceName }}
-
-
{{ item.areaName }}
-
{{ item.deptName }}
-
{{ item.alarmTime }}
- -
-
- - - - -
- -
- -
+ + + + + + + -