Compare commits

...

56 Commits

Author SHA1 Message Date
8e94f1d7f2 完善人员年龄统计模块 2025-02-03 09:51:15 +08:00
9313c59d15 Squashed commit of the following:
commit c6612d254b
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 f4d737e827
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 90584edaf9
Author: 闵 年泽 <627844378@qq.com>
Date:   Fri Jan 17 16:29:01 2025 +0800

    Squashed commit of the following:

    commit 26ee39e9e0
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Fri Jan 17 13:48:45 2025 +0800

        首页值班跳转路径

    commit 0eb5fa4f51
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Mon Jan 13 08:44:08 2025 +0800

        修改流程节点开始结束中文

    commit d11c9c13f2
    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 5be34bd578
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Mon Jan 13 08:24:57 2025 +0800

        将流程信息开始结束节点改成中文

    commit f5e9d1e611
    Author: ldeyun <ldeyun@163.com>
    Date:   Sun Jan 12 18:49:20 2025 +0800

        添加uni-modules组件,departSelect

    commit 23e4f9f409
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Jan 7 09:44:59 2025 +0800

        1

    commit a472d67520
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Mon Jan 6 10:44:29 2025 +0800

        请假有效日期范围限制

    commit 6054db8315
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Mon Dec 16 11:40:20 2024 +0800

        1

    commit 157249f2c6
    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 ed007cbaf6
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Fri Dec 6 09:00:15 2024 +0800

        请假获取部门修改

    commit 20ba06b4f1
    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 fe7a52cfef
    Author: jiang <358254771@qq.com>
    Date:   Wed Dec 4 17:00:37 2024 +0800

        忽略打包文件

    commit 3794abbafc
    Author: jiang <358254771@qq.com>
    Date:   Wed Dec 4 16:52:44 2024 +0800

        和

    commit af4b1b6c0a
    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 ecc98b14a2
    Author: mnz <627844378@qq.com>
    Date:   Wed Dec 4 11:10:13 2024 +0800

        修改h5

    commit 4c1f42de56
    Author: mnz <627844378@qq.com>
    Date:   Wed Dec 4 11:05:49 2024 +0800

        1.修改app h5

    commit c9ad71fe35
    Author: jiang <358254771@qq.com>
    Date:   Tue Dec 3 14:08:45 2024 +0800

        发布

    commit ba291f2d61
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Dec 3 10:52:17 2024 +0800

        denglu

    commit 1ca340b23c
    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 0e7e8f3a8d
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Nov 26 08:39:05 2024 +0800

        忽略unpackage文件,jiang

    commit a252f9b88b
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Nov 12 16:16:01 2024 +0800

        修改请假页面

    commit b2664417e3
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Nov 12 14:42:02 2024 +0800

        1

    commit c1a112754c
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Fri Nov 8 14:17:40 2024 +0800

        1

    commit ccfa6e4f11
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Thu Oct 31 16:38:07 2024 +0800

        页面修改

    commit f27c6e4ef0
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Oct 29 15:34:31 2024 +0800

        1

    commit ba4d6ac0dd
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Oct 29 08:23:20 2024 +0800

        1

    commit 6308621789
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Fri Oct 25 11:26:14 2024 +0800

        1

    commit 4bf243f42b
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Fri Oct 25 11:02:31 2024 +0800

        增加流程取回、流程作废功能

    commit 60e6f2bd2f
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Thu Oct 24 11:15:16 2024 +0800

        流程签收功能 取消组任务

    commit 72e1f6c02f
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Oct 15 08:38:47 2024 +0800

        1

    commit e88ce332ed
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Mon Oct 14 15:46:55 2024 +0800

        1

    commit 1e857671cb
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Mon Oct 14 15:22:41 2024 +0800

        上传附件及回显

    commit 6202ab0f4c
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Mon Oct 14 08:51:28 2024 +0800

        1

    commit e73c24ff15
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Sat Oct 12 09:14:27 2024 +0800

        11

    commit 646c801665
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Sat Oct 12 08:53:10 2024 +0800

        1

    commit 767c647d4a
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Thu Oct 10 16:52:10 2024 +0800

        1

    commit 9a9e8327f6
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Thu Oct 10 15:32:42 2024 +0800

        1

    commit c3eb02f522
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Sun Sep 29 10:44:16 2024 +0800

        icon修改 修改头像接口修改

    commit 33666985b6
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Fri Sep 27 11:03:07 2024 +0800

        1

    commit 8809cc1975
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Thu Sep 26 12:06:47 2024 +0800

        本地登录页面 请假类型选择

    commit f9432900bd
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Sep 24 17:23:37 2024 +0800

        1

    commit c9a320ddfd
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Tue Sep 24 17:21:34 2024 +0800

        请假流程2.0

    commit e7bcd4328d
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Thu Sep 19 16:13:33 2024 +0800

        修改接口

    commit 267ba082f0
    Author: yangzhq68909 <993367776@qq.com>
    Date:   Thu Sep 19 15:12:58 2024 +0800

        修改api接口路径

    commit 27c163736d
    Author: jiang <358254771@qq.com>
    Date:   Sat Sep 14 10:26:50 2024 +0800

        数智产销APP第一版。

    commit 14d9997160
    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 42adfc83d0
Author: ldeyun <ldeyun@163.com>
Date:   Mon Jan 13 10:49:20 2025 +0800

    人员统计图表页面

commit 26ee39e9e0
Author: yangzhq68909 <993367776@qq.com>
Date:   Fri Jan 17 13:48:45 2025 +0800

    首页值班跳转路径

commit 0eb5fa4f51
Author: yangzhq68909 <993367776@qq.com>
Date:   Mon Jan 13 08:44:08 2025 +0800

    修改流程节点开始结束中文

commit d11c9c13f2
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 5be34bd578
Author: yangzhq68909 <993367776@qq.com>
Date:   Mon Jan 13 08:24:57 2025 +0800

    将流程信息开始结束节点改成中文

commit 23e4f9f409
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Jan 7 09:44:59 2025 +0800

    1

commit a472d67520
Author: yangzhq68909 <993367776@qq.com>
Date:   Mon Jan 6 10:44:29 2025 +0800

    请假有效日期范围限制

commit 6054db8315
Author: yangzhq68909 <993367776@qq.com>
Date:   Mon Dec 16 11:40:20 2024 +0800

    1

