diff --git a/env/.env.development b/env/.env.development index 8293b47..ddf4bdc 100644 --- a/env/.env.development +++ b/env/.env.development @@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true # 是否启用读取配置文件 min #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -VITE_SERVER_BASEURL = 'http://10.75.15.246:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' #websocket连接url-测试用 VITE_WEBSOCKET_URL = 'ws://10.75.15.246:8899/mqttprod/ws/simple' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' diff --git a/env/.env.production b/env/.env.production index 2984c4d..812226c 100644 --- a/env/.env.production +++ b/env/.env.production @@ -8,9 +8,5 @@ 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://szcx.zyyt.sinopec.com/wwapi' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' diff --git a/manifest.config.ts b/manifest.config.ts index 2a74033..9bed492 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -76,6 +76,8 @@ export default defineManifestConfig({ '', '', ], + // app外连接访问 by 闵 + schemes : "szcxapp" }, /* ios打包配置 */ ios: {}, diff --git a/src/App.vue b/src/App.vue index a987fbc..1292763 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,18 +7,35 @@ import { getLocation, useUpdateApp } from '@/utils'; export default { onLaunch: function (options) { + console.log(options) // 检查更新 useUpdateApp().checkAppUpdate() // 定位 getLocation() + // 处理外部唤醒逻辑 min + if (options.path && options.query) { + const path = options.path; // 获取路径,如 "pages/home/index" + const query = options.query; // 获取参数,如 {id: 123} + uni.navigateTo({ + url: `/${path}?${Object.keys(query).map(k => `${k}=${query[k]}`).join('&')}` + }); + } }, onShow: function (options) { + + var args= plus.runtime.arguments; + if(args){ + // 处理args参数,如直达到某新页面等 + } + console.log(args) + //改造了一下,加了白名单验证 //为了实现实流检定的证书验证页面 //jiang 20250605 // 定义白名单页面 const publicPages = [ - '/pages/sljd/index' + '/pages/sljd/index', + '/pages/linktoapp/index' ] // 检查当前页面是否在白名单中 diff --git a/src/api/officialReceptions/index.ts b/src/api/officialReceptions/index.ts new file mode 100644 index 0000000..6b0defe --- /dev/null +++ b/src/api/officialReceptions/index.ts @@ -0,0 +1,10 @@ +import { http } from '@/utils/http'; + +/*通过id查询公文数据*/ +export function queryById(id : string) { + return http({ + url: '/CxcGwjdSpd/cxcGwjdSpd/queryByIdBpm', + method: 'GET', + data: { id } + }) +} diff --git a/src/api/plan/index.ts b/src/api/plan/index.ts new file mode 100644 index 0000000..ad7523c --- /dev/null +++ b/src/api/plan/index.ts @@ -0,0 +1,10 @@ +import { http } from '@/utils/http'; + +/*通过id查询公文数据*/ +export function queryByIdBpm(id : string) { + return http({ + url: '/cxcjhcwjswxjh/cxcJhcwJswxjh/queryByIdBpm', + method: 'GET', + data: { id } + }) +} diff --git a/src/components/Esign/SinopecEsignPage.vue b/src/components/Esign/SinopecEsignPage.vue index 1e41d35..1e03617 100644 --- a/src/components/Esign/SinopecEsignPage.vue +++ b/src/components/Esign/SinopecEsignPage.vue @@ -2,10 +2,10 @@ @@ -40,6 +40,10 @@ path: {//签章验证 type: String, default: "" + }, + taskDefKey: { //流程节点 + type: String, + default: "" } }) diff --git a/src/components/Esign/SinopecEsignPageAPP.vue b/src/components/Esign/SinopecEsignPageAPP.vue index fb275f8..e61c54d 100644 --- a/src/components/Esign/SinopecEsignPageAPP.vue +++ b/src/components/Esign/SinopecEsignPageAPP.vue @@ -45,6 +45,10 @@ export default { path: {//签章验证 type: String, default: "" + }, + taskDefKey: { //流程节点 + type: String, + default: "" } }, emits: ['message'], @@ -107,10 +111,14 @@ export default { } else { return flag = false; } - } else if (props.path == 'modules/gwjdspd/modules/CxcGwjdSpdFromByProcess') { //判断公务接待模块 + } else if (props.path == 'officialReceptions/index') { //判断公务接待模块 //2024.5.16张祥瑞 //如果签章路径是非常规盖章则走这里,验证机制为跳过签章个数验证,只要没签章则不能提交流程 // let flag = false; + if(props.taskDefKey=='task1715564108096'){ //如果是综合办审核,不需要该区 + return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 + } + if (sign.value) { return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 } else { diff --git a/src/components/Esign/SinopecEsignPageH5.vue b/src/components/Esign/SinopecEsignPageH5.vue index 72a21bb..a10ac8e 100644 --- a/src/components/Esign/SinopecEsignPageH5.vue +++ b/src/components/Esign/SinopecEsignPageH5.vue @@ -60,6 +60,10 @@ path: {//签章验证 type: String, default: "" + }, + taskDefKey: { //流程节点 + type: String, + default: "" } }) @@ -90,7 +94,7 @@ const signValidator = async () => { //签章验证 by 闵 - console.log(props.valiData) + console.log(props.path) errorMsg.value = ''; let flag = false; if (props.path == 'unconventional/stamp') { //非常规验证 @@ -126,10 +130,15 @@ } else { return flag = false; } - } else if (props.path == 'modules/gwjdspd/modules/CxcGwjdSpdFromByProcess') { //判断公务接待模块 + } else if (props.path == 'officialReceptions/index') { //判断公务接待模块 //2024.5.16张祥瑞 //如果签章路径是非常规盖章则走这里,验证机制为跳过签章个数验证,只要没签章则不能提交流程 // let flag = false; + console.log(2222) + if(props.taskDefKey=='task1715564108096'){ //如果是综合办审核,不需要该区 + return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 + } + if (sign.value) { return flag = true; //只要执行了签章成功操作就返回成功,否则加载个数验证 } else { diff --git a/src/components/Mupload/Mupload.vue b/src/components/Mupload/Mupload.vue index 147b209..e5e29b5 100644 --- a/src/components/Mupload/Mupload.vue +++ b/src/components/Mupload/Mupload.vue @@ -1,10 +1,10 @@