diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideo.java index 2b870d11..8ab6e604 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideo.java @@ -22,6 +22,16 @@ public class BusTrainingVideo extends BaseEntity @Excel(name = "部门主键") private Long deptId; + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + private String deptName; + /** 项目主键 */ @Excel(name = "项目主键") private Long projectId; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoMapper.xml index 46f211ab..a13ec1d8 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -27,7 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, dept_id, project_id, train_title, train_type, train_level, craft_type, craft_post, train_file_type,ord, train_file_path, train_file_image, train_file_times, is_del, create_by, create_time, update_by, update_time, remark from bus_training_video + select bus_training_video.*,sys_dept.dept_name + from bus_training_video + left join sys_dept on bus_training_video.dept_id=sys_dept.dept_id diff --git a/yanzhu-ui-vue3/src/store/modules/user.js b/yanzhu-ui-vue3/src/store/modules/user.js index e7a4301b..57154f1e 100644 --- a/yanzhu-ui-vue3/src/store/modules/user.js +++ b/yanzhu-ui-vue3/src/store/modules/user.js @@ -9,6 +9,7 @@ const useUserStore = defineStore( token: getToken(), name: '', avatar: '', + compInfo:{}, roles: [], permissions: [] }), @@ -44,6 +45,7 @@ const useUserStore = defineStore( this.roles = ['ROLE_DEFAULT'] } this.name = user.userName + this.compInfo=user.comp; this.avatar = avatar; resolve(res) }).catch(error => { diff --git a/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue b/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue index 079b0508..fb80d830 100644 --- a/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue @@ -2,7 +2,7 @@ - + @@ -13,7 +13,7 @@ :default-expanded-keys="defaultEK" @node-click="handleNodeClick" /> - + @@ -23,12 +23,12 @@ - - + + - + @@ -58,15 +58,14 @@ --> + - - - - - - + + + + - + @@ -74,29 +73,20 @@ - + - - - - - - - - - - - - + + {{ scope.row.trainFileTimes }}秒 + - + - + @@ -141,10 +124,10 @@ :value="dict.value"> - + - + @@ -154,7 +137,7 @@ - @@ -191,6 +174,7 @@