commit 157249f2c6
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 ed007cbaf6
Author: yangzhq68909 <993367776@qq.com>
Date:   Fri Dec 6 09:00:15 2024 +0800

    请假获取部门修改

commit 20ba06b4f1
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 fe7a52cfef
Author: jiang <358254771@qq.com>
Date:   Wed Dec 4 17:00:37 2024 +0800

    忽略打包文件

commit 3794abbafc
Author: jiang <358254771@qq.com>
Date:   Wed Dec 4 16:52:44 2024 +0800

    和

commit af4b1b6c0a
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 ecc98b14a2
Author: mnz <627844378@qq.com>
Date:   Wed Dec 4 11:10:13 2024 +0800

    修改h5

commit 4c1f42de56
Author: mnz <627844378@qq.com>
Date:   Wed Dec 4 11:05:49 2024 +0800

    1.修改app h5

commit c9ad71fe35
Author: jiang <358254771@qq.com>
Date:   Tue Dec 3 14:08:45 2024 +0800

    发布

commit ba291f2d61
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Dec 3 10:52:17 2024 +0800

    denglu

commit 1ca340b23c
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 0e7e8f3a8d
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Nov 26 08:39:05 2024 +0800

    忽略unpackage文件,jiang

commit a252f9b88b
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Nov 12 16:16:01 2024 +0800

    修改请假页面

commit b2664417e3
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Nov 12 14:42:02 2024 +0800

    1

commit c1a112754c
Author: yangzhq68909 <993367776@qq.com>
Date:   Fri Nov 8 14:17:40 2024 +0800

    1

commit ccfa6e4f11
Author: yangzhq68909 <993367776@qq.com>
Date:   Thu Oct 31 16:38:07 2024 +0800

    页面修改

commit f27c6e4ef0
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Oct 29 15:34:31 2024 +0800

    1

commit ba4d6ac0dd
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Oct 29 08:23:20 2024 +0800

    1

commit 6308621789
Author: yangzhq68909 <993367776@qq.com>
Date:   Fri Oct 25 11:26:14 2024 +0800

    1

commit 4bf243f42b
Author: yangzhq68909 <993367776@qq.com>
Date:   Fri Oct 25 11:02:31 2024 +0800

    增加流程取回、流程作废功能

commit 60e6f2bd2f
Author: yangzhq68909 <993367776@qq.com>
Date:   Thu Oct 24 11:15:16 2024 +0800

    流程签收功能 取消组任务

commit 72e1f6c02f
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Oct 15 08:38:47 2024 +0800

    1

commit e88ce332ed
Author: yangzhq68909 <993367776@qq.com>
Date:   Mon Oct 14 15:46:55 2024 +0800

    1

commit 1e857671cb
Author: yangzhq68909 <993367776@qq.com>
Date:   Mon Oct 14 15:22:41 2024 +0800

    上传附件及回显

commit 6202ab0f4c
Author: yangzhq68909 <993367776@qq.com>
Date:   Mon Oct 14 08:51:28 2024 +0800

    1

commit e73c24ff15
Author: yangzhq68909 <993367776@qq.com>
Date:   Sat Oct 12 09:14:27 2024 +0800

    11

commit 646c801665
Author: yangzhq68909 <993367776@qq.com>
Date:   Sat Oct 12 08:53:10 2024 +0800

    1

commit 767c647d4a
Author: yangzhq68909 <993367776@qq.com>
Date:   Thu Oct 10 16:52:10 2024 +0800

    1

commit 9a9e8327f6
Author: yangzhq68909 <993367776@qq.com>
Date:   Thu Oct 10 15:32:42 2024 +0800

    1

commit c3eb02f522
Author: yangzhq68909 <993367776@qq.com>
Date:   Sun Sep 29 10:44:16 2024 +0800

    icon修改 修改头像接口修改

commit 33666985b6
Author: yangzhq68909 <993367776@qq.com>
Date:   Fri Sep 27 11:03:07 2024 +0800

    1

commit 8809cc1975
Author: yangzhq68909 <993367776@qq.com>
Date:   Thu Sep 26 12:06:47 2024 +0800

    本地登录页面 请假类型选择

commit f9432900bd
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Sep 24 17:23:37 2024 +0800

    1

commit c9a320ddfd
Author: yangzhq68909 <993367776@qq.com>
Date:   Tue Sep 24 17:21:34 2024 +0800

    请假流程2.0

commit e7bcd4328d
Author: yangzhq68909 <993367776@qq.com>
Date:   Thu Sep 19 16:13:33 2024 +0800

    修改接口

commit 267ba082f0
Author: yangzhq68909 <993367776@qq.com>
Date:   Thu Sep 19 15:12:58 2024 +0800

    修改api接口路径

commit 27c163736d
Author: jiang <358254771@qq.com>
Date:   Sat Sep 14 10:26:50 2024 +0800

    数智产销APP第一版。

commit 14d9997160
Author: jiang wen <358254771@qq.com>
Date:   Sat Sep 14 10:24:54 2024 +0800

    Update README.md
2025-01-21 14:13:49 +08:00
yangzhq68909
a04694b724 发布新版本 2025-01-20 15:10:05 +08:00
yangzhq68909
13519318e0 删除人员台账focus 2025-01-17 18:33:30 +08:00
闵 年泽
9474cd3ddf Merge branch 'ldeyun' into 'master'
Ldeyun

See merge request cxcxt/cxc-szcx-uniapp!8
2025-01-17 17:01:06 +08:00
mnz
5cdfd452c7 Merge remote-tracking branch 'remotes/origin/master' into ldeyun
# Conflicts:
#	manifest.json
2025-01-17 17:00:42 +08:00
mnz
8f8a54369d 1.推送 2025-01-17 16:57:51 +08:00
闵 年泽
75b33dd395 Update manifest.json 2025-01-17 16:52:25 +08:00
闵 年泽
c6612d254b Merge branch 'ldeyun' into 'master'
Ldeyun

