From be48d53d20ded61525bb3e96ec755b9b80a3722f Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Sat, 9 May 2020 18:46:26 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=9A=84=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetPermissionDetail.vue                 | 23 ++++++++++---------
 .../perms/AssetPermissionDetail/index.vue     |  2 +-
 src/views/perms/AssetPermissionList.vue       | 22 ++++++++----------
 src/views/perms/AssetPermissionList/index.vue | 22 ++++++++----------
 4 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/src/views/perms/AssetPermissionDetail/AssetPermissionDetail.vue b/src/views/perms/AssetPermissionDetail/AssetPermissionDetail.vue
index 352d30347..1afcf3572 100644
--- a/src/views/perms/AssetPermissionDetail/AssetPermissionDetail.vue
+++ b/src/views/perms/AssetPermissionDetail/AssetPermissionDetail.vue
@@ -11,7 +11,7 @@
 
 <script>
 import { DetailCard, ActiveCard } from '@/components'
-import { toSafeLocalDateStr } from '@/utils/common'
+// import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
   name: 'AssetPermissionDetail',
@@ -52,43 +52,44 @@ export default {
         },
         {
           key: this.$t('perms.UserCount'),
-          value: this.getDataLength(this.object.users)
+          // value: this.getDataLength(this.object.users)
+          value: JSON.stringify(this.object.users_amount)
         },
         {
           key: this.$t('perms.UserGroupCount'),
-          value: this.getDataLength(this.object.user_groups)
+          value: JSON.stringify(this.object.assets_amount)
         },
         {
           key: this.$t('perms.AssetCount'),
-          value: this.getDataLength(this.object.assets)
+          value: JSON.stringify(this.object.users_amount)
         },
         {
           key: this.$t('perms.NodeCount'),
-          value: this.getDataLength(this.object.nodes)
+          value: JSON.stringify(this.object.nodes_amount)
         },
         {
           key: this.$t('perms.SystemUserCount'),
-          value: this.getDataLength(this.object.system_users)
+          value: JSON.stringify(this.object.system_users_amount)
         },
         {
           key: this.$t('perms.DateStart'),
-          value: toSafeLocalDateStr(this.object.date_start)
+          value: 'api没有这个字段'
         },
         {
           key: this.$t('perms.DateExpired'),
-          value: toSafeLocalDateStr(this.object.date_expired)
+          value: 'api没有这个字段'
         },
         {
           key: this.$t('perms.DateCreated'),
-          value: '没有这个字段'
+          value: this.object.date_created
         },
         {
           key: this.$t('perms.CreatedBy'),
-          value: '没有这个字段'
+          value: this.object.created_by
         },
         {
           key: this.$t('common.Comment'),
-          value: this.object.comment
+          value: 'api没有这个字段'
         }
       ]
     }
diff --git a/src/views/perms/AssetPermissionDetail/index.vue b/src/views/perms/AssetPermissionDetail/index.vue
index f92240882..ca5f72a89 100644
--- a/src/views/perms/AssetPermissionDetail/index.vue
+++ b/src/views/perms/AssetPermissionDetail/index.vue
@@ -21,7 +21,7 @@ export default {
   data() {
     return {
       AssetPermission: {
-        name: '', users: '', user_groups: '', assets: '', nodes: '', system_users: '',
+        name: '', users_amount: 0, user_groups_amount: 0, assets_amount: 0, nodes_amount: 0, system_users_amount: 0,
         date_start: '', date_expired: ''
       },
       config: {
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 3dc2b594f..f05f0e022 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import GenericTreeListPage from '@/layout/components/GenericTreeListPage'
-import { LengthFormatter, ExpandAssetPermissionFormatter } from '@/components/ListTable/formatters/index'
+import { ExpandAssetPermissionFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -35,35 +35,31 @@ export default {
           { label: this.$t('perms.SystemUser'), key: 'system_user' },
           { label: '继承(先占位)', key: 'all=0' }
         ],
-        columns: ['expand', 'name', 'users', 'user_groups', 'assets', 'nodes', 'system_users', 'is_active', 'actions'],
+        columns: ['expand', 'name', 'users_amount', 'user_groups_amount', 'assets_amount', 'nodes_amount', 'system_users_amount', 'is_active', 'actions'],
         columnsMeta: {
           expand: {
             type: 'expand',
             formatter: ExpandAssetPermissionFormatter
           },
-          users: {
-            formatter: LengthFormatter,
+          users_amount: {
             label: this.$t('perms.User')
           },
-          user_groups: {
-            formatter: LengthFormatter,
+          user_groups_amount: {
             label: this.$t('perms.UserGroups')
           },
-          assets: {
-            formatter: LengthFormatter,
+          assets_amount: {
             label: this.$t('perms.Asset')
           },
-          nodes: {
-            formatter: LengthFormatter,
+          nodes_amount: {
             label: this.$t('perms.Node')
           },
-          system_users: {
-            formatter: LengthFormatter,
+          system_users_amount: {
             label: this.$t('perms.SystemUser')
           }
         },
         actions: {
-          updateRoute: 'AssetPermissionUpdate'
+          updateRoute: 'AssetPermissionUpdate',
+          detailRoute: 'AssetPermissionDetail'
         }
       },
       headerActions: {
diff --git a/src/views/perms/AssetPermissionList/index.vue b/src/views/perms/AssetPermissionList/index.vue
index 9da67d8ac..b700235dc 100644
--- a/src/views/perms/AssetPermissionList/index.vue
+++ b/src/views/perms/AssetPermissionList/index.vue
@@ -7,7 +7,7 @@
 <script>
 import AssetPermissionTree from './AssetPermissionTree'
 import AssetPermissionList from './AssetPermissionList'
-import { LengthFormatter, ExpandAssetPermissionFormatter } from '@/components/ListTable/formatters/index'
+import { ExpandAssetPermissionFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -39,35 +39,31 @@ export default {
           { label: this.$t('perms.SystemUser'), key: 'system_user' },
           { label: '继承(先占位)', key: 'all=0' }
         ],
-        columns: ['expand', 'name', 'users', 'user_groups', 'assets', 'nodes', 'system_users', 'is_active', 'actions'],
+        columns: ['expand', 'name', 'users_amount', 'user_groups_amount', 'assets_amount', 'nodes_amount', 'system_users_amount', 'is_active', 'actions'],
         columnsMeta: {
           expand: {
             type: 'expand',
             formatter: ExpandAssetPermissionFormatter
           },
-          users: {
-            formatter: LengthFormatter,
+          users_amount: {
             label: this.$t('perms.User')
           },
-          user_groups: {
-            formatter: LengthFormatter,
+          user_groups_amount: {
             label: this.$t('perms.UserGroups')
           },
-          assets: {
-            formatter: LengthFormatter,
+          assets_amount: {
             label: this.$t('perms.Asset')
           },
-          nodes: {
-            formatter: LengthFormatter,
+          nodes_amount: {
             label: this.$t('perms.Node')
           },
-          system_users: {
-            formatter: LengthFormatter,
+          system_users_amount: {
             label: this.$t('perms.SystemUser')
           }
         },
         actions: {
-          updateRoute: 'AssetPermissionUpdate'
+          updateRoute: 'AssetPermissionUpdate',
+          detailRoute: 'AssetPermissionDetail'
         }
       },
       headerActions: {