From 7fa5cff919fec2b169d28602439e54ec28de18db Mon Sep 17 00:00:00 2001
From: kdyq007 <kdyq@vip.qq.com>
Date: Sun, 24 Nov 2019 15:22:18 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/api/acl/resource.js               |  7 -------
 ui/src/views/cmdb/acl/resource_types.vue |  2 +-
 ui/src/views/cmdb/acl/resources.vue      | 19 +++++++++++--------
 ui/src/views/cmdb/acl/roles.vue          |  2 +-
 ui/src/views/cmdb/acl/users.vue          |  2 +-
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ui/src/api/acl/resource.js b/ui/src/api/acl/resource.js
index 44bf271..d96eae8 100644
--- a/ui/src/api/acl/resource.js
+++ b/ui/src/api/acl/resource.js
@@ -63,10 +63,3 @@ export function deleteResourceTypeById (id) {
     method: 'DELETE'
   })
 }
-
-export function getResourcePermissions (id) {
-  return axios({
-    url: urlPrefix + `/resources/${id}/permissions`,
-    method: 'DELETE'
-  })
-}
diff --git a/ui/src/views/cmdb/acl/resource_types.vue b/ui/src/views/cmdb/acl/resource_types.vue
index 167dcfd..26a240a 100644
--- a/ui/src/views/cmdb/acl/resource_types.vue
+++ b/ui/src/views/cmdb/acl/resource_types.vue
@@ -112,7 +112,7 @@ export default {
           title: '类型名',
           dataIndex: 'name',
           sorter: false,
-          width: 300,
+          width: 150,
           scopedSlots: {
             customRender: 'nameSearchRender',
             filterDropdown: 'filterDropdown',
diff --git a/ui/src/views/cmdb/acl/resources.vue b/ui/src/views/cmdb/acl/resources.vue
index f6d94a1..7e3599d 100644
--- a/ui/src/views/cmdb/acl/resources.vue
+++ b/ui/src/views/cmdb/acl/resources.vue
@@ -59,7 +59,8 @@
         <template>
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical"/>
-
+          <a @click="handlePerm(record)">权限</a>
+          <a-divider type="vertical"/>
           <a-popconfirm
             title="确认删除?"
             @confirm="handleDelete(record)"
@@ -74,6 +75,7 @@
 
     </s-table>
     <resourceForm ref="resourceForm" :handleOk="handleOk"> </resourceForm>
+    <resourcePermForm ref="resourcePermForm"> </resourcePermForm>
 
   </a-card>
 </template>
@@ -81,20 +83,18 @@
 <script>
 import { STable } from '@/components'
 import resourceForm from './module/resourceForm'
+import resourcePermForm from './module/resourcePermForm'
 import { deleteResourceById, searchResource } from '@/api/acl/resource'
 
 export default {
   name: 'Index',
   components: {
     STable,
-    resourceForm
+    resourceForm,
+    resourcePermForm
   },
   data () {
     return {
-      appList: [{
-        id: '1',
-        name: '默认应用'
-      }],
       scroll: { x: 1000, y: 500 },
       btnName: '新增资源',
 
@@ -112,7 +112,7 @@ export default {
           title: '资源名',
           dataIndex: 'name',
           sorter: false,
-          width: 50,
+          width: 300,
           scopedSlots: {
             customRender: 'nameSearchRender',
             filterDropdown: 'filterDropdown',
@@ -130,7 +130,6 @@ export default {
         {
           title: '资源类型',
           dataIndex: 'resource_type_id',
-          width: 50,
           sorter: false,
           scopedSlots: { customRender: 'resource_type_id' }
 
@@ -239,6 +238,10 @@ export default {
     handleEdit (record) {
       this.$refs.resourceForm.handleEdit(record)
     },
+
+    handlePerm (record) {
+      this.$refs.resourcePermForm.handlePerm(record)
+    },
     handleDelete (record) {
       this.deleteResource(record.id)
     },
diff --git a/ui/src/views/cmdb/acl/roles.vue b/ui/src/views/cmdb/acl/roles.vue
index a1ab2d9..7499382 100644
--- a/ui/src/views/cmdb/acl/roles.vue
+++ b/ui/src/views/cmdb/acl/roles.vue
@@ -152,7 +152,7 @@ export default {
         {
           title: '操作',
           dataIndex: 'action',
-          width: 300,
+          width: 150,
           fixed: 'right',
           scopedSlots: { customRender: 'action' }
         }
diff --git a/ui/src/views/cmdb/acl/users.vue b/ui/src/views/cmdb/acl/users.vue
index 565f6f8..7f4581e 100644
--- a/ui/src/views/cmdb/acl/users.vue
+++ b/ui/src/views/cmdb/acl/users.vue
@@ -207,7 +207,7 @@ export default {
         {
           title: '操作',
           dataIndex: 'action',
-          width: 100,
+          width: 150,
           fixed: 'right',
           scopedSlots: { customRender: 'action' }
         }