See merge request cxcxt/cxc-szcx-uniapp!6
2025-01-17 16:37:10 +08:00
闵 年泽
f4d737e827 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
2025-01-17 16:36:27 +08:00
yangzhq68909
26ee39e9e0 首页值班跳转路径 2025-01-17 13:48:45 +08:00
yangzhq68909
0eb5fa4f51 修改流程节点开始结束中文 2025-01-13 08:44:08 +08:00
yangzhq68909
d11c9c13f2 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
2025-01-13 08:38:33 +08:00
yangzhq68909
5be34bd578 将流程信息开始结束节点改成中文 2025-01-13 08:24:57 +08:00
f5e9d1e611 添加uni-modules组件,departSelect 2025-01-12 19:46:15 +08:00
yangzhq68909
23e4f9f409 1 2025-01-07 09:44:59 +08:00
yangzhq68909
a472d67520 请假有效日期范围限制 2025-01-06 10:44:29 +08:00
yangzhq68909
6054db8315 1 2024-12-16 11:40:20 +08:00
yangzhq68909
157249f2c6 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
2024-12-06 09:03:09 +08:00
yangzhq68909
ed007cbaf6 请假获取部门修改 2024-12-06 09:00:15 +08:00
jiang
20ba06b4f1 Merge branch 'master' of 10.75.166.171:cxcxt/cxc-szcx-uniapp 2024-12-04 17:04:09 +08:00
jiang
fe7a52cfef 忽略打包文件 2024-12-04 17:00:37 +08:00
jiang
3794abbafc 2024-12-04 16:52:44 +08:00
闵 年泽
af4b1b6c0a Merge branch 'minUniapp' into 'master'
Min uniapp

See merge request cxcxt/cxc-szcx-uniapp!2
2024-12-04 15:37:30 +08:00
mnz
ecc98b14a2 修改h5 2024-12-04 11:10:13 +08:00
mnz
4c1f42de56 1.修改app h5 2024-12-04 11:05:49 +08:00
jiang
c9ad71fe35 发布 2024-12-03 14:08:45 +08:00
yangzhq68909
ba291f2d61 denglu 2024-12-03 10:52:17 +08:00
jiang wen
1ca340b23c Merge branch 'yzqUniapp' into 'master'
Yzq uniapp

See merge request cxcxt/cxc-szcx-uniapp!1
2024-11-26 08:45:17 +08:00
yangzhq68909
0e7e8f3a8d 忽略unpackage文件,jiang 2024-11-26 08:39:05 +08:00
yangzhq68909
a252f9b88b 修改请假页面 2024-11-12 16:16:01 +08:00
yangzhq68909
b2664417e3 1 2024-11-12 14:42:02 +08:00
yangzhq68909
c1a112754c 1 2024-11-08 14:17:40 +08:00
yangzhq68909
ccfa6e4f11 页面修改 2024-10-31 16:38:07 +08:00
yangzhq68909
f27c6e4ef0 1 2024-10-29 15:34:31 +08:00
yangzhq68909
ba4d6ac0dd 1 2024-10-29 08:23:20 +08:00
yangzhq68909
6308621789 1 2024-10-25 11:26:14 +08:00
yangzhq68909
4bf243f42b 增加流程取回、流程作废功能 2024-10-25 11:02:31 +08:00
yangzhq68909
60e6f2bd2f 流程签收功能 取消组任务 2024-10-24 11:15:16 +08:00
yangzhq68909
72e1f6c02f 1 2024-10-15 08:38:47 +08:00
yangzhq68909
e88ce332ed 1 2024-10-14 15:46:55 +08:00
yangzhq68909
1e857671cb 上传附件及回显 2024-10-14 15:22:41 +08:00
yangzhq68909
6202ab0f4c 1 2024-10-14 08:51:28 +08:00
yangzhq68909
e73c24ff15 11 2024-10-12 09:14:27 +08:00
yangzhq68909
646c801665 1 2024-10-12 08:53:10 +08:00
yangzhq68909
767c647d4a 1 2024-10-10 16:52:10 +08:00
yangzhq68909
9a9e8327f6 1 2024-10-10 15:32:42 +08:00
yangzhq68909
c3eb02f522 icon修改 修改头像接口修改 2024-09-29 10:44:16 +08:00
yangzhq68909
33666985b6 1 2024-09-27 11:03:07 +08:00
yangzhq68909
8809cc1975 本地登录页面 请假类型选择 2024-09-26 12:06:47 +08:00
yangzhq68909
f9432900bd 1 2024-09-24 17:23:37 +08:00
yangzhq68909
c9a320ddfd 请假流程2.0 2024-09-24 17:21:34 +08:00
yangzhq68909
e7bcd4328d 修改接口 2024-09-19 16:13:33 +08:00
yangzhq68909
267ba082f0 修改api接口路径 2024-09-19 15:12:58 +08:00
jiang
27c163736d 数智产销APP第一版。 2024-09-14 10:26:50 +08:00
jiang wen
14d9997160 Update README.md 2024-09-14 10:24:54 +08:00
19 changed files with 1388 additions and 638 deletions

View File

@ -1,26 +0,0 @@
{
// launch.json configurations app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtypelocalremote, localremote
"version" : "0.0",
"configurations" : [
{
"app-plus" :
{
"launchtype" : "local"
},
"default" :
{
"launchtype" : "local"
},
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
},
{
"playground" : "standard",
"type" : "uni-app:app-android"
}
]
}

View File

@ -1,13 +0,0 @@
{
"hash": "5610b5a1",
"browserHash": "3deef0d9",
"optimized": {
"base-64": {
"src": "../../node_modules/base-64/base64.js",
"file": "base-64.js",
"fileHash": "768aae23",
"needsInterop": true
}
},
"chunks": {}
}

View File

