From 3793c484ecd19d698ac596f993f9bfb14ee4a727 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 16:44:01 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=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/i18n/langs/cn.js                       |  2 +-
 src/router/index.js                        |  6 +-
 src/views/applications/DatabaseAppList.vue | 64 ++++++++++++++++++++++
 src/views/applications/RemoteAppList.vue   | 56 +++++++++++++++++++
 src/views/assets/CommandFilterList.vue     |  2 +-
 src/views/assets/PlatformList.vue          |  6 +-
 6 files changed, 128 insertions(+), 8 deletions(-)
 create mode 100644 src/views/applications/DatabaseAppList.vue
 create mode 100644 src/views/applications/RemoteAppList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 0ef98da19..75921f479 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -263,7 +263,7 @@ const cn = {
     'remote_app_detail': '远程应用详情',
     'update_remote_app': '更新远程应用',
     'name': '名称',
-    'app_type': '应用类型',
+    'appType': '应用类型',
     'asset': '资产',
     'action': '操作',
     'update': '更新',
diff --git a/src/router/index.js b/src/router/index.js
index 39d9e027d..d6d7f8ed3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -175,14 +175,14 @@ export const constantRoutes = [
     children: [
       {
         path: 'remote-apps',
-        name: 'remoteAppList',
-        component: () => import('@/views/tree/index'),
+        name: 'RemoteAppList',
+        component: () => import('@/views/applications/RemoteAppList'),
         meta: { title: 'RemoteApp' }
       },
       {
         path: 'database-apps',
         name: 'DatabaseAppList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/applications/DatabaseAppList'),
         meta: { title: 'DatabaseApp' }
       }
     ]
diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
new file mode 100644
index 000000000..fa47350ed
--- /dev/null
+++ b/src/views/applications/DatabaseAppList.vue
@@ -0,0 +1,64 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/applications/database-apps/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('applications.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'DatabaseAppDetail'
+          },
+          {
+            prop: 'get_type_display',
+            label: this.$t('applications.appType')
+          },
+          {
+            prop: 'host',
+            label: this.$t('applications.host')
+          },
+          {
+            prop: 'port',
+            label: this.$t('applications.port')
+          },
+          {
+            prop: 'database',
+            label: this.$t('applications.database')
+          },
+          {
+            prop: 'comment',
+            label: this.$t('applications.comment')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'DatabaseAppCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
new file mode 100644
index 000000000..c959291c0
--- /dev/null
+++ b/src/views/applications/RemoteAppList.vue
@@ -0,0 +1,56 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/applications/remote-apps/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('applications.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'RemoteAppDetail'
+          },
+          {
+            prop: 'get_type_display',
+            label: this.$t('applications.appType')
+          },
+          {
+            prop: 'asset_info',
+            label: this.$t('applications.asset')
+          },
+          {
+            prop: 'comment',
+            label: this.$t('applications.comment')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'RemoteAppCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 75abd3b4a..1d8dea975 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -32,7 +32,7 @@ export default {
             label: this.$t('assets.systemUser')
           },
           {
-            prop: '',
+            prop: 'comment',
             label: this.$t('assets.comment')
           }
         ],
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 5baa88a9a..8945b8c6e 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -21,14 +21,14 @@ export default {
             label: this.$t('assets.name'),
             formatter: DetailFormatter,
             sortable: true,
-            route: 'CommandFilterDetail'
+            route: 'PlatformDetail'
           },
           {
             prop: 'base',
             label: this.$t('assets.BasePlatform')
           },
           {
-            prop: '',
+            prop: 'comment',
             label: this.$t('assets.comment')
           }
         ],
@@ -40,7 +40,7 @@ export default {
       headerActions: {
         hasDelete: false,
         hasUpdate: false,
-        createRoute: 'CommandFilterCreate'
+        createRoute: 'PlatformCreate'
       }
     }
   }