diff --git a/env/.env.development b/env/.env.development index c78f0dc..65c9105 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,6 +4,6 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.246:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' -VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file diff --git a/package.json b/package.json index 22d5959..aabe517 100644 --- a/package.json +++ b/package.json @@ -76,21 +76,28 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4030620241128001", "@dcloudio/uni-mp-xhs": "3.0.0-4030620241128001", "@dcloudio/uni-quickapp-webview": "3.0.0-4030620241128001", + "@tanstack/match-sorter-utils": "^8.19.4", "@tanstack/query-core": "^5.76.0", "@tanstack/vue-query": "^5.62.16", "@vant/area-data": "^2.0.0", + "@vue/devtools-api": "^7.7.6", + "@vue/devtools-kit": "^7.7.6", + "@vue/devtools-shared": "^7.7.6", "abortcontroller-polyfill": "^1.7.8", "base-64": "^1.0.0", + "birpc": "^2.3.0", "charenc": "^0.0.2", "crypt": "^0.0.2", "dayjs": "1.11.10", "echarts": "^5.6.0", "fs-extra": "^11.3.0", + "hookable": "^5.5.3", "is-buffer": "^2.0.5", "js-base64": "^3.6.1", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "md5": "^2.3.0", + "perfect-debounce": "^1.0.0", "pinia": "2.0.36", "pinia-plugin-persistedstate": "3.2.1", "qs": "6.5.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a22990..9b06ce6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,6 +56,9 @@ importers: '@dcloudio/uni-quickapp-webview': specifier: 3.0.0-4030620241128001 version: 3.0.0-4030620241128001(@vueuse/core@11.3.0(vue@3.4.21(typescript@5.7.2)))(postcss@8.4.49)(rollup@4.28.0)(vue@3.4.21(typescript@5.7.2)) + '@tanstack/match-sorter-utils': + specifier: ^8.19.4 + version: 8.19.4 '@tanstack/query-core': specifier: ^5.76.0 version: 5.76.0 @@ -65,12 +68,24 @@ importers: '@vant/area-data': specifier: ^2.0.0 version: 2.0.0 + '@vue/devtools-api': + specifier: ^7.7.6 + version: 7.7.6 + '@vue/devtools-kit': + specifier: ^7.7.6 + version: 7.7.6 + '@vue/devtools-shared': + specifier: ^7.7.6 + version: 7.7.6 abortcontroller-polyfill: specifier: ^1.7.8 version: 1.7.8 base-64: specifier: ^1.0.0 version: 1.0.0 + birpc: + specifier: ^2.3.0 + version: 2.3.0 charenc: specifier: ^0.0.2 version: 0.0.2 @@ -86,6 +101,9 @@ importers: fs-extra: specifier: ^11.3.0 version: 11.3.0 + hookable: + specifier: ^5.5.3 + version: 5.5.3 is-buffer: specifier: ^2.0.5 version: 2.0.5 @@ -101,6 +119,9 @@ importers: md5: specifier: ^2.3.0 version: 2.3.0 + perfect-debounce: + specifier: ^1.0.0 + version: 1.0.0 pinia: specifier: 2.0.36 version: 2.0.36(typescript@5.7.2)(vue@3.4.21(typescript@5.7.2)) @@ -1321,6 +1342,7 @@ packages: '@esbuild/darwin-arm64@0.20.2': resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} engines: {node: '>=12'} + cpu: [arm64] os: [darwin] '@esbuild/darwin-arm64@0.21.5': @@ -1332,6 +1354,7 @@ packages: '@esbuild/darwin-x64@0.20.2': resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} engines: {node: '>=12'} + cpu: [x64] os: [darwin] '@esbuild/darwin-x64@0.21.5': @@ -1928,6 +1951,7 @@ packages: '@rollup/rollup-darwin-x64@4.28.0': resolution: {integrity: sha512-8hxgfReVs7k9Js1uAIhS6zq3I+wKQETInnWQtgzt8JfGx51R1N6DRVy3F4o0lQwumbErRz52YqwjfvuwRxGv1w==} + cpu: [x64] os: [darwin] '@rollup/rollup-freebsd-arm64@4.28.0': @@ -2529,14 +2553,14 @@ packages: '@vue/devtools-api@6.6.4': resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==} - '@vue/devtools-api@7.7.0': - resolution: {integrity: sha512-bHEv6kT85BHtyGgDhE07bAUMAy7zpv6nnR004nSTd0wWMrAOtcrYoXO5iyr20Hkf5jR8obQOfS3byW+I3l2CCA==} + '@vue/devtools-api@7.7.6': + resolution: {integrity: sha512-b2Xx0KvXZObePpXPYHvBRRJLDQn5nhKjXh7vUhMEtWxz1AYNFOVIsh5+HLP8xDGL7sy+Q7hXeUxPHB/KgbtsPw==} - '@vue/devtools-kit@7.7.0': - resolution: {integrity: sha512-5cvZ+6SA88zKC8XiuxUfqpdTwVjJbvYnQZY5NReh7qlSGPvVDjjzyEtW+gdzLXNSd8tStgOjAdMCpvDQamUXtA==} + '@vue/devtools-kit@7.7.6': + resolution: {integrity: sha512-geu7ds7tem2Y7Wz+WgbnbZ6T5eadOvozHZ23Atk/8tksHMFOFylKi1xgGlQlVn0wlkEf4hu+vd5ctj1G4kFtwA==} - '@vue/devtools-shared@7.7.0': - resolution: {integrity: sha512-jtlQY26R5thQxW9YQTpXbI0HoK0Wf9Rd4ekidOkRvSy7ChfK0kIU6vvcBtjj87/EcpeOSK49fZAicaFNJcoTcQ==} + '@vue/devtools-shared@7.7.6': + resolution: {integrity: sha512-yFEgJZ/WblEsojQQceuyK6FzpFDx4kqrz2ohInxNj5/DnhoX023upTv4OD6lNPLAA5LLkbwPVb10o/7b+Y4FVA==} '@vue/language-core@1.8.27': resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==} @@ -2876,8 +2900,8 @@ packages: bing-translate-api@4.0.2: resolution: {integrity: sha512-JJ8XUehnxzOhHU91oy86xEtp8OOMjVEjCZJX042fKxoO19NNvxJ5omeCcxQNFoPbDqVpBJwqiGVquL0oPdQm1Q==} - birpc@0.2.19: - resolution: {integrity: sha512-5WeXXAvTmitV1RqJFppT5QtUiz2p1mRSYU000Jkft5ZUCLJIk4uQriYNO50HknxKwM6jd8utNc66K1qGIwwWBQ==} + birpc@2.3.0: + resolution: {integrity: sha512-ijbtkn/F3Pvzb6jHypHRyve2QApOCZDR25D/VnkY2G/lBNcXCTsnsCxgY4k4PkVB7zfwzYbY3O9Lcqe3xufS5g==} bmp-js@0.1.0: resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==} @@ -10171,21 +10195,21 @@ snapshots: '@vue/devtools-api@6.6.4': {} - '@vue/devtools-api@7.7.0': + '@vue/devtools-api@7.7.6': dependencies: - '@vue/devtools-kit': 7.7.0 + '@vue/devtools-kit': 7.7.6 - '@vue/devtools-kit@7.7.0': + '@vue/devtools-kit@7.7.6': dependencies: - '@vue/devtools-shared': 7.7.0 - birpc: 0.2.19 + '@vue/devtools-shared': 7.7.6 + birpc: 2.3.0 hookable: 5.5.3 mitt: 3.0.1 perfect-debounce: 1.0.0 speakingurl: 14.0.1 superjson: 2.2.2 - '@vue/devtools-shared@7.7.0': + '@vue/devtools-shared@7.7.6': dependencies: rfdc: 1.4.1 @@ -10602,7 +10626,7 @@ snapshots: dependencies: got: 11.8.6 - birpc@0.2.19: {} + birpc@2.3.0: {} bmp-js@0.1.0: {} @@ -14973,7 +14997,7 @@ snapshots: '@shikijs/types': 1.27.0 '@types/markdown-it': 14.1.2 '@vitejs/plugin-vue': 5.2.1(vite@5.4.11(@types/node@20.17.9)(sass@1.77.6)(terser@5.36.0))(vue@3.5.13(typescript@5.7.2)) - '@vue/devtools-api': 7.7.0 + '@vue/devtools-api': 7.7.6 '@vue/shared': 3.5.13 '@vueuse/core': 11.3.0(vue@3.5.13(typescript@5.7.2)) '@vueuse/integrations': 11.3.0(axios@1.7.9)(focus-trap@7.6.4)(vue@3.5.13(typescript@5.7.2)) diff --git a/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts b/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts new file mode 100644 index 0000000..5efa2df --- /dev/null +++ b/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*通过id查询请假数据*/ +export function queryByIdApi(id : string) { + return http({ + url: '/cxcbgjjwxsq/cxcBgjjwxsq/queryByIdForApp',//填写表单的queryById请求地址 + method: 'GET', + data: { id } + }) +} diff --git a/src/api/SuperiorSystem/bpmApi/index.ts b/src/api/SuperiorSystem/bpmApi/index.ts new file mode 100644 index 0000000..9551f60 --- /dev/null +++ b/src/api/SuperiorSystem/bpmApi/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*通过id查询数据*/ +export function queryByIdApi(id : string) { + return http({ + url: '/cxcjyglsjzdgl/cxcJyglSjzdgl/queryByIdForAPP',//填写表单的queryById请求地址 + method: 'GET', + data: { id } + }) +} diff --git a/src/api/lawsAndRegulations/bpmApi/index.ts b/src/api/lawsAndRegulations/bpmApi/index.ts new file mode 100644 index 0000000..bb1b4f7 --- /dev/null +++ b/src/api/lawsAndRegulations/bpmApi/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*通过id查询请假数据*/ +export function queryByIdApi(id : string) { + return http({ + url: '/cxcoaflgf/cxcOaFlgf/queryByIdForApp',//填写表单的queryById请求地址 + method: 'GET', + data: { id } + }) +} diff --git a/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue b/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue new file mode 100644 index 0000000..04bf31b --- /dev/null +++ b/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue @@ -0,0 +1,49 @@ + + + diff --git a/src/pages-bpm/SuperiorSystem/index.vue b/src/pages-bpm/SuperiorSystem/index.vue new file mode 100644 index 0000000..0565728 --- /dev/null +++ b/src/pages-bpm/SuperiorSystem/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/pages-bpm/lawsAndRegulations/index.vue b/src/pages-bpm/lawsAndRegulations/index.vue new file mode 100644 index 0000000..9dbb7f4 --- /dev/null +++ b/src/pages-bpm/lawsAndRegulations/index.vue @@ -0,0 +1,59 @@ + + + diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index c7873b2..b7b0692 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -40,6 +40,7 @@ }) // 监听 option 变化 watch(() => props.path, (newVal) => { + console.log("newVal----",newVal) if (newVal){ compName.value = newVal; if(newVal.indexOf('index')==-1){ diff --git a/src/pages.json b/src/pages.json index 7468f94..4e1b946 100644 --- a/src/pages.json +++ b/src/pages.json @@ -508,9 +508,21 @@ { "root": "pages-bpm", "pages": [ + { + "path": "lawsAndRegulations/index", + "type": "page" + }, { "path": "leaveApplication/index", "type": "page" + }, + { + "path": "OfficeEquipmentMaintenanceApplication/index", + "type": "page" + }, + { + "path": "SuperiorSystem/index", + "type": "page" } ] } diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 8d0baa7..1f2ff16 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -55,7 +55,10 @@ interface NavigateToOptions { "/pages-process/approvalTabbar" | "/pages-process/myApplyProcess" | "/pages-process/taskHandle" | - "/pages-bpm/leaveApplication/index"; + "/pages-bpm/lawsAndRegulations/index" | + "/pages-bpm/leaveApplication/index" | + "/pages-bpm/OfficeEquipmentMaintenanceApplication/index" | + "/pages-bpm/SuperiorSystem/index"; } interface RedirectToOptions extends NavigateToOptions {}