@ -1,117 +0,0 @@
var __getOwnPropNames = Object.getOwnPropertyNames;
var __commonJS = (cb, mod) => function __require() {
return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
};
// ../../../../Documents/HBuilderProjects/B404219-tianranqi/node_modules/base-64/base64.js
var require_base64 = __commonJS({
"../../../../Documents/HBuilderProjects/B404219-tianranqi/node_modules/base-64/base64.js"(exports, module) {
(function(root) {
var freeExports = typeof exports == "object" && exports;
var freeModule = typeof module == "object" && module && module.exports == freeExports && module;
var freeGlobal = typeof global == "object" && global;
if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
root = freeGlobal;
}
var InvalidCharacterError = function(message) {
this.message = message;
};
InvalidCharacterError.prototype = new Error();
InvalidCharacterError.prototype.name = "InvalidCharacterError";
var error = function(message) {
throw new InvalidCharacterError(message);
};
var TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
var REGEX_SPACE_CHARACTERS = /[\t\n\f\r ]/g;
var decode = function(input) {
input = String(input).replace(REGEX_SPACE_CHARACTERS, "");
var length = input.length;
if (length % 4 == 0) {
input = input.replace(/==?$/, "");
length = input.length;
}
if (length % 4 == 1 || // http://whatwg.org/C#alphanumeric-ascii-characters
/[^+a-zA-Z0-9/]/.test(input)) {
error(
"Invalid character: the string to be decoded is not correctly encoded."
);
}
var bitCounter = 0;
var bitStorage;
var buffer;
var output = "";
var position = -1;
while (++position < length) {
buffer = TABLE.indexOf(input.charAt(position));
bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
if (bitCounter++ % 4) {
output += String.fromCharCode(
255 & bitStorage >> (-2 * bitCounter & 6)
);
}
}
return output;
};
var encode = function(input) {
input = String(input);
if (/[^\0-\xFF]/.test(input)) {
error(
"The string to be encoded contains characters outside of the Latin1 range."
);
}
var padding = input.length % 3;
var output = "";
var position = -1;
var a;
var b;
var c;
var buffer;
var length = input.length - padding;
while (++position < length) {
a = input.charCodeAt(position) << 16;
b = input.charCodeAt(++position) << 8;
c = input.charCodeAt(++position);
buffer = a + b + c;
output += TABLE.charAt(buffer >> 18 & 63) + TABLE.charAt(buffer >> 12 & 63) + TABLE.charAt(buffer >> 6 & 63) + TABLE.charAt(buffer & 63);
}
if (padding == 2) {
a = input.charCodeAt(position) << 8;
b = input.charCodeAt(++position);
buffer = a + b;
output += TABLE.charAt(buffer >> 10) + TABLE.charAt(buffer >> 4 & 63) + TABLE.charAt(buffer << 2 & 63) + "=";
} else if (padding == 1) {
buffer = input.charCodeAt(position);
output += TABLE.charAt(buffer >> 2) + TABLE.charAt(buffer << 4 & 63) + "==";
}
return output;
};
var base64 = {
"encode": encode,
"decode": decode,
"version": "1.0.0"
};
if (typeof define == "function" && typeof define.amd == "object" && define.amd) {
define(function() {
return base64;
});
} else if (freeExports && !freeExports.nodeType) {
if (freeModule) {
freeModule.exports = base64;
} else {
for (var key in base64) {
base64.hasOwnProperty(key) && (freeExports[key] = base64[key]);
}
}
} else {
root.base64 = base64;
}
})(exports);
}
});
export default require_base64();
/*! Bundled license information:
base-64/base64.js:
(*! https://mths.be/base64 v1.0.0 by @mathias | MIT license *)
*/
//# sourceMappingURL=base-64.js.map

File diff suppressed because one or more lines are too long

View File

@ -1,3 +0,0 @@
{
"type": "module"
}

View File

@ -57,13 +57,14 @@ export function queryZyzgdjByRyLdhth(ldhth) { // 获取人员职业资格等级
})
}
// ryList: '/cxchrygxxtj/cxcHrYgxxtj/list',
// ryByXb: '/cxcRyData/countByXb',
// ryByNl: '/cxcRyData/countByNl',
// ryByXbTotal: '/cxcRyData/countByXbTotal',
// ryByNlTotal: '/cxcRyData/countByNlTotal',
// bmList: '/sys/sysDepart/queryTreeList'
export function queryJxkhByRyLdhth(ldhth) { // 绩效考核信息
return https({
url: '/cxc_rlzy.zb/cxcRlzyZb/listCxcRlzyJxkhByMainId',
method: 'get',
data: ldhth
})
}
export function cxcHrYgxxtj(parm) { // 获取员工信息统计
return https({
@ -73,33 +74,9 @@ export function cxcHrYgxxtj(parm) { // 获取员工信息统计
})
}
export function cxcRyDatacountByXb(parm) { // 通过性别获取员工信息统计
export function cxcRyDataTongji(url, parm) { // 员工信息统计
return https({
url: '/cxcRyData/countByXb',
method: 'get',
data: parm
})
}
export function cxcRyDatacountByNl(parm) { // 通过年龄获取员工信息统计
return https({
url: '/cxcRyData/countByNl',
method: 'get',
data: parm
})
}
export function cxcRyDatacountByXbTotal(parm) { // 通过性别获取员工信息统计
return https({
url: '/cxcRyData/countByXbTotal',
method: 'get',
data: parm
})
}
export function cxcRyDatacountByNlTotal(parm) { // 通过年龄获取员工信息统计
return https({
url: '/cxcRyData/countByNlTotal',
url: url,
method: 'get',
data: parm
})

View File

@ -182,6 +182,14 @@
}).then((res) => {
if (res.success) {
step.value = res.result.records
step.value = step.value.map(item => {
if (item.name === 'start') {
item.name = '开始';
} else if (item.name === 'end') {
item.name = '结束';
}
return item;
});
}
})
}

View File

