Merge branch 'feature/v8.0/8.0.2' into feature/v8.0/8.0.3

罗广辉

2025-11-27 39a43e1d810bac6f1aab2b3f9b8d93397dd2a06a

Merge branch 'feature/v8.0/8.0.2' into feature/v8.0/8.0.3

# Conflicts:
#	src/views/job/components/DeviceJobDetails.vue
#	src/views/layerManagement/index.vue
#	src/views/tickets/orderLog.vue
#	src/views/tickets/ticket.vue

 src/page/index/useGlobalWS.js

@@ -30,7 +30,7 @@
            ...downloadProgress.value,
            [type]: setProgress,
        })
        if (status === 'COMPLETED' && ['dpsjzx','dplsrwxq'].includes(type)) {
        if (status === 'COMPLETED' && ['htsjzx','htlsrwxq'].includes(type)) {
            const name = `数据中心-${dayjs().format('YYYYMMDDHHmmss')}.zip`
            const currentUrl = getStore({name: 'downloadUrl'})
            if (currentUrl === download_url && download_url!== undefined) return

 src/views/job/components/DeviceJobDetails.vue

@@ -155,7 +155,7 @@

<script setup>
import PanoramaPopup from '@/components/PanoramaPopup/PanoramaPopup.vue';
import { getShowImg, getSmallImg, getzsSmallImg,getzsShowImg } from '@/utils/util';
import { getShowImg, getSmallImg, getzsSmallImg, getzsShowImg, aLinkDownloadUtil } from '@/utils/util';
import { getaiImagesPageAPI,cancelDownloadApi,getDownloadStatusApi,attachDownload,aiImagesPage} from '@/api/dataCenter/dataCenter';
import { pxToRem } from '@/utils/rem'
import JobRelatedEvents from './JobRelatedEvents.vue'
@@ -337,8 +337,8 @@
  if (!list?.length) return ElMessage.warning('请选择文件')
  if (list.length === 1) {
    list.forEach((item, index) => {
      const suffix = item.url.split('.').pop()
      aLinkDownloadUtil(item.url, item.nickName + '.' + suffix)
            const suffix = item.link.split('.').pop()
            aLinkDownloadUtil(item.link, item.nickName + '.' + suffix)
    })
  } else {
    loadingData = ElLoading.service({ background: 'rgba(0, 0, 0, 0.5)', text: '打包中，请稍等...' })

 src/views/layerManagement/index.vue

@@ -64,7 +64,7 @@
import * as Cesium from 'cesium';
import { PublicCesium } from '@/utils/cesium/publicCesium';
import _, { cloneDeep, throttle } from 'lodash';

const isProd = import.meta.env.VITE_APP_ENV === 'production'
import { provide } from 'vue';
import { useStore } from 'vuex';
const isProd = import.meta.env.VITE_APP_ENV === 'production'

 src/views/tickets/ticket.vue