duy 3 долоо хоног өмнө
parent
commit
9ff67ebbc4

+ 2 - 2
src/plugins/HcPdfSign.js

@@ -1,5 +1,5 @@
 import { getArrValue, getRandom, isNullES, isNumber, isString } from 'js-fast-way'
-import encodeFullUrl from '~src/utils/safe-url-encoder'
+
 
 // PDF签章类
 export default class HcPdfSign {
@@ -125,7 +125,7 @@ export default class HcPdfSign {
     static createIframe(dom, url, isShowYinzhang) {
         const iframe = document.createElement('iframe')
         iframe.setAttribute('id', 'pdf-sign-' + getRandom(6))
-        iframe.src = `/plugins/pdfjs/sign/web/viewer.html?file=${encodeFullUrl(url)}#zoom=100`
+        iframe.src = `/plugins/pdfjs/sign/web/viewer.html?file=${encodeURIComponent(url)}#zoom=100`
         iframe.style.width = '100%'
         iframe.style.height = '100%'
         iframe.style.border = '1px solid #ccc'

+ 2 - 2
src/utils/btn-auth.js

@@ -3,7 +3,7 @@ import { useAppStore } from '~src/store'
 import { decode, encode } from 'js-base64'
 import { getObjVal, isNullES } from 'js-fast-way'
 import { fullDrawer } from 'hc-vue3-ui'
-import encodeFullUrl from '~src/utils/safe-url-encoder'
+
 
 
 //初始变量
@@ -26,7 +26,7 @@ export const toPdfPage = (url) => {
         return
     }
     let rawUrl = url
-    const encodedUrl = encodeFullUrl(rawUrl)
+    const encodedUrl = encodeURIComponent(rawUrl)
 console.log(encodedUrl, 'encodedUrl')
 
     fullDrawer({

+ 3 - 3
src/views/archives/manage/carryDrawer/carrySpotChecksDrawer.vue

@@ -142,7 +142,7 @@ import MetaTable from '../components/meta-table.vue'
 import archiveQueryApi from '~api/using/query.js'
 import { getArrValue } from 'js-fast-way'
 import tuningApi from '~api/archiveConfig/tuning.js'
-import encodeFullUrl from '~src/utils/safe-url-encoder'
+
 
 
 //参数
@@ -298,7 +298,7 @@ const getArchiveFileListData = async () => {
                    checkmetaFileId.value = cscTableData1.value[0].id
             // pdfUrl.value = cscTableData1.value[0].pdfFileUrl
                 let rawUrl = cscTableData1.value[0].pdfFileUrl
-                const encodedUrl = encodeFullUrl(rawUrl)
+                const encodedUrl = encodeURIComponent(rawUrl)
                 pdfUrl.value = encodedUrl
                 checkId.value = cscTableData1.value[0].id
                 getmetaInfo()
@@ -339,7 +339,7 @@ const changePdf = (row) => {
     }, 100)
 
     let rawUrl = row['pdfFileUrl'] || ''
-    const encodedUrl = encodeFullUrl(rawUrl)
+    const encodedUrl = encodeURIComponent(rawUrl)
     pdfUrl.value = encodedUrl
     checkId.value = row.id
     checkmetaFileId.value = row.id

+ 4 - 4
src/views/archives/manage/inspects.vue

@@ -184,7 +184,7 @@ import tuningApi from '~api/archiveConfig/tuning.js'
 import archiveQueryApi from '~api/using/query.js'
 import inspectApi from '~api/transfer/inspects.js'
 import tuning from '../../../api/modules/archiveConfig/tuning'
-import encodeFullUrl from '~src/utils/safe-url-encoder'
+
 
 //变量
 const useAppState = useAppStore()
@@ -353,7 +353,7 @@ const getArchiveFileListData = async ()=>{
             checkmetaFileId.value = cscTableData1.value[0].id
             let rawUrl = cscTableData1.value[0]?.pdfFileUrl || ''
 
-        const encodedUrl = encodeFullUrl(rawUrl)
+        const encodedUrl = encodeURIComponent(rawUrl)
         pdfUrl.value = encodedUrl
         console.log(encodedUrl, 'encodedUrl')
         
@@ -397,9 +397,9 @@ const changePdf = (row)=>{
     // pdfUrl.value = row['pdfFileUrl'] || ''
 
     let rawUrl = row['pdfFileUrl'] || ''
-            const encodedUrl = encodeFullUrl(rawUrl)
+        const encodedUrl = encodeURIComponent(rawUrl)
         pdfUrl.value = encodedUrl
-        console.log(encodedUrl, 'encodedUrl')
+   
     checkId.value = row.id
     checkmetaFileId.value = row.id
     getmetaInfo()

+ 7 - 4
src/views/archives/manage/query.vue

@@ -546,7 +546,7 @@ import imageViewGui from '~src/assets/view/gui.png'
 import imageViewGui1 from '~src/assets/view/gui1.png'
 import imageViewGui2 from '~src/assets/view/gui2.png'
 import { setTimeString } from '~src/utils/tools'
-import encodeFullUrl from '~src/utils/safe-url-encoder'
+
 
 //变量
 const useAppState = useAppStore()
@@ -1126,7 +1126,7 @@ const getArchiveFileListData = async () => {
         cscTableData1.value = getArrValue(data['approvalFileList'])
         // pdfUrl.value = tableFileData.value[0]?.pdfFileUrl
         let rawUrl = tableFileData.value[0]?.pdfFileUrl
-        const encodedUrl = encodeFullUrl(rawUrl)
+        const encodedUrl = encodeURIComponent(rawUrl)
         pdfUrl.value = encodedUrl
         checkId.value = tableFileData.value[0]?.id
 
@@ -1200,8 +1200,9 @@ const consultFileClick = async (row, type) => {
         checkId.value = row.id
         // pdfUrl.value = row.pdfFileUrl
         let rawUrl = row.pdfFileUrl
-        const encodedUrl = encodeFullUrl(rawUrl)
+        const encodedUrl = encodeURIComponent(rawUrl)
         pdfUrl.value = encodedUrl
+        console.log(pdfUrl.value, '222222222222')
         getmetaInfo(checkId.value)
         isCarrySpotChecksDrawer.value = true
     }
@@ -1233,8 +1234,10 @@ const changePdf = (row, index) => {
     // pdfUrl.value = row['pdfFileUrl'] || ''
  
     let rawUrl = row['pdfFileUrl'] || ''
-        const encodedUrl = encodeFullUrl(rawUrl)
+  
+        const encodedUrl = encodeURIComponent(rawUrl)
         pdfUrl.value = encodedUrl
+                console.log( pdfUrl.value, ' pdfUrl.value')
     checkId.value = row.id
     isFile.value = 2
     getmetaInfo(checkId.value)

+ 3 - 3
src/views/transfer/components/carry-spot-checks.vue

@@ -173,7 +173,7 @@ import archiveQueryApi from '~api/using/query.js'
 import { getArrValue, getObjValue, getRandom } from 'js-fast-way'
 import tuningApi from '~api/archiveConfig/tuning.js'
 import initialgApi from '~api/initial/initial'
-import encodeFullUrl from '~src/utils/safe-url-encoder'
+
 
 //参数
 const props = defineProps({
@@ -329,7 +329,7 @@ const getArchiveFileListData = async () => {
             checkmetaFileId.value = cscTableData1.value[0].id
             // pdfUrl.value = cscTableData1.value[0].pdfFileUrl
             let rawUrl = cscTableData1.value[0].pdfFileUrl
-        const encodedUrl = encodeFullUrl(rawUrl)
+        const encodedUrl = encodeURIComponent(rawUrl)
         pdfUrl.value = encodedUrl
             checkId.value = cscTableData1.value[0].id
             getmetaInfo()
@@ -368,7 +368,7 @@ const changePdf = (row) => {
     }, 100)
     // pdfUrl.value = row['pdfFileUrl'] || ''
     let rawUrl = row['pdfFileUrl'] || ''
-    const encodedUrl = encodeFullUrl(rawUrl)
+    const encodedUrl = encodeURIComponent(rawUrl)
     pdfUrl.value = encodedUrl
     checkId.value = row.id
     checkmetaFileId.value = row.id