@ -1,36 +1,36 @@
{
"name" : "数智产销",
"appid" : "__UNI__9F097F0",
"description" : "",
"versionName" : "1.1.1",
"versionCode" : 20250106,
"transformPx" : false,
"name": "数智产销",
"appid": "__UNI__9F097F0",
"description": "",
"versionName": "1.1.4.1",
"versionCode": 20250121,
"transformPx": false,
/* 5+App */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
"compatible" : {
"ignoreVersion" : true
"compatible": {
"ignoreVersion": true
},
/* */
"modules" : {
"Geolocation" : {},
"Fingerprint" : {},
"Camera" : {},
"Barcode" : {}
"modules": {
"Geolocation": {},
"Fingerprint": {},
"Camera": {},
"Barcode": {}
},
/* */
"distribute" : {
"distribute": {
/* android */
"android" : {
"permissions" : [
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@ -49,75 +49,74 @@
]
},
/* ios */
"ios" : {
"dSYMs" : false
"ios": {
"dSYMs": false
},
/* SDK */
"sdkConfigs" : {
"ad" : {},
"geolocation" : {
"system" : {
"__platform__" : [ "android" ]
"sdkConfigs": {
"ad": {},
"geolocation": {
"system": {
"__platform__": ["android"]
}
}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
"icons": {
"android": {
"hdpi": "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
"ios": {
"appstore": "unpackage/res/icons/1024x1024.png",
"ipad": {
"app": "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
"iphone": {
"app@2x": "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png"
}
}
}
}
},
/* */
"quickapp" : {},
"quickapp": {},
/* */
"mp-weixin" : {
"appid" : "",
"setting" : {
"urlCheck" : false
"mp-weixin": {
"appid": "",
"setting": {
"urlCheck": false
},
"usingComponents" : true
"usingComponents": true
},
"mp-alipay" : {
"usingComponents" : true
"mp-alipay": {
"usingComponents": true
},
"mp-baidu" : {
"usingComponents" : true
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao" : {
"usingComponents" : true
"mp-toutiao": {
"usingComponents": true
},
"uniStatistics" : {
"enable" : false
"uniStatistics": {
"enable": false
},
"vueVersion" : "3"
"vueVersion": "3"
}
/* */

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "cxc-szcx-uniapp-master",
"name": "cxc-szcx-uniapp",
"lockfileVersion": 2,
"requires": true,
"packages": {

View File

@ -230,7 +230,15 @@
{
"path": "pages/views/renliziyuan/renyuanxinxi/tongji",
"style": {
"navigationBarTitleText": "人员统计信息",
"navigationBarTitleText": "人员年龄分组统计信息",
"navigationBarTextStyle": "white"
}
},
{
"path": "pages/views/renliziyuan/renyuanxinxi/xbtongji",
"style": {
"navigationBarTitleText": "人员性别分组统计信息",
"navigationBarTextStyle": "white"
}

View File

@ -4,6 +4,45 @@
<view style="padding: 10px 10px 10px 10px;">
<uni-title title="基本信息" type="h1" color="blue"></uni-title>
<yjly-row-cell :cellData="cellData" :rowDataCount="3"></yjly-row-cell>
<uni-title title="年度绩效考核" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
<view class="titleStyle">
序号
</view>
</uni-col>
<uni-col :span="10">
<view class="titleStyle">
绩效考核年份
</view>
</uni-col>
<uni-col :span="10">
<view class="titleStyle">
绩效考核成绩
</view>
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in jxkhxxList">
<uni-col :span="4">
<view class="dataStyle">
{{index+1}}
</view>
</uni-col>
<uni-col :span="10">
<view class="dataStyle">
{{item.nf}}
</view>
</uni-col><uni-col :span="10">
<view class="dataStyle">
{{item.khcj+"---"+item.khcj_dictText}}
</view>
</uni-col>
</view>
</uni-row>
<uni-title title="工作简历" type="h1" color="blue"></uni-title>
<uni-row>
<uni-col :span="4">
@ -248,7 +287,8 @@
queryJtzycyByRyLdhth,
queryXlxxByRyLdhth,
queryGbxxByRyLdhth,
queryZyzgdjByRyLdhth
queryZyzgdjByRyLdhth,
queryJxkhByRyLdhth
} from '@/api/renyuan.js'
import {
useStore
@ -268,10 +308,22 @@
const xlxxList = ref([]) // -
const gbxxList = ref([]) // -
const zyzgdjList = ref([]) // -
const jxkhxxList = ref([]) // -
function getChildTable() {
console.log(ldhth.value)
queryJxkhByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
// console.log(res);
jxkhxxList.value = res.result.records
// console.log(jxkhxxList.value)
}).catch((err) => {
console.log(err);
})
queryGbxxByRyLdhth({
"ldhth": ldhth.value
}).then((res) => {
@ -327,20 +379,29 @@
xlxxList.value = []
if (res.result.records.length > 0) {
var rress = res.result.records
// console.log(rress);
for (let i = 0; i < rress.length; i++) {
if (rress[i].onexl == 1) {
if (rress[i].onexl == 1 & rress[i].zgxl == 1) {
rress[i].xllb = "第一学历"
xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
// console.log(xlxxList.value)
rress[i].xllb = "最高学历"
xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
// console.log(xlxxList.value)
}
if (rress[i].onexl == 1 & rress[i].zgxl != 1) {
rress[i].xllb = "第一学历"
xlxxList.value.push(rress[i])
}
if (rress[i].zgxl == 1) {
if (rress[i].onexl != 1 & rress[i].zgxl == 1) {
rress[i].xllb = "最高学历"
xlxxList.value.push(rress[i])
}
}
}
console.log(xlxxList.value);
}
}
}).catch((err) => {
console.log(err);
@ -517,7 +578,9 @@
vertical-align: middle;
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
text-overflow: ellipsis;
text-align: center;
word-wrap: break-word;
overflow-wrap: break-word;
}
</style>

View File

@ -8,28 +8,31 @@
</uni-section>
<uni-section title="统计信息" type="line">
<uni-card :is-shadow="false">
<button type="primary" @click="toTongji">分类统计</button>
<button type="primary" @click="toTongji">年龄分组统计</button>
<button type="primary" @click="toXbTongji">性别分组统计</button>
</uni-card>
</uni-section>
</uni-card>
</view>
</template>
<script setup>
function toTaizhang() {
function toTaizhang() {
uni.navigateTo({
url: "/pages/views/renliziyuan/renyuanxinxi/taizhang"
})
}
url: '/pages/views/renliziyuan/renyuanxinxi/taizhang'
});
}
function toTongji() {
function toTongji() {
uni.navigateTo({
url: "/pages/views/renliziyuan/renyuanxinxi/tongji"
})
}
url: '/pages/views/renliziyuan/renyuanxinxi/tongji'
});
}
function toXbTongji() {
uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/xbtongji'
});
}
</script>
<style>
</style>
<style></style>

View File

@ -1,8 +1,7 @@
<template>
<view>
<scroll-view :scroll-y="true">
<scroll-view :scroll-y="true" style="height: 100vh;">
<uni-card>
<uni-title title="" type="h1" align="center"></uni-title>
<view>
<uni-row>
<uni-col :span="11"><uni-title title="姓名 " align="left" type="h5"></uni-title></uni-col>
@ -10,10 +9,10 @@
type="h5"></uni-title></uni-col>
</uni-row>
<uni-row>
<uni-col :span="11"><uni-easyinput v-model="xm" focus suffixIcon="search" clearable
<uni-col :span="11"><uni-easyinput v-model="xm" suffixIcon="search" clearable
placeholder="姓名模糊查询" @change="Search" @iconClick="Search" /></uni-col>
<uni-col :span="11" :push="2">
<uni-easyinput v-model="ldhth" focus suffixIcon="search" clearable placeholder="劳动合同号模糊查询"
<uni-easyinput v-model="ldhth" suffixIcon="search" clearable placeholder="劳动合同号模糊查询"
@change="Search" @iconClick="Search" />
</uni-col>
</uni-row>
@ -24,7 +23,8 @@
</uni-row>
<uni-row>
<uni-col :span="24">
<trq-depart-select returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
<trq-depart-select v-model="departID" returnCodeOrID="orgCode"
@change="departChange"></trq-depart-select>
</uni-col>
</uni-row>
</view>
@ -34,6 +34,9 @@
:border="true" :data="ryDataList" @detail="detail"></zb-table>
<uni-pagination :current="current" :pagerCount="pages" :total="total" prev-text="前一页" next-text="后一页"
:show-icon="false" @change="pagechange" />
<view>
<text class="example-info">当前页{{ current }}数据总量{{ total }}每页数据{{ pageSize }}</text>
</view>
</uni-card>
</scroll-view>
@ -97,12 +100,6 @@
width: 70,
align: 'center'
},
// {
// name: 'gzdw',
// label: '',
// align: 'center',
// width: 150
// },
{
name: 'xb_dictText',
label: '性别',
@ -118,6 +115,7 @@
{
name: 'operation',
type: 'operation',
width: 60,
fixed: true,
label: '操作',
align: 'center',
@ -139,7 +137,6 @@
function detail(record) {
// console.log(record)
uni.navigateTo({
url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
})
@ -148,29 +145,47 @@
function pagechange(e) {
current.value = e.current
pageNo.value = e.current
getRenyuanByDepID()
}
function departChange(e) {
departID.value = e
getRenyuanByDepID()
}
function getRenyuanByDepID() {
ryDataList.value = []
let queryParm = {
let params = {
pageNo: pageNo.value,
pageSize: pageSize.value,
current: current.value
};
queryParm.orgCode = departID.value
if (departID.value.length <= 9) {
params.orgCode = departID.value
} else {
params.jcxd_code = departID.value
}
getRenyuanByDepID(params)
}
function departChange(e, data) {
departID.value = e
let params = {
pageNo: pageNo.value,
pageSize: pageSize.value,
current: current.value
};
console.log(e)
if (e.length <= 9) {
params.orgCode = departID.value
} else {
params.jcxd_code = departID.value
}
getRenyuanByDepID(params)
}
function getRenyuanByDepID(queryParm) {
ryDataList.value = []
console.log(queryParm)
queryRenyuanByDepartID(queryParm).then((res) => {
console.log(res)
if (res.success) {
ryDataList.value = res.result.records
total.value = res.result.total
pages.value = res.result.pages
current.value = res.result.current
}
}).catch((err) => {
console.log(err);
@ -192,6 +207,7 @@
if (ldhth.value !== '') {
queryParm.ldhth = '*' + ldhth.value + '*';
}
console.log(queryParm)
queryRenyuanByDepartID(queryParm).then((res) => {
if (res.success) {
ryDataList.value = res.result.records

View File

@ -1,91 +1,312 @@
<template>
<view>
<uni-card>
<uni-forms>
<uni-forms-item>
<view class="container" id="top1">
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="24"><uni-title :title="'所选单位ID:' + orgCode" align="left" type="h4"></uni-title></uni-col>
</uni-row>
<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="24">
<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
</uni-col>
</uni-row>
<!-- 概览统计 -->
<view class="stats-box" v-if="summary.total">
<view class="stat-item">
<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>
</uni-forms-item>
</uni-forms>
<uni-title title="所属单位 " align="center"></uni-title>
<!-- 数据表格 -->
<trq-depart-select returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
<uni-row>
<uni-col :span="6"><button @click="getRyByxb(0)" type="primary" size="mini"
style="margin: 10px 10px 10px 10px;">性别分组统计</button></uni-col>
<uni-col :span="6"><button @click="getRyBynl(0)" type="primary" size="mini"
style="margin: 10px 10px 10px 10px;">年龄分组统计</button></uni-col>
<uni-col :span="6"><button @click="getRyByxb(1)" type="primary" size="mini"
style="margin: 10px 10px 10px 10px;">性别总统计</button></uni-col>
<uni-col :span="6"><button @click="getRyBynl(1)" type="primary" size="mini"
style="margin: 10px 10px 10px 10px;">年龄总统计</button></uni-col>
<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="tableData.length > 0">
<uni-col :span="3">
<view class="titleStyle">序号</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">姓名</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">性别</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">年龄</view>
</uni-col>
<uni-col :span="6">
<view class="titleStyle">操作</view>
</uni-col>
</uni-row>
<view style="width:750rpx; height:750rpx"><l-echart ref="myChart" @finished="init"></l-echart></view>
</uni-card>
<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">
<uni-col :span="3">
<view class="dataStyle">
{{ index + 1 }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.xm }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.xb_dictText }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.nl }}
</view>
</uni-col>
<uni-col :span="6">
<view class="dataStyle">
<button size="mini" type="primary" @click="detail(item)">详情</button>
</view>
</uni-col>
</view>
</uni-row>
</scroll-view>
</view>
</template>
<script setup>
import * as echarts from 'echarts'
import { ref, reactive, onMounted } from 'vue';
import * as echarts from 'echarts';
import {
onReady,
onLoad
import { queryRenyuanByDepartID } from '@/api/renyuan.js';
} from '@dcloudio/uni-app';
import {
reactive,
ref,
onMounted
} from 'vue';
import {
useStore
} from '@/store';
import {
cxcRyDatacountByXb,
cxcRyDatacountByNl,
cxcRyDatacountByXbTotal,
cxcRyDatacountByNlTotal
} 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
});
const chart = ref(null);
const chartOption = ref({});
const drillPopup = ref(null);
const drillList = ref([]);
const drillTitle = ref('');
const ryCountData = ref([])
const departID = ref("")
const option = ref({
notMerge: true,
backgroundColor: '#F8FAFF',
tooltip: {
trigger: 'axis',
showContent: this.showContent,
axisPointer: {
type: 'shadow',
label: {
show: true
function detail(record) {
// console.log(record)
uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
});
}
// 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.showLoading({
title: '全厂数据较多,耐心等待数据加载中...',
mask: true
});
} 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'
});
});
} catch (error) {
console.log(error);
uni.showToast({
title: '数据加载失败',
icon: 'none'
});
} finally {
//
isLoading.value = false;
uni.hideLoading();
}
};
//
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);
});
};
//
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] || '其他';
};
//
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
};
}
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]
},
//
label: {
show: true,
position: 'top'
}
// 20
// barWidth: 20
}));
chartOption.value = {
title: {
text: '人员统计图表'
text: '人员年龄分组统计',
padding: [0, 0, 0, 30]
},
toolbox: {
padding: [0, 20, 20, 20],
padding: [0, 30, 0, 0],
show: true,
feature: {
//
mark: {
show: true
},
dataView: {
show: true
},
magicType: {
show: true, //
type: ['line', 'bar'] //
},
dataZoom: {
yAxisIndex: 'none'
},
restore: {
show: true //
},
@ -94,47 +315,50 @@
}
}
},
calculable: false, //
// itemHeight: 0,
legend: {
//
data: [],
itemGap: 24,
padding: [5, 15, 10, 15],
// y: 'bottom',
itemHeight: 8, //
itemWidth: 8, //
type: 'scroll',
top: 40,
},
// tooltip: {
// trigger: 'axis',
// axisPointer: {
// type: 'shadow',
// label: {
// show: false
// }
// }
// },
grid: {
top: '15%',
left: '4%',
right: '4%',
bottom: '6%',
bottom: '10%',
containLabel: true
},
xAxis: [{
show: true,
type: 'category', //
// boundaryGap:false, //线
data: [],
// offset:50,
//['7.1', '7.2', '7.3', '7.4', '7.5', '7.6', '7.7', '7.8', '7.9', '7.10','7.11', ], //this.xList, //obama_budget_2012.names
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: 70
rotate: 0
},
padding: [0, 10, 0, 10],
axisTick: {
show: false //线
},
axisLine: {
show: false //线
}
}],
yAxis: [{
},
yAxis: [
{
show: true,
boundaryGap: false, //线
type: 'value',
@ -158,117 +382,147 @@
axisLine: {
show: false //线
}
}],
dataZoom: [{
show: true,
start: 80,
end: 100,
handleSize: 10
},
{
type: 'inside',
start: 0,
end: 50
},
{
show: false,
yAxisIndex: 0,
filterMode: 'empty',
width: 12,
height: '80%',
showDataShadow: false,
left: '93%',
handleSize: 8
}
],
series: []
});
const xData = ref([])
const ySeries = ref([])
const legData = ref([])
function departChange(e) {
departID.value = e
}
function getRyByxb(val) {
ryCountData.value = []
let queryParm = {};
queryParm.orgCode = departID.value
cxcRyDatacountByXb(queryParm).then((res) => {
console.log(res);
if (res.success) {
xData.value = [];
ySeries.value = [];
legData.value = [];
let serie = {
name: '',
type: 'bar',
data: [],
itemStyle: {
normal: {
label: {
show: true, //
position: 'top', //
textStyle: {
//
color: 'black',
fontSize: 16
}
}
}
}
series: seriesData
};
let serieMan = JSON.parse(JSON.stringify(serie));
let serieTotal = JSON.parse(JSON.stringify(serie));
serieTotal.name = '总数';
serieMan.name = '男';
let serieWoman = JSON.parse(JSON.stringify(serie));
serieWoman.name = '女';
ryData.map(item => {
xData.value.push(item.depart_name);
serieMan.data.push(item.man);
serieWoman.data.push(item.woman);
serieTotal.data.push(item.total);
});
ySeries.value.push(serieTotal);
ySeries.value.push(serieMan);
ySeries.value.push(serieWoman);
legData = ['总数', '男', '女'];
option.value.legend.data = legData.value;
option.value.xAxis[0].data = xData.value;
option.value.series = ySeries.value;
option.value.title.text = bmText + '人员性别统计';
}
//
setTimeout(async () => {
if (!chartRef.value) return
const myChart = await chartRef.value.init(echarts)
myChart.setOption(option.value)
}, 300)
}).catch((err) => {
console.log(err);
})
}
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);
function getRyBynl(val) {
ryCountData.value = []
let queryParm = {};
queryParm.orgCode = departID.value
cxcRyDatacountByNl(queryParm).then((res) => {
console.log(res);
if (res.success) {
ryCountData.value = res.result.records
}
}).catch((err) => {
console.log(err);
// #ifdef APP
getHeight();
// #endif
};
onMounted(() => {
// #ifdef APP
getHeight();
// #endif
});
// #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();
};
// #endif
//
const initChart = () => {
setTimeout(async () => {
if (!chart.value) return;
const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value);
}, 300);
};
</script>
<style>
<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>

