cxc-szcx-uniapp/pages/views/renliziyuan/renyuanxinxi/tongji.vue

540 lines
12 KiB
Vue
Raw Normal View History

Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa Merge: 26ee39e f4d737e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:37:10 2025 +0800 Merge branch 'ldeyun' into 'master' Ldeyun See merge request cxcxt/cxc-szcx-uniapp!6 commit f4d737e827a788e30e091ef3c5002179fa030761 Merge: 90584ed 26ee39e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:36:27 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into ldeyun # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/tab/index.vue # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
<template>
<view>
2025-01-22 14:29:32 +00:00
<view class="container" id="top1">
2025-02-13 15:03:49 +00:00
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="24"><uni-title :title="'所选单位'" align="left" type="h4"></uni-title></uni-col>
2025-01-13 02:49:20 +00:00
</uni-row>
2025-02-13 15:03:49 +00:00
<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
2025-01-22 14:29:32 +00:00
<uni-col :span="24">
<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode"
@change="departChange"></trq-depart-select>
2025-01-22 14:29:32 +00:00
</uni-col>
</uni-row>
<!-- 概览统计 -->
<view class="stats-box" v-if="summary.total">
2025-02-13 15:03:49 +00:00
<view class="stat-item">
2025-01-22 14:29:32 +00:00
<text class="label">总人数</text>
<text class="value">{{ summary.total }}</text>
</view>
<view class="stat-item">
<text class="label">平均年龄</text>
<text class="value">{{ summary.avgAge.toFixed(1) }}</text>
</view>
</view>
</view>
<!-- ECharts图表 -->
<view class="chart-container">
<l-echart ref="chart" @finished="initChart" />
</view>
2025-01-13 02:49:20 +00:00
2025-01-22 14:29:32 +00:00
<!-- 数据表格 -->
2025-01-13 02:49:20 +00:00
2025-02-13 15:03:49 +00:00
<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="tableData.length > 0">
2025-01-22 14:29:32 +00:00
<uni-col :span="3">
2025-02-13 15:03:49 +00:00
<view class="titleStyle">序号</view>
2025-01-22 14:29:32 +00:00
</uni-col>
<uni-col :span="5">
2025-02-13 15:03:49 +00:00
<view class="titleStyle">姓名</view>
2025-01-22 14:29:32 +00:00
</uni-col>
<uni-col :span="5">
2025-02-13 15:03:49 +00:00
<view class="titleStyle">性别</view>
2025-01-22 14:29:32 +00:00
</uni-col>
<uni-col :span="5">
2025-02-13 15:03:49 +00:00
<view class="titleStyle">年龄</view>
2025-01-22 14:29:32 +00:00
</uni-col>
<uni-col :span="6">
2025-02-13 15:03:49 +00:00
<view class="titleStyle">操作</view>
2025-01-22 14:29:32 +00:00
</uni-col>
</uni-row>
2025-01-13 02:49:20 +00:00
2025-02-13 15:03:49 +00:00
<scroll-view scroll-y :style="{ height: bottomHeight + 'px' }">
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
<view v-for="(item, index) in tableData">
2025-01-22 14:29:32 +00:00
<uni-col :span="3">
<view class="dataStyle">
2025-02-13 15:03:49 +00:00
{{ index + 1 }}
2025-01-22 14:29:32 +00:00
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
2025-02-13 15:03:49 +00:00
{{ item.xm }}
2025-01-22 14:29:32 +00:00
</view>
2025-02-13 15:03:49 +00:00
</uni-col>
<uni-col :span="5">
2025-01-22 14:29:32 +00:00
<view class="dataStyle">
2025-02-13 15:03:49 +00:00
{{ item.xb_dictText }}
2025-01-22 14:29:32 +00:00
</view>
2025-02-13 15:03:49 +00:00
</uni-col>
<uni-col :span="5">
2025-01-22 14:29:32 +00:00
<view class="dataStyle">
2025-02-13 15:03:49 +00:00
{{ item.nl }}
2025-01-22 14:29:32 +00:00
</view>
</uni-col>
<uni-col :span="6">
<view class="dataStyle">
<span @click="detail(item)" style="color: red;">详情</span>
<!-- <button size="mini" type="primary" @click="detail(item)">详情</button> -->
2025-01-22 14:29:32 +00:00
</view>
</uni-col>
</view>
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa Merge: 26ee39e f4d737e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:37:10 2025 +0800 Merge branch 'ldeyun' into 'master' Ldeyun See merge request cxcxt/cxc-szcx-uniapp!6 commit f4d737e827a788e30e091ef3c5002179fa030761 Merge: 90584ed 26ee39e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:36:27 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into ldeyun # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/tab/index.vue # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
</uni-row>
2025-01-22 14:29:32 +00:00
</scroll-view>
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa Merge: 26ee39e f4d737e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:37:10 2025 +0800 Merge branch 'ldeyun' into 'master' Ldeyun See merge request cxcxt/cxc-szcx-uniapp!6 commit f4d737e827a788e30e091ef3c5002179fa030761 Merge: 90584ed 26ee39e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:36:27 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into ldeyun # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/tab/index.vue # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
</view>
</template>
<script setup>
import {
ref,
reactive,
onMounted
} from 'vue';
import * as echarts from 'echarts';
import {
queryRenyuanByDepartID
} from '@/api/renyuan.js';
// 存储下方组件的高度
const bottomHeight = ref(0);
// 新增加载状态
const isLoading = ref(false);
const orgCode = ref('');
const rawData = ref([]);
const tableData = ref([]);
const summary = reactive({
total: 0,
avgAge: 0
2025-01-22 14:29:32 +00:00
});
const chart = ref(null);
const chartOption = ref({});
const drillPopup = ref(null);
const drillList = ref([]);
const drillTitle = ref('');
function detail(record) {
// console.log(record)
uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
});
2025-01-22 14:29:32 +00:00
}
// 计算年龄initChart
const calculateAge = (birthDate) => {
const today = new Date();
const birth = new Date(birthDate);
let age = today.getFullYear() - birth.getFullYear();
const monthDiff = today.getMonth() - birth.getMonth();
if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birth.getDate())) {
age--;
}
return age;
};
// 加载数据
const departChange = async (e, data) => {
tableData.value = [];
console.log(e);
orgCode.value = e;
try {
// 显示加载状态
isLoading.value = true;
if (orgCode.value.length <= 6) {
console.log(123242353);
uni.showToast({
title: '全厂数据较多,请选 下一层级...',
icon: 'none',
duration: 1000
});
isLoading.value = false;
return;
} else {
uni.showLoading({
title: '数据加载中...',
mask: true
});
}
let params = {
pageSize: 3000,
fields: ['xm', 'nl', 'xb', 'xb_dictText', 'orgCode', 'jcdw', 'jcxd', 'jcxdCode']
};
if (orgCode.value.length <= 9) {
params.orgCode = orgCode.value;
} else {
params.jcxd_code = orgCode.value;
}
queryRenyuanByDepartID(params)
.then((res) => {
if (res.success) {
processData(res.result.records);
// 隐藏加载状态
isLoading.value = false;
uni.hideLoading();
}
})
.catch((err) => {
console.log(err);
uni.showToast({
title: '数据加载失败',
icon: 'none',
duration: 1000
});
});
} catch (error) {
console.log(error);
2025-02-13 15:03:49 +00:00
uni.showToast({
title: '数据加载失败',
2025-02-13 15:03:49 +00:00
icon: 'none',
duration: 1000
});
} finally {
// 隐藏加载状态
2025-02-13 15:03:49 +00:00
isLoading.value = false;
uni.hideLoading();
2025-01-22 14:29:32 +00:00
}
};
2025-01-22 14:29:32 +00:00
// 数据处理
const processData = (data) => {
// 添加年龄字段并过滤有效数据
const validData = data
.map((item) => ({
...item,
nl: calculateAge(item.cssj)
}))
.filter((item) => item.nl >= 21 && item.nl <= 64);
// 计算概览数据
summary.total = validData.length;
summary.avgAge = validData.reduce((sum, cur) => sum + cur.nl, 0) / summary.total || 0;
// 生成表格数据
// tableData.value = validData;
groupsData(validData);
// 生成图表数据
generateChartData(validData);
};
// 计算统计信息...
const subOrgStaffs = ref({}); // 按下级单位存储所有人员
const ageGroupStaffs = ref({}); // 按年龄段存储所有人员
const groupsData = (data) => {
// 清空旧数据
subOrgStaffs.value = {};
ageGroupStaffs.value = {};
data.reduce((acc, cur) => {
// console.log(cur)
let subOrg = '';
let ageRange = getAgeRange(cur.nl);
// console.log(cur.orgCode, cur.jcxdCode)
if (cur.orgCode <= 6) {
subOrg = cur.orgCode;
} else {
subOrg = cur.jcxdCode;
}
// 存储到subOrgStaffs
if (!subOrgStaffs.value[subOrg]) {
subOrgStaffs.value[subOrg] = [];
}
subOrgStaffs.value[subOrg].push(cur);
// 存储到ageGroupStaffs
if (!ageGroupStaffs.value[ageRange]) {
ageGroupStaffs.value[ageRange] = [];
}
ageGroupStaffs.value[ageRange].push(cur);
2025-02-13 15:03:49 +00:00
});
};
2025-01-22 14:29:32 +00:00
// 新增年龄范围计算方法
const getAgeRange = (age) => {
const ranges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
const index = Math.floor((age - 21) / 10);
return ranges[index] || '其他';
};
2025-01-22 14:29:32 +00:00
// 修改后的显示人员列表方法
const showStaffList = (subOrg, ageRange) => {
// 从结构化数据中直接获取
const targetStaffs = subOrgStaffs.value[subOrg].filter((staff) => getAgeRange(staff.nl) === ageRange);
staffList.value = targetStaffs;
popupTitle.value = `${subOrg} ${ageRange}人员列表(共${targetStaffs.length}人)`;
popup.value.open();
};
// 新增获取指定单位人员的方法
const getSubOrgStaffs = (subOrgCode) => {
return subOrgStaffs.value[subOrgCode] || [];
};
// 新增获取指定年龄段人员的方法
const getAgeGroupStaffs = (ageRange) => {
return ageGroupStaffs.value[ageRange] || [];
};
// 生成图表数据(修改部分)
const generateChartData = (data) => {
// 按基层单位分组
const ageRanges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
const jcdwGroups = data.reduce((acc, cur) => {
if (!acc[cur.jcdw]) {
acc[cur.jcdw] = {
ageGroups: [0, 0, 0, 0, 0] // 21-30,31-40,41-50,51-60,61-64
};
2025-02-13 15:03:49 +00:00
}
const ageGroup = Math.floor((cur.nl - 21) / 10);
// console.log(ageGroup, cur.jcdw)
if (ageGroup >= 0 && ageGroup <= 4) {
acc[cur.jcdw].ageGroups[ageGroup]++;
}
return acc;
}, {});
// 生成分组柱状图配置
const xData = Object.keys(jcdwGroups);
const seriesData = ageRanges.map((range, index) => ({
name: range,
type: 'bar',
data: xData.map((jcdw) => jcdwGroups[jcdw].ageGroups[index] || 0),
itemStyle: {
color: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'][index]
Squashed commit of the following: commit c6612d254bf22bd677afc3d15ac9175e48f03efa Merge: 26ee39e f4d737e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:37:10 2025 +0800 Merge branch 'ldeyun' into 'master' Ldeyun See merge request cxcxt/cxc-szcx-uniapp!6 commit f4d737e827a788e30e091ef3c5002179fa030761 Merge: 90584ed 26ee39e Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:36:27 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into ldeyun # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 90584edaf966c5ca58b02847f4afe443a1ad9551 Author: 闵 年泽 <627844378@qq.com> Date: Fri Jan 17 16:29:01 2025 +0800 Squashed commit of the following: commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit f5e9d1e611d95b5c987bd2bf104d04ae24e1b12c Author: ldeyun <ldeyun@163.com> Date: Sun Jan 12 18:49:20 2025 +0800 添加uni-modules组件,departSelect commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md # Conflicts: # .env.development # .gitignore # api/renyuan.js # bpm/leaveApplication/index.vue # package-lock.json # package.json # pages.json # pages/tab/index.vue # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/taizhang.vue # uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue commit 42adfc83d0b98c39aaeb31768a00b510dbea7f21 Author: ldeyun <ldeyun@163.com> Date: Mon Jan 13 10:49:20 2025 +0800 人员统计图表页面 commit 26ee39e9e038027ea7fa4c740b989b69380660c3 Author: yangzhq68909 <993367776@qq.com> Date: Fri Jan 17 13:48:45 2025 +0800 首页值班跳转路径 commit 0eb5fa4f51f6dfd535f24dc846e061c317cc346a Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:44:08 2025 +0800 修改流程节点开始结束中文 commit d11c9c13f21966d683108ea2e1fd723c31a40dcc Merge: 5be34bd f5e9d1e Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:38:33 2025 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .gitignore # App.vue # bpm/leaveApplication/index.vue # bpm/supervise.vue # pages.json # uni_modules/uni-data-picker/changelog.md # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue # uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue # uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts # uni_modules/uni-data-picker/package.json # uni_modules/uni-datetime-picker/changelog.md # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue # uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js # uni_modules/uni-datetime-picker/package.json # uni_modules/uni-load-more/changelog.md # uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue # uni_modules/uni-load-more/package.json # uni_modules/uni-popup/changelog.md # uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue # uni_modules/uni-popup/components/uni-popup/uni-popup.vue # uni_modules/uni-popup/package.json commit 5be34bd5789536bbaabf0ada35dffe977b8673cd Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 13 08:24:57 2025 +0800 将流程信息开始结束节点改成中文 commit 23e4f9f409251fe756c192466cd1bd555c3875bd Author: yangzhq68909 <993367776@qq.com> Date: Tue Jan 7 09:44:59 2025 +0800 1 commit a472d67520f26c10b023bf1f9c79257be4140fe4 Author: yangzhq68909 <993367776@qq.com> Date: Mon Jan 6 10:44:29 2025 +0800 请假有效日期范围限制 commit 6054db8315ee657326f5201001c3c9f9c061862e Author: yangzhq68909 <993367776@qq.com> Date: Mon Dec 16 11:40:20 2024 +0800 1 commit 157249f2c660d084f386396134c578d8908fe580 Merge: ed007cb 20ba06b Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:03:09 2024 +0800 Merge remote-tracking branch 'remotes/origin/master' into yzqUniapp # Conflicts: # .env.development # .gitignore # manifest.json # pages/login/login.vue # unpackage/cache/apk/apkurl # unpackage/cache/apk/cmManifestCache.json # unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css # unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css # unpackage/cache/wgt/__UNI__F0AFD30/app-service.js # unpackage/cache/wgt/__UNI__F0AFD30/manifest.json # unpackage/dist/build/app-plus/app-service.js # unpackage/dist/build/app-plus/manifest.json # unpackage/dist/build/app-plus/pages/leave/application.css # unpackage/dist/build/app-plus/pages/login/login.css # unpackage/dist/build/app-plus/pages/tab/index.css # unpackage/dist/build/app-plus/pages/useredit/useredit.css # unpackage/dist/cache/.vite/deps/_metadata.json # unpackage/dist/cache/.vite/deps/base-64.js # unpackage/dist/cache/.vite/deps/base-64.js.map # unpackage/dist/dev/app-plus/app-service.js # unpackage/dist/dev/app-plus/manifest.json commit ed007cbaf6262d77586034ad3d96698c5540edc9 Author: yangzhq68909 <993367776@qq.com> Date: Fri Dec 6 09:00:15 2024 +0800 请假获取部门修改 commit 20ba06b4f1bbfa66efc88c4e3d63cc894235e416 Merge: fe7a52c af4b1b6 Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:04:09 2024 +0800 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp commit fe7a52cfeff72f37421e6ec81bca398e7da4aabb Author: jiang <358254771@qq.com> Date: Wed Dec 4 17:00:37 2024 +0800 忽略打包文件 commit 3794abbafc31c13ec6f7783e8cdd809a41010142 Author: jiang <358254771@qq.com> Date: Wed Dec 4 16:52:44 2024 +0800 和 commit af4b1b6c0ad3065172698e479fcd0b55f423d7d7 Merge: 1ca340b ecc98b1 Author: 闵 年泽 <627844378@qq.com> Date: Wed Dec 4 15:37:30 2024 +0800 Merge branch 'minUniapp' into 'master' Min uniapp See merge request cxcxt/cxc-szcx-uniapp!2 commit ecc98b14a2f6947f947ccb9aa87b48efe0358feb Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:10:13 2024 +0800 修改h5 commit 4c1f42de565aff9837b246029659dae144a3bb11 Author: mnz <627844378@qq.com> Date: Wed Dec 4 11:05:49 2024 +0800 1.修改app h5 commit c9ad71fe35c51270b267ea16a04cdcb6856ba4af Author: jiang <358254771@qq.com> Date: Tue Dec 3 14:08:45 2024 +0800 发布 commit ba291f2d6116ef7843ce41642a87222edd03592c Author: yangzhq68909 <993367776@qq.com> Date: Tue Dec 3 10:52:17 2024 +0800 denglu commit 1ca340b23cc0016c947eb9b7bb83df06cfe39a89 Merge: 27c1637 c1a1127 Author: jiang wen <358254771@qq.com> Date: Tue Nov 26 08:45:17 2024 +0800 Merge branch 'yzqUniapp' into 'master' Yzq uniapp See merge request cxcxt/cxc-szcx-uniapp!1 commit 0e7e8f3a8d879f5fe96fec535d55f30c4ec30aa2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 26 08:39:05 2024 +0800 忽略unpackage文件,jiang commit a252f9b88bd27abcdc826e21d0c2bcac28da25f3 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 16:16:01 2024 +0800 修改请假页面 commit b2664417e3775d1deeb67daafea8afd09eba8ff2 Author: yangzhq68909 <993367776@qq.com> Date: Tue Nov 12 14:42:02 2024 +0800 1 commit c1a112754c83e8653d975eda26a6f0636b282188 Author: yangzhq68909 <993367776@qq.com> Date: Fri Nov 8 14:17:40 2024 +0800 1 commit ccfa6e4f11596aa270fe8ec49662c8ecb2c2623a Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 31 16:38:07 2024 +0800 页面修改 commit f27c6e4ef022d5d459cec4c54d228e4865686b7f Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 15:34:31 2024 +0800 1 commit ba4d6ac0dd9a7925430a7b1c2611dbb6534fdb53 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 29 08:23:20 2024 +0800 1 commit 630862178914a9f3af717d8229701851884f5bac Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:26:14 2024 +0800 1 commit 4bf243f42b914d5294dce9e735ec950402720b85 Author: yangzhq68909 <993367776@qq.com> Date: Fri Oct 25 11:02:31 2024 +0800 增加流程取回、流程作废功能 commit 60e6f2bd2fc8d5c7bb3c9f9784b681d5958b2167 Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 24 11:15:16 2024 +0800 流程签收功能 取消组任务 commit 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Author: yangzhq68909 <993367776@qq.com> Date: Tue Oct 15 08:38:47 2024 +0800 1 commit e88ce332ed5cc070c9d5da0afb0b8ae0b86b4c31 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:46:55 2024 +0800 1 commit 1e857671cbc8332f95ce19b2ec5db204ad5bcd58 Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 15:22:41 2024 +0800 上传附件及回显 commit 6202ab0f4c0658aaa0ae1c0a032ad00065462bcf Author: yangzhq68909 <993367776@qq.com> Date: Mon Oct 14 08:51:28 2024 +0800 1 commit e73c24ff153e28e4b516395bc65e2e9d67c89fa5 Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 09:14:27 2024 +0800 11 commit 646c8016654ad49194f30845987bb088d89a75ed Author: yangzhq68909 <993367776@qq.com> Date: Sat Oct 12 08:53:10 2024 +0800 1 commit 767c647d4a964633b842c73c317a62ae9b2f98ff Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 16:52:10 2024 +0800 1 commit 9a9e8327f6f977a3619d8be1961deb406e354f9c Author: yangzhq68909 <993367776@qq.com> Date: Thu Oct 10 15:32:42 2024 +0800 1 commit c3eb02f52242a91982698b9964ae6195d11be6f7 Author: yangzhq68909 <993367776@qq.com> Date: Sun Sep 29 10:44:16 2024 +0800 icon修改 修改头像接口修改 commit 33666985b65f9df3a20d171e4207ec8a0175c855 Author: yangzhq68909 <993367776@qq.com> Date: Fri Sep 27 11:03:07 2024 +0800 1 commit 8809cc1975b7b2593ac58d1b94812cf79efb4199 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 26 12:06:47 2024 +0800 本地登录页面 请假类型选择 commit f9432900bd16a59bf09ead042d8feb5f2212ea73 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:23:37 2024 +0800 1 commit c9a320ddfd27e30dced5b637cc38a1f9dfd26838 Author: yangzhq68909 <993367776@qq.com> Date: Tue Sep 24 17:21:34 2024 +0800 请假流程2.0 commit e7bcd4328d75946533ebea0dc279360f26ebcbc5 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 16:13:33 2024 +0800 修改接口 commit 267ba082f0134a3355b87e8dc20b02d5354552f1 Author: yangzhq68909 <993367776@qq.com> Date: Thu Sep 19 15:12:58 2024 +0800 修改api接口路径 commit 27c163736de6d9323ccd48aabfec258e75486b34 Author: jiang <358254771@qq.com> Date: Sat Sep 14 10:26:50 2024 +0800 数智产销APP第一版。 commit 14d99971604d13b84f43b4bc7c69394c403dffe7 Author: jiang wen <358254771@qq.com> Date: Sat Sep 14 10:24:54 2024 +0800 Update README.md
2025-01-21 06:13:49 +00:00
},
// 显示数值标签
label: {
show: true,
position: 'top'
2025-02-13 15:03:49 +00:00
}
// 设置柱宽为 20 像素
// barWidth: 20
}));
chartOption.value = {
title: {
text: '人员年龄分组统计',
padding: [0, 0, 0, 30]
},
toolbox: {
padding: [0, 30, 0, 0],
show: true,
feature: {
//工具配置项
restore: {
show: true //是否显示该工具
},
saveAsImage: {
show: true //是否显示该工具
}
}
},
// tooltip: {
// trigger: 'axis',
// axisPointer: {
// type: 'shadow',
// label: {
// show: false
// }
// }
// },
grid: {
top: '15%',
left: '4%',
right: '4%',
bottom: '10%',
containLabel: true
},
legend: {
data: ageRanges,
itemGap: 5,
padding: [0, 15, 0, 15],
y: 'bottom',
itemHeight: 8, //高
itemWidth: 8, //宽
type: 'scroll'
},
xAxis: {
type: 'category',
data: xData,
axisLabel: {
color: '#7F84B5',
fontWeight: 300,
interval: 0,
rotate: 0
},
padding: [0, 10, 0, 10],
axisTick: {
show: false //刻度线
},
axisLine: {
show: false //不显示坐标轴线
}
},
yAxis: [{
2025-01-22 14:29:32 +00:00
show: true,
boundaryGap: false, //解决数据与线不对应问题
type: 'value',
// name: 'Budget (million USD)',
// data: this.yList,
minInterval: 1,
axisLabel: {
interval: 0
},
splitLine: {
show: true,
lineStyle: {
//背景网格线
type: 'dashed'
}
},
axisTick: {
show: true //刻度线
},
axisLine: {
show: false //不显示坐标轴线
}
}],
2025-01-22 14:29:32 +00:00
series: seriesData
};
2025-01-22 14:29:32 +00:00
// 初始化图表
setTimeout(async () => {
if (!chart.value) return;
const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value);
myChart.on('click', (params) => {
console.log(params.seriesName);
tableData.value = getAgeGroupStaffs(params.seriesName);
});
}, 300);
2025-01-22 14:29:32 +00:00
// #ifdef APP
getHeight();
// #endif
};
2025-01-22 14:29:32 +00:00
onMounted(() => {
// #ifdef APP
getHeight();
// #endif
});
2025-02-13 15:03:49 +00:00
// #ifdef APP
const getHeight = () => {
// 获取屏幕高度
const systemInfo = uni.getSystemInfoSync();
const screenHeight = systemInfo.screenHeight;
// 创建选择器查询对象
const query = uni.createSelectorQuery();
// 获取上方组件的高度
query
.select('#top1')
.boundingClientRect((rect1) => {
// 计算上方组件高度总和
const topComponentsHeight = rect1.height;
// 计算下方组件的高度
bottomHeight.value = screenHeight - topComponentsHeight - 415;
})
.exec();
};
2025-01-22 14:29:32 +00:00
// #endif
// 初始化图表
const initChart = () => {
setTimeout(async () => {
if (!chart.value) return;
const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value);
}, 300);
};
2025-01-22 14:29:32 +00:00
</script>
<style scoped>
.container {
margin: 20, 20, 20, 20rpx;
}
.input-group {
display: flex;
gap: 20rpx;
margin-bottom: 30rpx;
}
.input {
flex: 1;
border: 1rpx solid #ddd;
padding: 15rpx;
border-radius: 8rpx;
}
.query-btn {
background: #007aff;
color: white;
padding: 0 40rpx;
border-radius: 8rpx;
}
.stats-box {
display: flex;
justify-content: space-around;
margin: 30rpx 0;
padding: 20rpx;
background: #f8f8f8;
border-radius: 12rpx;
}
.stat-item {
display: flex;
flex-direction: column;
align-items: center;
}
.label {
font-size: 24rpx;
color: #666;
}
.value {
font-size: 36rpx;
font-weight: bold;
color: #0000ff;
}
.chart-container {
height: 400rpx;
margin-top: 20rpx;
}
.titleStyle {
font-size: 12px;
color: #747474;
line-height: 30px;
height: 30px;
background: #f2f9fc;
text-align: center;
vertical-align: middle;
border-left: 1px solid #919191;
border-bottom: 1px solid #919191;
}
/* 内容样式 */
.dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 12px;
color: #00007f;
line-height: 30px;
height: 30px;
font-weight: 500;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
text-overflow: ellipsis;
}
</style>