zhc077
/
zmd_kejiju
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

Browse Source
master
JayChou 2 weeks ago
parent 1b5e4bdc37 5230ab409e
commit a89ea23432
2 changed files with 32 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
  2. 2
      jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue

37
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
Unescape View File

@ -101,7 +101,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
experttemp.setTopPic(sysUser.getAvatar());
experttemp.setPhone(sysUser.getPhone());
experttemp.setEmails(sysUser.getEmail());
experttemp.setSsdep(sysDepart.getDepartName());
if (sysDepart!=null ){
experttemp.setSsdep(sysDepart.getDepartName());
}else{
experttemp.setSsdep("暂无");
}
experttemp.setPsd(sysUser.getPassword());
experttemp.setSepsd(sysUser.getPassword());
});
@ -133,7 +137,12 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
experttemp.setTopPic(sysUser.getAvatar());
experttemp.setPhone(sysUser.getPhone());
experttemp.setEmails(sysUser.getEmail());
experttemp.setSsdep(sysDepart.getDepartName());
if (sysDepart!=null ){
experttemp.setSsdep(sysDepart.getDepartName());
}else{
experttemp.setSsdep("暂无");
}
experttemp.setPsd(sysUser.getPassword());
experttemp.setSepsd(sysUser.getPassword());
});
@ -187,7 +196,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
experttemp.setTopPic(sysUser.getAvatar());
experttemp.setPhone(sysUser.getPhone());
experttemp.setEmails(sysUser.getEmail());
experttemp.setSsdep(sysDepart.getDepartName());
if (sysDepart!=null ){
experttemp.setSsdep(sysDepart.getDepartName());
}else{
experttemp.setSsdep("暂无");
}
experttemp.setPsd(sysUser.getPassword());
});
return Result.OK(pageList);
@ -232,7 +245,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
experttemp.setTopPic(sysUser.getAvatar());
experttemp.setPhone(sysUser.getPhone());
experttemp.setEmails(sysUser.getEmail());
experttemp.setSsdep(sysDepart.getDepartName());
if (sysDepart!=null ){
experttemp.setSsdep(sysDepart.getDepartName());
}else{
experttemp.setSsdep("暂无");
}
experttemp.setPsd(sysUser.getPassword());
});
return Result.OK(pageList);
@ -262,7 +279,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
experttemp.setTopPic(sysUser.getAvatar());
experttemp.setPhone(sysUser.getPhone());
experttemp.setEmails(sysUser.getEmail());
experttemp.setSsdep(sysDepart.getDepartName());
if (sysDepart!=null ){
experttemp.setSsdep(sysDepart.getDepartName());
}else{
experttemp.setSsdep("暂无");
}
experttemp.setPsd(sysUser.getPassword());
});
return Result.OK(pageList);
@ -775,7 +796,11 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
experttemp.setTopPic(sysUser.getAvatar());
experttemp.setPhone(sysUser.getPhone());
experttemp.setEmails(sysUser.getEmail());
experttemp.setSsdep(sysDepart.getDepartName());
if (sysDepart!=null ){
experttemp.setSsdep(sysDepart.getDepartName());
}else{
experttemp.setSsdep("暂无");
}
experttemp.setPsd(sysUser.getPassword());
experttemp.setSepsd(sysUser.getPassword());
experttemp.setAvatar(sysUser.getAvatar());

2
jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue
Unescape View File

@ -21,7 +21,7 @@
<div class="flex justify-between text-secondary">
<span style="font-weight: bold; font-size: em; margin-left: auto; display: inline-block; width: fit-content;">请假{{ item5 }}人</span>
<span style="font-weight: bold; font-size: em; margin-left: auto; display: inline-block; width: fit-content;">出差{{ item6 }}人</span>
<span style="font-weight: bold; font-size: em; margin-left: auto; display: inline-block; width: fit-content;">出差{{ item7 }}人</span>
<span style="font-weight: bold; font-size: em; margin-left: auto; display: inline-block; width: fit-content;">其他{{ item7 }}人</span>
</div>
</CardGrid>
<CardGrid class="!md:w-1/3 !w-full">

Write Preview
Loading…
Cancel
Save