View File

@ -0,0 +1,517 @@
<template>
<view>
<view class="container" id="top1">
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="24"><uni-title :title="'所选单位ID:' + orgCode" align="left" type="h4"></uni-title></uni-col>
</uni-row>
<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="24">
<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
</uni-col>
</uni-row>
<!-- 概览统计 -->
<view class="stats-box" v-if="summary.total">
<view class="stat-item">
<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>
<!-- 数据表格 -->
<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="tableData.length > 0">
<uni-col :span="3">
<view class="titleStyle">序号</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">姓名</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">性别</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">年龄</view>
</uni-col>
<uni-col :span="6">
<view class="titleStyle">操作</view>
</uni-col>
</uni-row>
<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">
<uni-col :span="3">
<view class="dataStyle">
{{ index + 1 }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.xm }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.xb_dictText }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.nl }}
</view>
</uni-col>
<uni-col :span="6">
<view class="dataStyle">
<button size="mini" type="primary" @click="detail(item)">详情</button>
</view>
</uni-col>
</view>
</uni-row>
</scroll-view>
</view>
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue';
import * as echarts from 'echarts';
import { cxcRyDataTongji, 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
});
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))
});
}
// 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;
uni.showLoading({
title: '数据加载中...',
mask: true
});
let params = {
orgCode: orgCode.value
};
if (orgCode.value.length <= 9) {
params.orgCode = orgCode.value;
} else {
params.jcxd_code = orgCode.value;
}
cxcRyDataTongji(params)
.then((res) => {
console.log(res);
if (res.success) {
processData(res.result.records);
//
isLoading.value = false;
uni.hideLoading();
}
})
.catch((err) => {
console.log(err);
uni.showToast({
title: '数据加载失败',
icon: 'none'
});
});
} catch (error) {
console.log(error);
uni.showToast({
title: '数据加载失败',
icon: 'none'
});
} finally {
//
isLoading.value = false;
uni.hideLoading();
}
};
//
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);
});
};
//
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] || '其他';
};
//
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
};
}
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]
},
//
label: {
show: true,
position: 'top'
}
// 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: [
{
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 //线
}
}
],
series: seriesData
};
//
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);
// #ifdef APP
getHeight();
// #endif
};
onMounted(() => {
// #ifdef APP
getHeight();
// #endif
});
// #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();
};
// #endif
//
const initChart = () => {
setTimeout(async () => {
if (!chart.value) return;
const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value);
}, 300);
};
</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>

