From 423dd47d53c301761c85ec409a1e15f002f32351 Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Wed, 9 Jul 2025 18:09:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=90=8E=E5=8F=B0=E9=A6=96?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yanzhu/system/api/domain/SysUser.java | 10 + .../system/controller/SysUserController.java | 13 ++ yanzhu-ui-vue3/index.html | 5 +- yanzhu-ui-vue3/src/api/manage/labor.js | 17 ++ .../src/assets/icons/svg/certification.svg | 1 + yanzhu-ui-vue3/src/assets/icons/svg/group.svg | 1 + .../src/assets/icons/svg/mgrworker.svg | 1 + .../src/assets/icons/svg/onlineworker.svg | 1 + yanzhu-ui-vue3/src/assets/icons/svg/tool2.svg | 1 + .../src/components/Chart/MyChart.vue | 61 ++++++ yanzhu-ui-vue3/src/store/modules/user.js | 4 + .../src/views/bim/bimSetting/index.vue | 12 +- .../src/views/bim/sandTableSetting/index.vue | 12 +- yanzhu-ui-vue3/src/views/index.vue | 191 +++++++++++------- .../indexCompents/navAttJobTypeGroup.vue | 132 ++++++++++++ .../views/indexCompents/navAttLaborerRate.vue | 96 +++++++++ .../indexCompents/navAttLaborerTrend.vue | 112 ++++++++++ .../views/indexCompents/navAttManagerRate.vue | 95 +++++++++ .../views/indexCompents/navAttWokerProp.vue | 97 +++++++++ .../views/indexCompents/navAttendanceRate.vue | 93 +++++++++ .../views/indexCompents/navTopAttMgrCount.vue | 26 +++ .../indexCompents/navTopAttOnlineCount.vue | 26 +++ .../indexCompents/navTopAttRealCount.vue | 22 ++ .../indexCompents/navTopAttWorkerCount.vue | 26 +++ .../src/views/indexCompents/navTopUnit.vue | 26 +++ .../views/manage/plan/bimSelectionDialog2.vue | 12 +- yanzhu-ui-vue3/vite.config.js | 2 +- 27 files changed, 1005 insertions(+), 90 deletions(-) create mode 100644 yanzhu-ui-vue3/src/api/manage/labor.js create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/certification.svg create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/group.svg create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/mgrworker.svg create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/onlineworker.svg create mode 100644 yanzhu-ui-vue3/src/assets/icons/svg/tool2.svg create mode 100644 yanzhu-ui-vue3/src/components/Chart/MyChart.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navAttJobTypeGroup.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navAttLaborerRate.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navAttLaborerTrend.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navAttManagerRate.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navAttWokerProp.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navAttendanceRate.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navTopAttMgrCount.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navTopAttOnlineCount.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navTopAttRealCount.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navTopAttWorkerCount.vue create mode 100644 yanzhu-ui-vue3/src/views/indexCompents/navTopUnit.vue diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java index ff5113a2..640ce2e6 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java @@ -116,6 +116,16 @@ public class SysUser extends BaseEntity private Long workType; + public String getVendorsCode() { + return vendorsCode; + } + + public void setVendorsCode(String vendorsCode) { + this.vendorsCode = vendorsCode; + } + + private String vendorsCode; + public Long getWorkType() { return workType; } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index 2c71e4fa..491b183e 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -17,6 +17,8 @@ import com.yanzhu.common.security.annotation.InnerAuth; import com.yanzhu.common.security.annotation.RequiresPermissions; import com.yanzhu.common.security.service.TokenService; import com.yanzhu.common.security.utils.SecurityUtils; +import com.yanzhu.manage.domain.AttendanceCfg; +import com.yanzhu.manage.mapper.AttendanceCfgMapper; import com.yanzhu.system.api.domain.SysDept; import com.yanzhu.system.api.domain.SysRole; import com.yanzhu.system.api.domain.SysUser; @@ -72,6 +74,9 @@ public class SysUserController extends BaseController { @Autowired private TokenService tokenService; + @Autowired + private AttendanceCfgMapper attendanceCfgMapper; + /** * 获取用户列表 */ @@ -129,6 +134,7 @@ public class SysUserController extends BaseController { if (StringUtils.isNull(sysUser)) { throw new ServiceException("用户名或密码错误"); } + /**if (StringUtils.isEmpty(sysUser.getRoles())) { throw new ServiceException("用户未查询到分配角色，请联系管理员！！！"); }*/ @@ -290,6 +296,13 @@ public class SysUserController extends BaseController { user.setComId(dept.getComId()); user.setActiveComId(dept.getComId()); user.setDept(dept); + AttendanceCfg cfgWhere=new AttendanceCfg(); + cfgWhere.setProjectId(dept.getDeptId()); + List cfgList=attendanceCfgMapper.selectAttendanceCfgList(cfgWhere); + if(cfgList.size()>0){ + user.setVendorsCode(cfgList.get(0).getVendorsCode()); + } + AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); if(Objects.nonNull(user.getRoles()) && user.getRoles().size()>0){ diff --git a/yanzhu-ui-vue3/index.html b/yanzhu-ui-vue3/index.html index 2e374f69..1183307b 100644 --- a/yanzhu-ui-vue3/index.html +++ b/yanzhu-ui-vue3/index.html @@ -17,8 +17,9 @@ type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn" > - - + + +