363 Commits

Author SHA1 Message Date
严妍
43b5d3cd23 Squashed commit of the following:
commit 31df8dcfd2b73fbd4d5cdd872e7f4d5ccf264ad3
Author: 严妍 <3096114695@qq.com>
Date:   Thu Jul 13 16:51:58 2023 +0800

    对接劳务班组出勤分析,右侧图
2023-07-13 16:58:10 +08:00
严妍
31df8dcfd2 对接劳务班组出勤分析,右侧图 2023-07-13 16:51:58 +08:00
严妍
ecd1c51e30 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
# Conflicts:
#	src/api/modules/labor.ts
#	src/views/sevenLargeScreen/laborManagement/rightTop.vue
2023-07-13 15:49:35 +08:00
严妍
106a65de66 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev 2023-07-13 15:42:56 +08:00
严妍
3e549b2d06 对接劳务管理部门管理人员出勤分析、按分包单位分析、劳务班组出勤分析接口。 2023-07-13 15:42:07 +08:00
袁晶琳
194d75438e Merge branch 'yjl_dev' into 'shenzhen-dev'
大屏页面调整

See merge request !2
2023-07-13 15:38:20 +08:00
袁晶琳
8f4eeaffb6 Merge branch 'yjl_dev' into 'master'
大屏页面调整

See merge request !1
2023-07-13 15:37:46 +08:00
jxj_yjl
b98b1d6e41 大屏页面调整 2023-07-13 15:37:02 +08:00
严妍
99ca32c600 Squashed commit of the following:
commit 2e062b9a6c69068108575c2787a723e44679c749
Author: 严妍 <3096114695@qq.com>
Date:   Wed Jul 12 16:46:53 2023 +0800

    对接右上按工种分析接口
2023-07-12 17:17:20 +08:00
jxj_yjl
f738f8fcfb 测试代码提交 2023-07-12 16:50:21 +08:00
严妍
2e062b9a6c 对接右上按工种分析接口 2023-07-12 16:46:53 +08:00
jxj_yjl
1d0e7b9720 大屏项目初始化 2023-07-12 09:56:31 +08:00
袁晶琳
42e75e316c 添加 readme.md 2023-07-12 09:23:38 +08:00