View File

@ -1,40 +1,54 @@
<template>
<view :class="['f-col','aic',{'gray':store.isgray==1}]">
<view :class="[{'gray':store.isgray==1}]">
<view style="margin-top: 10px;margin-bottom: 10px;">
<picker fields="month" mode="date" @change="bindPickerChange" :value="index">
<view class="date">{{index}} 点击选择月份</view>
</picker>
<view class="info">
<view class="info_title f-row aic">
<view class="">
</view>
<uni-row>
<uni-col :span="7">
<view class="titleStyle">
日期
</view>
<view class="">
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
带班领导
</view>
<view class="">
</uni-col>
<uni-col :span="4">
<view class="titleStyle">
值班领导
</view>
<view class="">
</uni-col>
<uni-col :span="9">
<view class="titleStyle">
值班干部
</view>
</view>
<view class="data_box">
<view class="data f-row aic" v-for="item,i in zhibanArr">
<view class="">
</uni-col>
</uni-row>
<uni-row>
<view v-for="(item,index) in zhibanArr">
<uni-col :span="7">
<view class="dataStyle">
{{item.date}}
</view>
<view class="">
</uni-col>
<uni-col :span="4">
<view class="dataStyle">
{{item.dbld_dictText}}
</view>
<view class="">
</uni-col><uni-col :span="4">
<view class="dataStyle">
{{item.zbld_dictText}}
</view>
<view class="">
</uni-col><uni-col :span="9">
<view class="dataStyle">
{{item.zbgbrealname}}
</view>
</uni-col>
</view>
</view>
</view>
</uni-row>
</view>
</template>
@ -53,6 +67,36 @@
} from '@/store';
const store = useStore()
import dayjs from 'dayjs';
let column = ref([{
name: 'date',
label: '日期',
width: 70,
align: 'center'
},
{
name: 'dbld_dictText',
label: '带班领导',
align: 'center',
width: 60
},
{
name: 'zbld_dictText',
label: '值班领导',
align: 'center',
width: 60
},
{
name: 'zbgbrealname',
label: '值班干部',
align: 'center',
width: 150
}
])
const zhibanArr = ref([])
onLoad(() => {
zhibanQuery()
@ -83,36 +127,36 @@
color: #333333;
}
.info {
background: #F8F8F8;
border-radius: 8rpx;
.titleStyle {
font-size: 12px;
color: #747474;
line-height: 25px;
height: 25px;
background: #F2F9FC;
text-align: center;
width: 690rpx;
margin-top: 23rpx;
.info_title {
font-size: 24rpx;
color: #333333;
padding: 24rpx 0;
border-bottom: 1px solid #EFEFEF;
view {
flex: 1;
}
vertical-align: middle;
border-left: 1px solid #919191;
border-bottom: 1px solid #919191;
;
}
.data_box {
font-size: 24rpx;
padding-bottom: 24rpx;
color: #888888;
/* 内容样式 */
.dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 12px;
color: #00007f;
line-height: 25px;
height: 25px;
font-weight: 500;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
text-overflow: ellipsis;
.data {
margin-top: 23rpx;
view {
flex: 1;
}
}
}
}
</style>

View File

@ -2,12 +2,12 @@
<view v-if="returnCodeOrID === 'orgCode'">
<uni-data-picker v-model="selectDepartID" ref="depart" :openSearch="true" :ellipsis="true"
placeholder="请选择单位code" popup-title="请选择单位" :localdata="departList" @nodeclick="onnodeclick"
@popupclosed="onpopupclosed" :map="{'text':'title','value':'orgCode'}"></uni-data-picker>
@popupclosed="onpopupclosed" @change="onchange" :map="{'text':'title','value':'orgCode'}"></uni-data-picker>
</view>
<view v-else>
<uni-data-picker v-model="selectDepartID" ref="depart" :openSearch="true" :ellipsis="true" placeholder="请选择单位id"
popup-title="请选择单位" :localdata="departList" @nodeclick="onnodeclick" @popupclosed="onpopupclosed"
:map="{'text':'title','value':'id'}"></uni-data-picker>
@change="onchange" :map="{'text':'title','value':'id'}"></uni-data-picker>
</view>
</template>
@ -46,6 +46,8 @@
let selectDepartIDS = ref([]) //ID
let tempSelectDepartID = ref("") //ID
let departInfo = ref({}) //""
let $emit = defineEmits(['change']);
const getDepartList = () => {
@ -59,17 +61,22 @@
})
}
const onnodeclick = ((e) => {
// console.log(e)
departInfo.value = e;
if (props.returnCodeOrID = "orgCode") {
tempSelectDepartID.value = e.orgCode
} else {
tempSelectDepartID.value = e.value
}
})
const onchange = ((e) => {
$emit('change', e.detail.value[e.detail.value.length - 1].value, {})
})
const onpopupclosed = ((e) => {
selectDepartID.value = tempSelectDepartID.value
$emit('change', selectDepartID.value)
$emit('change', selectDepartID.value, departInfo)
})
onLoad((e) => {
getDepartList();

View File

@ -1,4 +1,24 @@
# trq-depart-select
# 1.0.1
更新,添加返回值,将整个机构对象返回父组件
```javascript
const onpopupclosed = ((e) => {
selectDepartID.value = tempSelectDepartID.value
$emit('change', selectDepartID.value, departInfo)
})
```
增加选择到最后层级触发的change时间返回数据到父组件的功能
```javascript
const onchange = ((e) => {
$emit('change', e.detail.value[e.detail.value.length - 1].value, {})
})
```
# 1.0
属性 returnCodeOrID 默认值 orgCode 组件返回单位的orgCode 不设置属性或设置为其他,组件返回 单位ID