diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index b9d7f43f3a..d51dbf2a99 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -90,7 +90,7 @@ export default { icon: '圖標', all: '全部', enable: '啟用', - disable: '停用', + disable: '禁用', yes: '是', no: '否', reset: '重置', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index caa7469699..d66fce4791 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -91,7 +91,7 @@ export default { icon: '图标', all: '全部', enable: '启用', - disable: '停用', + disable: '禁用', yes: '是', no: '否', reset: '重置', diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue index 1a249a656a..0111801d9d 100644 --- a/frontend/src/layout/components/AppMain.vue +++ b/frontend/src/layout/components/AppMain.vue @@ -28,6 +28,7 @@ export default { /* topbar 56 */ min-height: calc(100vh - 56px); width: 100%; + height: 100%; position: relative; overflow: hidden; } @@ -37,6 +38,7 @@ export default { } .ms-main-container { + height: 100%; padding: 0; } diff --git a/frontend/src/views/panel/GrantAuth/role/index.vue b/frontend/src/views/panel/GrantAuth/role/index.vue index 1af7f475d3..3167339bda 100644 --- a/frontend/src/views/panel/GrantAuth/role/index.vue +++ b/frontend/src/views/panel/GrantAuth/role/index.vue @@ -71,9 +71,12 @@ export default { const arr = obj[this.fieldName] if (arr.length === 0) { this.initColumnLabel() - return + } else { + this.columnLabel = this.filter_options[arr[0]].text } - this.columnLabel = this.filter_options[arr[0]].text + this.$nextTick(() => { + this.setCheckNodes() + }) }, save() { const rows = this.$refs.table.store.states.selection diff --git a/frontend/src/views/panel/GrantAuth/user/index.vue b/frontend/src/views/panel/GrantAuth/user/index.vue index ebef162293..7ee56ffa87 100644 --- a/frontend/src/views/panel/GrantAuth/user/index.vue +++ b/frontend/src/views/panel/GrantAuth/user/index.vue @@ -8,8 +8,15 @@ :row-style="{height: '35px'}" @filter-change="filterChange" > - + @@ -56,7 +63,7 @@ export default { userLists(1, 0, param).then(response => { const data = response.data // this.total = data.itemCount - this.data = data.listObject + this.data = data.listObject.filter(ele => ele.id !== this.$store.getters.user.userId) this.queryShareNodeIds() }) }, @@ -71,9 +78,12 @@ export default { const arr = obj[this.fieldName] if (arr.length === 0) { this.initColumnLabel() - return + } else { + this.columnLabel = this.filter_options[arr[0]].text } - this.columnLabel = this.filter_options[arr[0]].text + this.$nextTick(() => { + this.setCheckNodes() + }) }, save() { diff --git a/frontend/src/views/system/about/index.vue b/frontend/src/views/system/about/index.vue index f9fd67f46b..9e91f43c2c 100644 --- a/frontend/src/views/system/about/index.vue +++ b/frontend/src/views/system/about/index.vue @@ -159,6 +159,7 @@ export default { margin-top: 5%; flex-direction: row; width: 640px; + min-width: 640px; height: 400px; position: relative; >>>div.el-card__header { diff --git a/frontend/src/views/system/dept/form.vue b/frontend/src/views/system/dept/form.vue index 04948a5c4a..d98c7a9ca5 100644 --- a/frontend/src/views/system/dept/form.vue +++ b/frontend/src/views/system/dept/form.vue @@ -1,5 +1,5 @@