From 25cbc74830a219132a31716acc94942e9a068239 Mon Sep 17 00:00:00 2001 From: jiang <358254771@qq.com> Date: Mon, 9 Jun 2025 08:23:21 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=AE=9E=E6=B5=81=E6=A3=80=E5=AE=9A?= =?UTF-8?q?=EF=BC=8C=E8=84=B1=E7=A6=BB=E7=99=BB=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 7 + pnpm-lock.yaml | 67 ++++++---- src/App.vue | 57 +++++--- src/pages.json | 9 ++ src/pages/onlinePreview/onlinePreviewH5.vue | 3 - src/pages/sljd/index.vue | 137 ++++++++++++++++++++ src/router/index.ts | 2 +- src/types/uni-pages.d.ts | 1 + 8 files changed, 233 insertions(+), 50 deletions(-) create mode 100644 src/pages/sljd/index.vue diff --git a/package.json b/package.json index 22d5959..970f434 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "@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", @@ -127,9 +128,13 @@ "@uni-helper/vite-plugin-uni-pages": "0.2.20", "@uni-helper/vite-plugin-uni-platform": "^0.0.4", "@unocss/preset-legacy-compat": "^0.59.4", + "@vue/devtools-api": "^7.7.6", + "@vue/devtools-kit": "^7.7.6", + "@vue/devtools-shared": "^7.7.6", "@vue/runtime-core": "^3.4.21", "@vue/tsconfig": "^0.1.3", "autoprefixer": "^10.4.20", + "birpc": "^2.3.0", "commitlint": "^18.6.1", "czg": "^1.9.4", "eslint": "^8.57.1", @@ -139,8 +144,10 @@ "eslint-plugin-import": "^2.31.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-vue": "^9.32.0", + "hookable": "^5.5.3", "mockjs": "^1.1.0", "openapi-ts-request": "^1.1.2", + "perfect-debounce": "^1.0.0", "postcss": "^8.4.49", "postcss-html": "^1.7.0", "postcss-scss": "^4.0.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a22990..86da682 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 @@ -204,6 +207,15 @@ importers: '@unocss/preset-legacy-compat': specifier: ^0.59.4 version: 0.59.4 + '@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 '@vue/runtime-core': specifier: ^3.4.21 version: 3.5.13 @@ -213,6 +225,9 @@ importers: autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.4.49) + birpc: + specifier: ^2.3.0 + version: 2.3.0 commitlint: specifier: ^18.6.1 version: 18.6.1(@types/node@20.17.9)(typescript@5.7.2) @@ -240,12 +255,18 @@ importers: eslint-plugin-vue: specifier: ^9.32.0 version: 9.32.0(eslint@8.57.1) + hookable: + specifier: ^5.5.3 + version: 5.5.3 mockjs: specifier: ^1.1.0 version: 1.1.0 openapi-ts-request: specifier: ^1.1.2 version: 1.1.2(@types/node@20.17.9)(@vue/compiler-sfc@3.5.13)(chokidar@3.6.0)(typescript@5.7.2) + perfect-debounce: + specifier: ^1.0.0 + version: 1.0.0 postcss: specifier: ^8.4.49 version: 8.4.49 @@ -1213,14 +1234,12 @@ packages: engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [gnu] '@dcloudio/uts-linux-x64-musl@3.0.0-4030620241128001': resolution: {integrity: sha512-HbuOIYCe0KTzW42oqACQDmSuLWmiEG9zUE3rGpp5QP3MKpcB4wJ5BAOusCt3V02akyVv4/IGToktN8dc9N7+Eg==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [musl] '@dcloudio/uts-win32-ia32-msvc@3.0.0-4030620241128001': resolution: {integrity: sha512-pgITm85ya64iJ19mixTUOiYVAyCJQ+V66L5Ue/cmME6CA2dU9DjTtPEP6DdSnoyq9JWcdbQLyVEQkxxtBSOyGA==} @@ -1321,6 +1340,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 +1352,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 +1949,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': @@ -1944,55 +1966,46 @@ packages: resolution: {integrity: sha512-WXveUPKtfqtaNvpf0iOb0M6xC64GzUX/OowbqfiCSXTdi/jLlOmH0Ba94/OkiY2yTGTwteo4/dsHRfh5bDCZ+w==} cpu: [arm] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.28.0': resolution: {integrity: sha512-yLc3O2NtOQR67lI79zsSc7lk31xjwcaocvdD1twL64PK1yNaIqCeWI9L5B4MFPAVGEVjH5k1oWSGuYX1Wutxpg==} cpu: [arm] os: [linux] - libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.28.0': resolution: {integrity: sha512-+P9G9hjEpHucHRXqesY+3X9hD2wh0iNnJXX/QhS/J5vTdG6VhNYMxJ2rJkQOxRUd17u5mbMLHM7yWGZdAASfcg==} cpu: [arm64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.28.0': resolution: {integrity: sha512-1xsm2rCKSTpKzi5/ypT5wfc+4bOGa/9yI/eaOLW0oMs7qpC542APWhl4A37AENGZ6St6GBMWhCCMM6tXgTIplw==} cpu: [arm64] os: [linux] - libc: [musl] '@rollup/rollup-linux-powerpc64le-gnu@4.28.0': resolution: {integrity: sha512-zgWxMq8neVQeXL+ouSf6S7DoNeo6EPgi1eeqHXVKQxqPy1B2NvTbaOUWPn/7CfMKL7xvhV0/+fq/Z/J69g1WAQ==} cpu: [ppc64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.28.0': resolution: {integrity: sha512-VEdVYacLniRxbRJLNtzwGt5vwS0ycYshofI7cWAfj7Vg5asqj+pt+Q6x4n+AONSZW/kVm+5nklde0qs2EUwU2g==} cpu: [riscv64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.28.0': resolution: {integrity: sha512-LQlP5t2hcDJh8HV8RELD9/xlYtEzJkm/aWGsauvdO2ulfl3QYRjqrKW+mGAIWP5kdNCBheqqqYIGElSRCaXfpw==} cpu: [s390x] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.28.0': resolution: {integrity: sha512-Nl4KIzteVEKE9BdAvYoTkW19pa7LR/RBrT6F1dJCV/3pbjwDcaOq+edkP0LXuJ9kflW/xOK414X78r+K84+msw==} cpu: [x64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-musl@4.28.0': resolution: {integrity: sha512-eKpJr4vBDOi4goT75MvW+0dXcNUqisK4jvibY9vDdlgLx+yekxSm55StsHbxUsRxSTt3JEQvlr3cGDkzcSP8bw==} cpu: [x64] os: [linux] - libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.28.0': resolution: {integrity: sha512-Vi+WR62xWGsE/Oj+mD0FNAPY2MEox3cfyG0zLpotZdehPFXwz6lypkGs5y38Jd/NVSbOD02aVad6q6QYF7i8Bg==} @@ -2529,14 +2542,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 +2889,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 +10184,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 +10615,7 @@ snapshots: dependencies: got: 11.8.6 - birpc@0.2.19: {} + birpc@2.3.0: {} bmp-js@0.1.0: {} @@ -14973,7 +14986,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/App.vue b/src/App.vue index 1814e62..b61a09a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,30 +13,49 @@ getLocation() }, onShow: function (options) { - if (uni.getStorageSync('logintime') && uni.getStorageSync('logintime') + 1800000 <= Date.now()) { //登录半小时自动注销 需重新登陆 - uni.removeStorageSync('logintime') - uni.navigateTo({ - url: '/pages/login/login' - }) - return + //改造了一下，加了白名单验证 + //为了实现实流检定的证书验证页面 + //jiang 20250605 + // 定义白名单页面 + const publicPages = [ + '/pages/sljd/index' + ] + + // 检查当前页面是否在白名单中 + const isPublicPage = publicPages.includes(`/${options.path}`) + + // 非白名单页面才执行登录检查 + if (!isPublicPage) { + if (uni.getStorageSync('logintime') && uni.getStorageSync('logintime') + 1800000 <= Date.now()) { + uni.removeStorageSync('logintime') + uni.navigateTo({ + url: '/pages/login/login' + }) + return + } } - // 首次进入页面时路由拦截 + + // 路由拦截（白名单页面跳过） setTimeout(() => { const currentPage = options.path - beforEach({ path: '/' }, { path: currentPage, fullPath: currentPage }, (data) => { - if (data?.path) { - uni.redirectTo({ url: data.path }) - } - }) + if (!isPublicPage) { + beforEach({ path: '/' }, { path: currentPage, fullPath: currentPage }, (data) => { + if (data?.path) { + uni.redirectTo({ url: data.path }) + } + }) + } }, 100) - jurisdictionApi("1827997127165677570").then((res : any) => { - // 0正常 1灰化 - if (res.success) { - const appStore = useAppStore() - appStore.setIsGray(res.result.value) // 更新状态 - } - }) + // 权限检查（非白名单页面执行） + if (!isPublicPage) { + jurisdictionApi("1827997127165677570").then((res : any) => { + if (res.success) { + const appStore = useAppStore() + appStore.setIsGray(res.result.value) + } + }) + } }, // 全局变量 diff --git a/src/pages.json b/src/pages.json index 73adb11..e44fad2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -148,6 +148,15 @@ "navigationBarTitleText": "生产数据" } }, + { + "path": "pages/sljd/index", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "实流检定" + } + }, { "path": "pages/user/people", "type": "page", diff --git a/src/pages/onlinePreview/onlinePreviewH5.vue b/src/pages/onlinePreview/onlinePreviewH5.vue index ecd787b..1701791 100644 --- a/src/pages/onlinePreview/onlinePreviewH5.vue +++ b/src/pages/onlinePreview/onlinePreviewH5.vue @@ -16,9 +16,6 @@ import { onLoad } from '@dcloudio/uni-app'; - import { - getEnvBaseUrl - } from '@/utils/index' import { Base64 } from 'js-base64' diff --git a/src/pages/sljd/index.vue b/src/pages/sljd/index.vue new file mode 100644 index 0000000..d216194 --- /dev/null +++ b/src/pages/sljd/index.vue @@ -0,0 +1,137 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '实流检定', + }, + } + + + + + + + + \ No newline at end of file diff --git a/src/components/Esign/SinopecEsignPageH5.vue b/src/components/Esign/SinopecEsignPageH5.vue new file mode 100644 index 0000000..72a21bb --- /dev/null +++ b/src/components/Esign/SinopecEsignPageH5.vue @@ -0,0 +1,230 @@ + + + + + \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index 5fdabbc..df63d6a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -89,8 +89,19 @@ } } }, + "android": { + "webView": { + "domStorageEnabled": true, + "databaseEnabled": true, + "allowFileAccess": true + } + }, "compatible": { "ignoreVersion": true + }, + "webview": { + "debug": true, + "crossDomain": true } }, "quickapp": {}, diff --git a/src/pages-bpm/unconventional/index.vue b/src/pages-bpm/unconventional/index.vue new file mode 100644 index 0000000..84f6298 --- /dev/null +++ b/src/pages-bpm/unconventional/index.vue @@ -0,0 +1,52 @@ + + + \ No newline at end of file diff --git a/src/pages-bpm/unconventional/stamp.vue b/src/pages-bpm/unconventional/stamp.vue new file mode 100644 index 0000000..010f279 --- /dev/null +++ b/src/pages-bpm/unconventional/stamp.vue @@ -0,0 +1,123 @@ + + + + \ No newline at end of file diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index c7873b2..39aa385 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -1,16 +1,17 @@ - \ No newline at end of file diff --git a/src/pages-humanResource/absence/detail.vue b/src/pages-humanResource/absence/detail.vue index 5c45dd6..8fe62d8 100644 --- a/src/pages-humanResource/absence/detail.vue +++ b/src/pages-humanResource/absence/detail.vue @@ -67,7 +67,9 @@ if (res.success) { info.value = res.result.records[0] minDate.value = dateStringToTimestamp(info.value.begintime) - image.value = info.value.path.split(',').map(path => imgUrl(path)) + if(image.value.path){ + image.value = info.value.path.split(',').map(path => imgUrl(path)) + } } }) } diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue index 23df1bd..b383575 100644 --- a/src/pages-humanResource/absence/index.vue +++ b/src/pages-humanResource/absence/index.vue @@ -118,6 +118,7 @@ pageSize }).then((res) => { if (res.success) { + console.log('----',res.result.records) list.value = [...list.value, ...res.result.records] } loading = false diff --git a/src/pages-operate/file/detail.vue b/src/pages-operate/file/detail.vue index 310104f..f93bb7a 100644 --- a/src/pages-operate/file/detail.vue +++ b/src/pages-operate/file/detail.vue @@ -19,7 +19,7 @@ - {{dataSource.jdwj}} + {{getFilename(dataSource.jdwj)}} @@ -33,7 +33,10 @@ import { queryDataById } from '@/api/pages/file' - + import { + getFilename + } from '@/utils' + const appStore = useAppStore() const dataSource = ref({}) diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index c7873b2..dc9c5e3 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -1,18 +1,18 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/pages-process/components/taskDeal.vue b/src/pages-process/components/taskDeal.vue index eed1a6f..3d0e78e 100644 --- a/src/pages-process/components/taskDeal.vue +++ b/src/pages-process/components/taskDeal.vue @@ -189,7 +189,6 @@ \ No newline at end of file diff --git a/src/pages-process/taskHandle.vue b/src/pages-process/taskHandle.vue index 74c433d..d44c959 100644 --- a/src/pages-process/taskHandle.vue +++ b/src/pages-process/taskHandle.vue @@ -165,15 +165,17 @@ flag: false, type: 0, } - console.log(linkRef.value) - let data = await linkRef.value.signValidator() - if(data==false||data==true){ - callData.flag = data; - callData.type = 1; + if(linkRef.value.ifEsign){ + let data = await linkRef.value.signValidator() + if(data==false||data==true){ + callData.flag = data; + callData.type = 1; + }else{ + callData.flag = true; + } }else{ callData.flag = true; } - console.log(callData) callback(callData); } diff --git a/src/pages.json b/src/pages.json index ac882b8..c5bf3e1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -536,7 +536,8 @@ { "path": "unconventional/stamp", "type": "page" - } { + }, + { "path": "zbkh/index", "type": "page" } diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 0a1baf6..181b6cd 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -57,12 +57,12 @@ interface NavigateToOptions { "/pages-process/myApplyProcess" | "/pages-process/taskHandle" | "/pages-bpm/carRental/index" | - + "/pages-bpm/document/index" | "/pages-bpm/leaveApplication/index" | "/pages-bpm/unconventional/index" | - "/pages-bpm/unconventional/stamp"; "/pages-bpm/document/index" | - "/pages-bpm/leaveApplication/index" | - "/pages-bpm/zbkh/index";} + "/pages-bpm/unconventional/stamp" | + "/pages-bpm/zbkh/index"; +} interface RedirectToOptions extends NavigateToOptions {} interface SwitchTabOptions { From be8ca7445ee446135764d1cd9e6e1863222b35cd Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Mon, 16 Jun 2025 11:35:05 +0800 Subject: [PATCH 07/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env | 2 ++ env/.env.development | 4 +-- src/pages-process/components/DynamicLink.vue | 30 +++++++++++++++----- src/pages-process/taskHandle.vue | 9 +++--- src/pages/login/login.vue | 4 +-- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/env/.env b/env/.env index 895cca4..ffa26f4 100644 --- a/env/.env +++ b/env/.env @@ -4,6 +4,8 @@ VITE_APP_PORT = 9000 VITE_UNI_APPID = '__UNI__9F097F0' VITE_WX_APPID = 'wx8e287639924edb51' +#发布版本号 + # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base VITE_APP_PUBLIC_BASE=/ diff --git a/env/.env.development b/env/.env.development index c78f0dc..375d2cf 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.247: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/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index 39aa385..a0fe46a 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -47,16 +47,25 @@ //动态加载页面 const comp = modules[`/src/pages-bpm/${compName.value}.vue`] if(!comp){ + console.log(newVal) if(newVal.indexOf('index')==-1){ compName.value = newVal+'/index' - comp = modules[`/src/pages-bpm/${compName.value}.vue`] + console.log(compName.value) + const comp2 = modules[`/src/pages-bpm/${compName.value}.vue`] + comp2().then((myModule) => { + asyncComponent.value = myModule.default + }).catch(() => { + + }) } + }else{ + comp().then((myModule) => { + asyncComponent.value = myModule.default + }).catch(() => { + + }) } - comp().then((myModule) => { - asyncComponent.value = myModule.default - }).catch(() => { - - }) + }, { deep: true, // #ifdef MP-WEIXIN @@ -65,8 +74,15 @@ }); const signValidator = ()=>{ + console.log(comptRef.value) //这里进行电子签章验证 - return comptRef.value.signValidator() + if(!comptRef.value.signValidator){ + console.log(123124) + return null; + }else{ + console.log(12) + return comptRef.value.signValidator() + } } const getStampSuccess = (val) => { diff --git a/src/pages-process/taskHandle.vue b/src/pages-process/taskHandle.vue index d44c959..60f4fd8 100644 --- a/src/pages-process/taskHandle.vue +++ b/src/pages-process/taskHandle.vue @@ -165,7 +165,8 @@ flag: false, type: 0, } - if(linkRef.value.ifEsign){ + console.log(linkRef.value) + // if(linkRef.value.ifEsign){ let data = await linkRef.value.signValidator() if(data==false||data==true){ callData.flag = data; @@ -173,9 +174,9 @@ }else{ callData.flag = true; } - }else{ - callData.flag = true; - } + // }else{ + // callData.flag = true; + // } callback(callData); } diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index d1cbda1..72d8ac9 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -105,9 +105,9 @@ let pw = Base64.encode(encodeURIComponent(password.value)) loading.value = true /*生产环境 begin */ - loginApi({ username: un, password: pw }) + // loginApi({ username: un, password: pw }) /*开发环境 begin */ - // loginApi({ username: userName.value, password: password.value, captcha: 'app' }) + loginApi({ username: userName.value, password: password.value, captcha: 'app' }) .then((res : any) => { if (res.success) { const { result } = res From b535e5ad3c52ffb72876d5be27f4878533a8b3a8 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Mon, 16 Jun 2025 16:17:33 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E6=96=B0=E7=89=88=E6=9C=AC=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.config.ts | 2 +- src/App.vue | 4 +- src/manifest.json | 2 +- src/store/index.ts | 63 ------------------------------- src/utils/index.ts | 92 +++++++++++++++++++++++++++++++++++++--------- 5 files changed, 79 insertions(+), 84 deletions(-) diff --git a/manifest.config.ts b/manifest.config.ts index 63e1ec6..ffade86 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -18,7 +18,7 @@ export default defineManifestConfig({ appid: VITE_UNI_APPID, description: '', versionName: '2.0.2', - versionCode: '20250615', + versionCode: '20250616', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/src/App.vue b/src/App.vue index b61a09a..a987fbc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,8 +3,8 @@ import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only' import { beforEach } from '@/router/index' import { jurisdictionApi } from '@/api/system'; - import { useAppStore, useUpdateApp } from '@/store' - import { getLocation } from '@/utils'; + import { useAppStore } from '@/store' + import { getLocation, useUpdateApp } from '@/utils'; export default { onLaunch: function (options) { // 检查更新 diff --git a/src/manifest.json b/src/manifest.json index dcdea7e..1589bed 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "appid": "__UNI__9F097F0", "description": "", "versionName": "2.0.2", - "versionCode": "20250615", + "versionCode": "20250616", "transformPx": false, "app-plus": { "usingComponents": true, diff --git a/src/store/index.ts b/src/store/index.ts index 5958050..159cdf9 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,8 +1,5 @@ import { createPinia, defineStore } from 'pinia' import { createPersistedState } from 'pinia-plugin-persistedstate' // 数据持久化 -import { upDateAppApi } from '@/api/system' -import { hasNewVersion, onClickUpdate } from '@/utils/index' -import { getEnvBaseUrl } from '@/utils/index' const store = createPinia() store.use( @@ -41,66 +38,6 @@ export const useAppStore = defineStore('app', { persist: true, // 启用持久化 }) -export const useUpdateApp = defineStore('updateApp', () => { - const updateOptions = reactive({ - force: false, - hasNew: false, - content: '', - url: '', - apkUrl: '', - wgtUrl: '' - }) - const systemInfo = uni.getSystemInfoSync() - - /** - * 当前处于APP_PLUS时 检查是否有新版本 - * - * @param to 是否跳转新页面显示更新 默认值false - */ - function checkAppUpdate(to = false) { - try { - upDateAppApi().then(async (res : any) => { - let { - result - } = res - result.apkUrl = getEnvBaseUrl() + '/sys/common/static/' + result.apkUrl - result.wgtUrl = getEnvBaseUrl() + '/sys/common/static/' + result.wgtUrl - updateOptions.wgtUrl = result.wgtUrl - if (systemInfo.osName === 'android') { - // Android - updateOptions.apkUrl = result.apkUrl - // #ifdef APP_PLUS - updateOptions.hasNew = await hasNewVersion(result.versionCode, result.update == 'wgt') as boolean - // #endif - } else { - // IOS - updateOptions.url = `itms-apps://itunes.apple.com/cn/app/id${123456}?mt=8` - } - updateOptions.hasNew && - uni.showModal({ - title: '更新', - content: '发现新版本，请更新', - success(res) { - if (res.confirm) { - onClickUpdate(result.update, result) - } else { - plus.runtime.quit() - } - } - }) - }) - } catch (error) { - updateOptions.hasNew = false - } - } - - return { - checkAppUpdate, - ...toRefs(updateOptions), - systemInfo - } -}) - export default store // 模块统一导出 diff --git a/src/utils/index.ts b/src/utils/index.ts index 81bca06..34ea067 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,6 +1,8 @@ +import { defineStore } from 'pinia' import { pages, subPackages, tabBar } from '@/pages.json' import { isMpWeixin } from './platform' import { useAppStore } from '@/store' +import { upDateAppApi } from '@/api/system' const getLastPage = () => { // getCurrentPages() 至少有1个元素，所以不再额外判断 @@ -208,29 +210,85 @@ export function formatDate(value, fmt) { } } +export const useUpdateApp = defineStore('updateApp', () => { + const updateOptions = reactive({ + force: false, + hasNew: false, + content: '', + url: '', + apkUrl: '', + wgtUrl: '' + }) + const systemInfo = uni.getSystemInfoSync() + + /** + * 当前处于APP_PLUS时 检查是否有新版本 + * + * @param to 是否跳转新页面显示更新 默认值false + */ + function checkAppUpdate(to = false) { + try { + upDateAppApi().then(async (res : any) => { + let { + result + } = res + result.apkUrl = getEnvBaseUrl() + '/sys/common/static/' + result.apkUrl + result.wgtUrl = getEnvBaseUrl() + '/sys/common/static/' + result.wgtUrl + updateOptions.wgtUrl = result.wgtUrl + if (systemInfo.osName === 'android') { + // Android + updateOptions.apkUrl = result.apkUrl + // #ifdef APP_PLUS + updateOptions.hasNew = await hasNewVersion(result.versionCode, result.update == 'wgt') as boolean + // #endif + } else { + // IOS + updateOptions.url = `itms-apps://itunes.apple.com/cn/app/id${123456}?mt=8` + } + updateOptions.hasNew && + uni.showModal({ + title: '更新', + content: '发现新版本，请更新', + success(res) { + if (res.confirm) { + onClickUpdate(result.update, result) + } else { + plus.runtime.quit() + } + } + }) + }) + } catch (error) { + updateOptions.hasNew = false + } + } + + return { + checkAppUpdate, + ...toRefs(updateOptions), + systemInfo + } +}) + /** * 判断是否有新版本 * @param version 接口返回的版本号 * @param isWgt 是否是热资源更新 默认不是 */ export const hasNewVersion = (version, isWgt = false) => { - // #ifdef APP_PLUS - return new Promise((resolve) => { - const transfer = (str) => { - const parts = str.split('.').map(part => part.padStart(4, '0')) - return parts.join('') - } - if (isWgt) { - plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => { - const currentVersion = widgetInfo.version - resolve(+transfer(version) > +transfer(currentVersion)) - }) - } else { - const currentVersion = plus.runtime.version - resolve(+transfer(version) > +transfer(currentVersion)) - } - }) - // #endif + // #ifdef APP_PLUS + return new Promise((resolve) => { + if (isWgt) { + plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => { + const currentVersion = widgetInfo.versionCode + resolve(Number(version) > Number(currentVersion)) + }) + } else { + const currentVersion = plus.runtime.versionCode + resolve(Number(version) > Number(currentVersion)) + } + }) + // #endif } export function onClickUpdate(updateType : string, url) { From 71b3470ca22d3cc8736fb435977dbd4520b7a9e6 Mon Sep 17 00:00:00 2001 From: lagos <627844378@qq.com> Date: Tue, 17 Jun 2025 17:34:45 +0800 Subject: [PATCH 09/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9app=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env | 6 ++++-- env/.env.development | 9 +++++++-- env/.env.production | 6 ++++++ manifest.config.ts | 2 +- src/api/system/index.ts | 7 +++++-- src/env.d.ts | 4 +++- src/manifest.json | 4 ++-- src/pages/login/login.vue | 4 ++-- src/utils/index.ts | 11 ++++++++++- vite.config.ts | 1 + 10 files changed, 41 insertions(+), 13 deletions(-) diff --git a/env/.env b/env/.env index ffa26f4..fa5fd9f 100644 --- a/env/.env +++ b/env/.env @@ -1,7 +1,9 @@ VITE_APP_TITLE = '数智产销' VITE_APP_PORT = 9000 -VITE_UNI_APPID = '__UNI__9F097F0' +#VITE_UNI_APPID = '__UNI__9F097F0' +#测试APPID +VITE_UNI_APPID = '__UNI__1B02D50' VITE_WX_APPID = 'wx8e287639924edb51' #发布版本号 @@ -28,4 +30,4 @@ VITE_APP_PROXY= false VITE_APP_PROXY_PREFIX = '/api' # 是否启用mock (1.仅支持h5 2.启用必须要开启代理，否则生效。) -VITE_USE_MOCK = true +VITE_USE_MOCK = true \ No newline at end of file diff --git a/env/.env.development b/env/.env.development index 375d2cf..cfea491 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,6 +4,11 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' +# 是否启用读取配置文件 min +#VITE_WEBAPP = 'D://opt//AppUpdateTest' +VITE_WEBAPP = '' +#VITE_SERVER_BASEURL = 'http://10.75.15.247: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' +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' +#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' \ No newline at end of file diff --git a/env/.env.production b/env/.env.production index 99f7ca7..6bf67f0 100644 --- a/env/.env.production +++ b/env/.env.production @@ -4,4 +4,10 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = true # 是否开启sourcemap VITE_SHOW_SOURCEMAP = false +# 是否启用读取配置文件 min +#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' +#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' \ No newline at end of file diff --git a/manifest.config.ts b/manifest.config.ts index ffade86..1ee837f 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -17,7 +17,7 @@ export default defineManifestConfig({ name: VITE_APP_TITLE, appid: VITE_UNI_APPID, description: '', - versionName: '2.0.2', + versionName: '2.0.0', versionCode: '20250616', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' diff --git a/src/api/system/index.ts b/src/api/system/index.ts index 3ec4a04..f1c117c 100644 --- a/src/api/system/index.ts +++ b/src/api/system/index.ts @@ -26,10 +26,13 @@ export function loginApi(config : LoginParams) { * @param * @returns */ -export function upDateAppApi() { +export function upDateAppApi(path : string) { return http({ url: '/sys/common/upDateApp', - method: 'GET' + method: 'GET', + data: { + path + } }) } diff --git a/src/env.d.ts b/src/env.d.ts index 561b633..41fc2ef 100644 --- a/src/env.d.ts +++ b/src/env.d.ts @@ -14,7 +14,9 @@ interface ImportMetaEnv { /** 服务端口号 */ readonly VITE_SERVER_PORT: string /** 后台接口地址 */ - readonly VITE_SERVER_BASEURL: string + readonly VITE_WEBAPP: string + /** 读取更新配置文件路径 by min */ + readonly WEBAPP: string /** H5是否需要代理 */ readonly VITE_APP_PROXY: 'true' | 'false' /** H5是否需要代理，需要的话有个前缀 */ diff --git a/src/manifest.json b/src/manifest.json index 1589bed..4ae261f 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,8 +1,8 @@ { "name": "数智产销", - "appid": "__UNI__9F097F0", + "appid": "__UNI__1B02D50", "description": "", - "versionName": "2.0.2", + "versionName": "2.0.0", "versionCode": "20250616", "transformPx": false, "app-plus": { diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 72d8ac9..d1cbda1 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -105,9 +105,9 @@ let pw = Base64.encode(encodeURIComponent(password.value)) loading.value = true /*生产环境 begin */ - // loginApi({ username: un, password: pw }) + loginApi({ username: un, password: pw }) /*开发环境 begin */ - loginApi({ username: userName.value, password: password.value, captcha: 'app' }) + // loginApi({ username: userName.value, password: password.value, captcha: 'app' }) .then((res : any) => { if (res.success) { const { result } = res diff --git a/src/utils/index.ts b/src/utils/index.ts index 34ea067..cb9a81f 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -4,6 +4,8 @@ import { isMpWeixin } from './platform' import { useAppStore } from '@/store' import { upDateAppApi } from '@/api/system' + + const getLastPage = () => { // getCurrentPages() 至少有1个元素，所以不再额外判断 // const lastPage = getCurrentPages().at(-1) @@ -228,7 +230,14 @@ export const useUpdateApp = defineStore('updateApp', () => { */ function checkAppUpdate(to = false) { try { - upDateAppApi().then(async (res : any) => { + let path = '' + let webApp = import.meta.env.VITE_WEBAPP + console.log(webApp) + if(webApp){//如果是测试环境 ，upDateAppApi 传递参数 by min + path = webApp + } + console.log(path) + upDateAppApi(path).then(async (res : any) => { let { result } = res diff --git a/vite.config.ts b/vite.config.ts index 19f1f48..117c126 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -47,6 +47,7 @@ export default ({ command, mode }) => { VITE_APP_PROXY, VITE_APP_PROXY_PREFIX, VITE_USE_MOCK, + WEBAPP } = env console.log('环境变量 env -> ', env) From 2175a82f6c770858f13325a1da671283386cd81b Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Thu, 19 Jun 2025 17:38:54 +0800 Subject: [PATCH 10/11] =?UTF-8?q?1.=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=80=83=E6=A0=B8=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E3=80=81=E6=8C=87=E6=A0=87=E8=80=83=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.development | 2 +- src/api/bpm/index.ts | 48 +++- src/api/humanResource/clockin/index.ts | 11 + src/pages-bpm/khss/index.vue | 230 +++++++++++++++++++ src/pages-bpm/zbkh/index.vue | 178 ++++++++++---- src/pages-humanResource/absence/index.vue | 1 - src/pages-process/components/DynamicLink.vue | 39 ++-- src/pages.json | 4 + src/pages/user/people.vue | 37 ++- src/store/index.ts | 4 + src/types/uni-pages.d.ts | 1 + src/utils/index.ts | 1 + 12 files changed, 479 insertions(+), 77 deletions(-) create mode 100644 src/api/humanResource/clockin/index.ts create mode 100644 src/pages-bpm/khss/index.vue diff --git a/env/.env.development b/env/.env.development index 375d2cf..09ee786 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.247:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.249: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 diff --git a/src/api/bpm/index.ts b/src/api/bpm/index.ts index 716e0d0..c7cc202 100644 --- a/src/api/bpm/index.ts +++ b/src/api/bpm/index.ts @@ -29,11 +29,11 @@ export function queryZbkhZbByIdApi(id : string) { } /*通过id查询指标考核子表数据*/ -export function queryZbkhFbByIdApi(mainId : string) { +export function queryZbkhFbByIdApi(data : object) { return http({ url: '/jxkh.zbkh/cxcJxkhZbkhZb/listCxcJxkhZbkhDwkhByMainId', method: 'GET', - data: { mainId } + data }) } @@ -46,3 +46,47 @@ export function queryZbkhBtByIdApi(mainId : string) { }) } +/*通过id查询考核实施主表数据*/ +export function queryKhssZbByIdApi(id : string) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/getAllById', + method: 'GET', + data: { id } + }) +} + + /*通过id查询考核实施主表自定义表头*/ + export function queryKhssZbBtByIdApi(mainId : string) { + return http({ + url: '/jxkh.jxkh/cxcJxkhKhssKhjxZb/getByMainId', + method: 'GET', + data: { mainId } + }) + } + + /*通过id查询考核实施子表数据*/ + export function queryKhssFbByIdApi(data : object) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/selectAllByMainId', + method: 'GET', + data + }) + } + + /*通过id查询总金额*/ + export function queryKhssAllSumByIdApi(mainId : string) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/getAllSum', + method: 'GET', + data: { mainId } + }) + } + + /*通过id查询考核实子表自定义表头*/ + export function queryKhssFbBtByIdApi(mainId : string) { + return http({ + url: '/jxkh.jxfp.bt/cxcJxkhJxfbBtZb/listByMainId', + method: 'GET', + data: { mainId } + }) + } diff --git a/src/api/humanResource/clockin/index.ts b/src/api/humanResource/clockin/index.ts new file mode 100644 index 0000000..57c1f37 --- /dev/null +++ b/src/api/humanResource/clockin/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*新增打卡记录*/ +export function addApi(config : Object) { + return http({ + url: '/cxc_rlzy.wbxm.wbdk/cxcRlzyWbdk/add', + method: 'POST', + data: config + }) +} \ No newline at end of file diff --git a/src/pages-bpm/khss/index.vue b/src/pages-bpm/khss/index.vue new file mode 100644 index 0000000..0f7ba0d --- /dev/null +++ b/src/pages-bpm/khss/index.vue @@ -0,0 +1,230 @@ + + + + + \ No newline at end of file diff --git a/src/pages-bpm/zbkh/index.vue b/src/pages-bpm/zbkh/index.vue index 1b27d63..940d603 100644 --- a/src/pages-bpm/zbkh/index.vue +++ b/src/pages-bpm/zbkh/index.vue @@ -1,46 +1,57 @@ - \ No newline at end of file diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue index b383575..23df1bd 100644 --- a/src/pages-humanResource/absence/index.vue +++ b/src/pages-humanResource/absence/index.vue @@ -118,7 +118,6 @@ pageSize }).then((res) => { if (res.success) { - console.log('----',res.result.records) list.value = [...list.value, ...res.result.records] } loading = false diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index a0fe46a..3347dac 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -1,13 +1,16 @@ diff --git a/src/pages.json b/src/pages.json index c5bf3e1..88e5087 100644 --- a/src/pages.json +++ b/src/pages.json @@ -525,6 +525,10 @@ "path": "document/index", "type": "page" }, + { + "path": "khss/index", + "type": "page" + }, { "path": "leaveApplication/index", "type": "page" diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue index f4d1354..ab17ebb 100644 --- a/src/pages/user/people.vue +++ b/src/pages/user/people.vue @@ -52,9 +52,7 @@