From 5db2301b5df4332c76be6355d3de79801f005fcf Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Sun, 22 Mar 2020 11:15:33 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/asset.js                     |  10 ++
 src/i18n/langs/cn.js                 |  16 ++--
 src/router/index.js                  |  32 ++++---
 src/views/assets/AdminUserDetail.vue |  13 +++
 src/views/assets/AdminUserList.vue   | 132 +++++++++++++++++++++++++++
 src/views/assets/AssetList.vue       |  13 +++
 src/views/users/UserList.vue         |   4 +-
 7 files changed, 198 insertions(+), 22 deletions(-)
 create mode 100644 src/api/asset.js
 create mode 100644 src/views/assets/AdminUserDetail.vue
 create mode 100644 src/views/assets/AdminUserList.vue
 create mode 100644 src/views/assets/AssetList.vue

diff --git a/src/api/asset.js b/src/api/asset.js
new file mode 100644
index 000000000..fbc529507
--- /dev/null
+++ b/src/api/asset.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+export function getAdminUserList(data) {
+  return request({
+    url: '/api/v1/assets/admin-users/',
+    method: 'get',
+    params: data
+  })
+}
+
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 6c6b801ce..b77210eaa 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -15,10 +15,10 @@ const cn = {
     'Users': '用户管理',
     'UserList': '用户列表',
     'UserGroupList': '用户组',
-    'assets': '资产管理',
-    'assetList': '资产列表',
-    'domainList': '网关列表',
-    'adminUserList': '管理用户',
+    'Assets': '资产管理',
+    'AssetList': '资产列表',
+    'DomainList': '网关列表',
+    'AdminUserList': '管理用户',
     'systemUserList': '系统用户',
     'labelList': '标签管理',
     'commandFilterList': '命令过滤',
@@ -163,10 +163,10 @@ const cn = {
     'gateway': '网关',
     'date_created': '创建日期',
     // 管理用户
-    'admin_user_list': '管理用户列表',
-    'admin_user_detail': '管理用户详情',
-    'create_admin_user': '创建管理用户',
-    'update_admin_user': '更新管理用户',
+    'AdminUserList': '管理用户列表',
+    'AdminUserDetail': '管理用户详情',
+    'AdminUserCreate': '创建管理用户',
+    'AdminUserUpdate': '更新管理用户',
     'username': '用户名',
     'replace_node_assets_admin_user_with_this': '替换资产的管理员',
     'select_nodes': '选择节点',
diff --git a/src/router/index.js b/src/router/index.js
index 4aa18d14a..a84fbed39 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -52,7 +52,7 @@ export const constantRoutes = [
   {
     path: '/users',
     component: Layout,
-    redirect: '/users/list',
+    redirect: '/user/list',
     name: 'Users',
     meta: {
       title: 'Users',
@@ -102,28 +102,36 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/static/',
+    path: '/assets',
     component: Layout,
+    redirect: '/asset/list',
     name: 'assets',
-    meta: { title: 'assets', icon: 'user' },
+    meta: { title: 'Assets', icon: 'user' },
     children: [
       {
-        path: 'assets',
-        name: 'assetList',
-        component: () => import('@/views/table/index'),
-        meta: { title: 'assetList' }
+        path: 'asset/list',
+        name: 'AssetList',
+        component: () => import('@/views/assets/AssetList.vue'),
+        meta: { title: 'AssetList' }
       },
       {
         path: 'domains',
         name: 'domainList',
         component: () => import('@/views/tree/index'),
-        meta: { title: 'domainList' }
+        meta: { title: 'DomainList' }
       },
       {
-        path: 'admin-users',
-        name: 'adminUserList',
-        component: () => import('@/views/table/index'),
-        meta: { title: 'adminUserList' }
+        path: 'admin-user',
+        name: 'AdminUserList',
+        component: () => import('@/views/assets/AdminUserList'),
+        meta: { title: 'AdminUserList' }
+      },
+      {
+        path: 'admin-user/detail/:id',
+        component: () => import('@/views/assets/AdminUserDetail.vue'), // Parent router-view
+        name: 'AdminUserDetail',
+        meta: { title: 'AdminUserDetail' },
+        hidden: true
       },
       {
         path: 'system-users',
diff --git a/src/views/assets/AdminUserDetail.vue b/src/views/assets/AdminUserDetail.vue
new file mode 100644
index 000000000..25abbf6ab
--- /dev/null
+++ b/src/views/assets/AdminUserDetail.vue
@@ -0,0 +1,13 @@
+<template>
+  <h1>管理用户详情组件</h1>
+</template>
+
+<script>
+export default {
+  name: 'AdminUserDetail'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
new file mode 100644
index 000000000..229a5a2b2
--- /dev/null
+++ b/src/views/assets/AdminUserList.vue
@@ -0,0 +1,132 @@
+<template>
+  <BackPlayground :title="$t('route.AdminUserList')">
+    <ListTables
+      :tablebotton="$t('assets.AdminUserCreate')"
+      tableroute="UserEdit"
+      @SizeChange="handleSizeChange"
+      @CurrentChange="handleCurrentChange"
+    >
+      <el-table
+        v-loading="listLoading"
+        :data="tableData"
+        stripe
+        border
+        class="userTable"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+          header-align="center"
+        />
+        <el-table-column
+          :label="this.$t('assets.name')"
+          sortable
+          align="center"
+          header-align="center"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" style="font-size:14px" @click="handleDetail(scope.$index, scope.row)">{{ scope.row.name }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="this.$t('assets.username')"
+          sortable
+          align="center"
+          header-align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.username }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="this.$t('assets.asset')"
+          align="center"
+          header-align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.assets_amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="this.$t('assets.comment')"
+          align="center"
+          header-align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.comment }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="this.$t('assets.action')"
+          align="center"
+          header-align="center"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              @click="handleEdit(scope.$index, scope.row)"
+            >{{ $t('assets.update') }}</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)"
+            >{{ $t('assets.delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </ListTables>
+  </BackPlayground>
+</template>
+
+<script>
+import { ListTables, BackPlayground } from '@/layout/components'
+import { getAdminUserList } from '@/api/asset'
+import Tables from '@/layout/mixin/ListTables'
+export default {
+  components: {
+    BackPlayground,
+    ListTables
+  },
+  mixins: [Tables],
+  data() {
+    return {
+      tableData: [],
+      listLoading: true
+    }
+  },
+  created() {
+    this.getAdminUser(this.current_page, this.page_size, this.offset)
+  },
+  methods: {
+    handleDetail: function(index, row) {
+      this.$router.push({ name: 'AdminUserDetail', params: { id: row.id }})
+    },
+    handleSizeChange(val) {
+      // 当每页数量改变触发
+      this.offset = (this.current_page - 1) * val
+      this.page_size = val
+      this.getAdminUserList(this.current_page, val, this.offset)
+    },
+    handleCurrentChange(val) {
+      // 当页码改变触发
+      this.offset = (val - 1) * this.page_size
+      this.current_page = val
+      this.getAdminUserList(val, this.page_size, this.offset)
+    },
+    getAdminUser(draw, limit, offset) {
+      this.listLoading = true
+      getAdminUserList({ draw, limit, offset }).then(response => {
+        this.tableData = response.results
+        this.total = response.count
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
new file mode 100644
index 000000000..980a522a4
--- /dev/null
+++ b/src/views/assets/AssetList.vue
@@ -0,0 +1,13 @@
+<template>
+  <h1>这是组件AssetList</h1>
+</template>
+
+<script>
+export default {
+  name: 'AssetList'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/users/UserList.vue b/src/views/users/UserList.vue
index a7072342f..380b94114 100644
--- a/src/views/users/UserList.vue
+++ b/src/views/users/UserList.vue
@@ -1,7 +1,7 @@
 <template>
-  <BackPlayground :title="$t('route.userList')">
+  <BackPlayground :title="$t('route.UserList')">
     <ListTables
-      :tablebotton="$t('users.createuser')"
+      :tablebotton="$t('assets.createuser')"
       tableroute="UserEdit"
       @SizeChange="handleSizeChange"
       @CurrentChange="handleCurrentChange"