diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index d3e6d2fc..a4bc8410 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -7,7 +7,7 @@
{{ $t('depart.addDepartment') }}
{{ $t('depart.addSubordinate') }}
- {{ $t('export') }}
+ {{ $t('export') }}
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index 7308d098..c01c6f18 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -23,7 +23,7 @@
-->
{{ $t('query') }}
-
{{ $t('reset') }}
+
{{ $t('reset') }}
@@ -59,7 +59,7 @@
- {{ $t('more') }}
+
@@ -147,7 +147,7 @@
- {{ $t('more') }}
+
diff --git a/src/views/system/SysCategoryList.vue b/src/views/system/SysCategoryList.vue
index 1a2201bc..cdd4bade 100644
--- a/src/views/system/SysCategoryList.vue
+++ b/src/views/system/SysCategoryList.vue
@@ -4,9 +4,9 @@
新增
-
导出
+
导出
- 导入
+ 导入
@@ -35,11 +35,22 @@
编辑
- handleDelete(record)">
- 删除
-
-
- 添加下级
+
+
+
+
+
+
+ handleDelete(record)">
+ 删除
+
+
+
+
+ 添加下级
+
+
+
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 614eb775..22289577 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -77,7 +77,7 @@
{{ $t('query') }}
- {{ $t('reset') }}
+ {{ $t('reset') }}
@@ -86,9 +86,9 @@
{{ $t('user.addUser') }}
-
{{ $t('export') }}
-
{{ $t('recycleBin') }}
-
{{ $t('user.roleAllocation') }}
+
{{ $t('export') }}
+
{{ $t('recycleBin') }}
+
{{ $t('user.roleAllocation') }}
@@ -140,7 +140,7 @@
- {{ $t('more') }}
+
diff --git a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
index 1c8faa8c..d5fb1d98 100644
--- a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
+++ b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
@@ -111,6 +111,7 @@ export default {
title: this.$t('system.friendshipLink.isShelf'),
align: 'center',
width: 180,
+ dataIndex: 'isShelf',
scopedSlots: { customRender: 'isShelf' }
},
{
diff --git a/src/views/system/log/LoginLogList.vue b/src/views/system/log/LoginLogList.vue
index 817f8a8c..655386fb 100644
--- a/src/views/system/log/LoginLogList.vue
+++ b/src/views/system/log/LoginLogList.vue
@@ -11,10 +11,9 @@
-
+
-
-
- {{ $t('query') }}
- {{ $t('reset') }}
-
-
+
+
{{ $t('query') }}
+
{{ $t('reset') }}
+
@@ -172,4 +169,7 @@ export default {
diff --git a/src/views/system/log/OperatorLogList.vue b/src/views/system/log/OperatorLogList.vue
index b3ac5051..9c688cd8 100644
--- a/src/views/system/log/OperatorLogList.vue
+++ b/src/views/system/log/OperatorLogList.vue
@@ -11,10 +11,9 @@
-
+
-
-
+
+
-
-
- {{ $t('query') }}
- {{ $t('reset') }}
-
-
+
+
{{ $t('query') }}
+
{{ $t('reset') }}
+
@@ -193,4 +190,7 @@ export default {
diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue
index d3631f84..0961a78d 100644
--- a/src/views/system/modules/DeptUserInfo.vue
+++ b/src/views/system/modules/DeptUserInfo.vue
@@ -12,7 +12,7 @@
@@ -59,7 +59,7 @@
- 更多
+