Merge branch 'master' of http://pqmcc.com:3000/Web/admin-sjzx

# Conflicts:
#	src/views/pqs/supervise/technology/feedbackPopup.vue

src/utils/fileDownLoad.ts

@@ -1,6 +1,7 @@
 import { downloadFile } from '@/api/system-boot/file'
 // 下载文件
 export const download = (urls: string) => {
+    console.log("🚀 ~ download ~ urls:", urls)
     downloadFile({ filePath: urls }).then((res: any) => {
         let blob = new Blob([res], {
             type: urls.includes('.pdf')

src/views/pqs/supervise/technology/feedbackPopup.vue

@@ -24,7 +24,7 @@
                     <el-icon class="elView" v-if="problemDetail?.problemName && VITE_FLAG">
                         <View @click="openFile(problemDetail?.problemName)" />
                     </el-icon>
-                   <span class="aLoad" @click="download(supervisionReportDetail.keyName)" target="_blank">{{ problemDetail.problemName }}</span>
+                   <span class="aLoad" @click="download(supervisionReportDetail.keyName)" target="_blank">{{ problemDetail.problemName }}</span >
                 </el-form-item>
 
                 <el-form-item label="采取的措施：" prop="takeStep">

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue

@@ -4,7 +4,7 @@
             <el-icon>
                 <Link />
             </el-icon>
-            <a :href="detailData?.lineFilePath.url">
+            <span :href="detailData?.lineFilePath.url">
                 {{ detailData?.lineFilePath.name }}
            </span >
         </el-descriptions-item>