diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue index 9666eea67..7e6c09b4e 100644 --- a/resources/assets/js/components/Mobile/Tabbar.vue +++ b/resources/assets/js/components/Mobile/Tabbar.vue @@ -83,7 +83,7 @@ export default { {icon: '', name: 'joinMeeting', label: '加入会议'}, ], [ - {icon: '', name: 'workReport', label: '工作报告'}, + {icon: '', name: 'workReport', label: '工作报告'}, ] ], diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue index 249f93318..d80064282 100644 --- a/resources/assets/js/pages/manage/components/TeamManagement.vue +++ b/resources/assets/js/pages/manage/components/TeamManagement.vue @@ -60,7 +60,7 @@ -
+
  • @@ -313,6 +313,7 @@ export default { return { loadIng: 0, minBox: false, + minWidth: 0, keys: {}, keyIs: false, @@ -773,12 +774,29 @@ export default { this.minBox = v }, immediate: true + }, + minBox: { + handler() { + this.$nextTick(_=> { + if (this.$el && this.$el.clientWidth > 0) { + this.minWidth = this.$el.clientWidth + } + }); + }, + immediate: true } }, computed: { departmentParentDisabled() { return !!(this.departmentData.id > 0 && this.departmentList.find(({parent_id}) => parent_id == this.departmentData.id)); }, + userStyle({minWidth}) { + const style = {} + if (minWidth > 0) { + style.minWidth = (minWidth - 40) + 'px' + } + return style + } }, methods: { onSearch() { @@ -1064,6 +1082,10 @@ export default { }, onSelectDepartment(id) { + if (this.windowSmall) { + this.minBox = true + } + // if (this.departmentSelect === id) { this.departmentSelect = -1 return diff --git a/resources/assets/sass/components/mobile.scss b/resources/assets/sass/components/mobile.scss index cfda9ce3f..7b82a2a81 100644 --- a/resources/assets/sass/components/mobile.scss +++ b/resources/assets/sass/components/mobile.scss @@ -149,8 +149,9 @@ .tabbar-badge { position: absolute; - top: -4px; - right: 12px; + top: -6px; + right: 50%; + transform: translateX(36px); } } } diff --git a/resources/assets/sass/pages/components/team-management.scss b/resources/assets/sass/pages/components/team-management.scss index 6d28cfede..530e73955 100644 --- a/resources/assets/sass/pages/components/team-management.scss +++ b/resources/assets/sass/pages/components/team-management.scss @@ -48,7 +48,6 @@ .management-box { flex: 1; display: flex; - min-width: 500px; height: 0; &.min-box { .management-department { diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf b/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf index 15a9b30fa..fcb0a679f 100644 Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf differ diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff index 53f57a30d..72e87b1a4 100644 Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff differ diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 index 1419c711b..509bba5c3 100644 Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 differ