diff --git a/src/views/dashboard/modules/MenuManageModal.vue b/src/views/dashboard/modules/MenuManageModal.vue index 92ff8080..4c1b01aa 100644 --- a/src/views/dashboard/modules/MenuManageModal.vue +++ b/src/views/dashboard/modules/MenuManageModal.vue @@ -47,6 +47,8 @@ export default { dataSource: [], // 已选数据id targetKeys: [], + // 打开弹框传入的ids + ids: [], // 多语言 locale: { itemUnit: this.$t('dashboard.quickEnter.itemUnit'), @@ -66,6 +68,7 @@ export default { // 清空之前的数据,然后重新请求 this.dataSource = [] this.targetKeys = ids || [] + this.ids = ids this.getMenuList() }, // 获取菜单列表 @@ -91,6 +94,11 @@ export default { this.$message.warning(this.$t('dashboard.quickEnter.maxSelectedNine')) return } + // 如果进来的值和提交的值一样不提示操作成功 + if (this.ids.join(',') === this.targetKeys.join(',')) { + this.close() + return + } this.loading = true saveQuickEntryModuleList({ permissionIds: this.targetKeys.join(',') diff --git a/src/views/dashboard/modules/QuickEnterCard.vue b/src/views/dashboard/modules/QuickEnterCard.vue index a6585d93..ad47583d 100644 --- a/src/views/dashboard/modules/QuickEnterCard.vue +++ b/src/views/dashboard/modules/QuickEnterCard.vue @@ -61,7 +61,7 @@ const map = [ { name: '海外标准', srcName: 'overseas-standards' }, { name: '用户管理', srcName: 'user-center' }, { name: '联络人管理', srcName: 'contact-management' }, - { name: '自定义对比', srcName: 'custom-comparison' }, + { name: '自定义比对', srcName: 'custom-comparison' }, { name: '角色管理', srcName: 'role-center' }, { name: '资料中心', srcName: 'resource-center' }, { name: '车型项目库', srcName: 'vehicle-project-library' }, @@ -172,6 +172,8 @@ export default { } } .plus-div { + // (总高度 - 内边距 - 标题 - 上下边距) / 3 + height: calc((306px - 48px - 31px - 20px) / 3); cursor: pointer; border: 1px dashed @primary-color; box-sizing: border-box; diff --git a/src/views/dashboard/modules/ToDoTaskCard.vue b/src/views/dashboard/modules/ToDoTaskCard.vue index 1a67c0b1..b20dffe2 100644 --- a/src/views/dashboard/modules/ToDoTaskCard.vue +++ b/src/views/dashboard/modules/ToDoTaskCard.vue @@ -5,7 +5,7 @@

{{ $t('dashboard.todoTask.todoTask') }}

{{ $t('dashboard.todoTask.more') }}

-
+
@@ -13,6 +13,7 @@
+