From 01292d1f50af8d5b31150ed6a5bc6071d24481d7 Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Tue, 9 Sep 2025 10:11:09 +0800 Subject: [PATCH 1/2] 1 --- env/.env.development | 5 +++-- env/.env.production | 4 ++-- src/components/Esign/SinopecEsignPageH5.vue | 3 ++- src/pages-bpm/officialReceptions/index.vue | 1 + src/pages/login/login.vue | 10 +++++----- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/env/.env.development b/env/.env.development index f246eb6..9045ec2 100644 --- a/env/.env.development +++ b/env/.env.development @@ -9,10 +9,11 @@ VITE_SHOW_SOURCEMAP = true VITE_WEBAPP = '' #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot' -VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot' +#VITE_SERVER_BASEURL = 'https://10.75.166.6/test' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' diff --git a/env/.env.production b/env/.env.production index 308b458..d961230 100644 --- a/env/.env.production +++ b/env/.env.production @@ -8,7 +8,7 @@ VITE_SHOW_SOURCEMAP = false #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' - -VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +VITE_SERVER_BASEURL = 'https://10.75.166.6/test' +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' diff --git a/src/components/Esign/SinopecEsignPageH5.vue b/src/components/Esign/SinopecEsignPageH5.vue index dce340d..355293d 100644 --- a/src/components/Esign/SinopecEsignPageH5.vue +++ b/src/components/Esign/SinopecEsignPageH5.vue @@ -80,6 +80,7 @@ iframeWin.value = iframe.value.contentWindow console.log(iframe.value) console.log(iframe.value.contentWindow) + console.log(props.fileName) try { iframeWin.value.postMessage({ filename: props.fileName, @@ -138,7 +139,7 @@ if(props.taskDefKey=='task1715564108096'){ //如果是综合办审核，不需要该区 return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证 } - return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证 + // return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证 if (sign.value) { return flag = true; //只要执行了签章成功操作就返回成功，否则加载个数验证 } else { diff --git a/src/pages-bpm/officialReceptions/index.vue b/src/pages-bpm/officialReceptions/index.vue index c3d83b7..ac5f65d 100644 --- a/src/pages-bpm/officialReceptions/index.vue +++ b/src/pages-bpm/officialReceptions/index.vue @@ -75,6 +75,7 @@ if(info.value.jdsqwj){ info.value.jdsqwj = info.value.jdsqwj.replace("PdfFiles/PdfFile/",'') } + console.log(info.value.jdsqwj) }else{ toast.error(res.message) } diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 07f4ecf..512b6f6 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -137,12 +137,12 @@ }) } else { /*开发环境 */ - // params.captcha = 'app'; + params.captcha = 'app'; /*生产环境 */ - params = { - username: Base64.encode(encodeURIComponent(userName.value)), - password: Base64.encode(encodeURIComponent(password.value)), - }; + // params = { + // username: Base64.encode(encodeURIComponent(userName.value)), + // password: Base64.encode(encodeURIComponent(password.value)), + // }; } login(params) } From 5477eaebe928fbe30afe8b80a9360bffeca01bec Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Thu, 11 Sep 2025 15:26:23 +0800 Subject: [PATCH 2/2] 1 --- env/.env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env/.env.development b/env/.env.development index 9045ec2..514145c 100644 --- a/env/.env.development +++ b/env/.env.development @@ -8,12 +8,12 @@ VITE_SHOW_SOURCEMAP = true #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://10.75.166.6/test' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi'