From 5f8a0126d511aa02851f4c7b7d968021896a4337 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 19 May 2021 10:30:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B7=AF=E7=94=B1=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Breadcrumb/index.vue   | 2 +-
 frontend/src/views/system/datasource/form.vue  | 4 ++--
 frontend/src/views/system/datasource/index.vue | 4 ++--
 frontend/src/views/system/dept/form.vue        | 4 ++--
 frontend/src/views/system/dept/index.vue       | 6 +++---
 frontend/src/views/system/menu/form.vue        | 4 ++--
 frontend/src/views/system/menu/index.vue       | 4 ++--
 frontend/src/views/system/role/form.vue        | 6 +++---
 frontend/src/views/system/role/index.vue       | 8 ++++----
 frontend/src/views/system/user/form.vue        | 4 ++--
 frontend/src/views/system/user/index.vue       | 4 ++--
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/Breadcrumb/index.vue b/frontend/src/components/Breadcrumb/index.vue
index f0a2ae2a50..6e0a823584 100644
--- a/frontend/src/components/Breadcrumb/index.vue
+++ b/frontend/src/components/Breadcrumb/index.vue
@@ -45,7 +45,7 @@ export default {
         return false
       }
       //   return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
-      return name.trim().toLocaleLowerCase() === '仪表板'.toLocaleLowerCase()
+      return name.trim().toLocaleLowerCase() === 'panel'.toLocaleLowerCase()
     },
     pathCompile(path) {
       // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index efb5a7ed06..f93a191f1d 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <layout-content :header="formType=='add' ? $t('datasource.create') : $t('datasource.modify')" back-name="数据源">
+  <layout-content :header="formType=='add' ? $t('datasource.create') : $t('datasource.modify')" back-name="datasource">
     <el-form ref="dsForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item :label="$t('commons.name')" prop="name">
         <el-input v-model="form.name" autocomplete="off" />
@@ -127,7 +127,7 @@ export default {
       }
     },
     backToList() {
-      this.$router.push({ name: '数据源' })
+      this.$router.push({ name: 'datasource' })
     }
   }
 }
diff --git a/frontend/src/views/system/datasource/index.vue b/frontend/src/views/system/datasource/index.vue
index 89bcc54bc8..2bd0a9d332 100644
--- a/frontend/src/views/system/datasource/index.vue
+++ b/frontend/src/views/system/datasource/index.vue
@@ -165,7 +165,7 @@ export default {
     //   this.dialogVisible = true
     // },
     create() {
-      this.$router.push({ name: '数据源表单' })
+      this.$router.push({ name: 'datasource-form' })
     },
 
     // edit(row) {
@@ -175,7 +175,7 @@ export default {
     //   this.form.configuration = JSON.parse(this.form.configuration)
     // },
     edit(row) {
-      this.$router.push({ name: '数据源表单', params: row })
+      this.$router.push({ name: 'datasource-form', params: row })
     },
 
     _handleDelete(datasource) {
diff --git a/frontend/src/views/system/dept/form.vue b/frontend/src/views/system/dept/form.vue
index 5054384284..04948a5c4a 100644
--- a/frontend/src/views/system/dept/form.vue
+++ b/frontend/src/views/system/dept/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <layout-content :header="formType=='add' ? $t('organization.create') : $t('organization.modify')" back-name="组织管理">
+  <layout-content :header="formType=='add' ? $t('organization.create') : $t('organization.modify')" back-name="system-dept">
     <el-form ref="deptForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item :label="$t('organization.name')" prop="name">
         <el-input v-model="form.name" />
@@ -157,7 +157,7 @@ export default {
       })
     },
     backToList() {
-      this.$router.push({ name: '组织管理' })
+      this.$router.push({ name: 'system-dept' })
     }
   }
 }
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
index 475f8c770c..81991a62bf 100644
--- a/frontend/src/views/system/dept/index.vue
+++ b/frontend/src/views/system/dept/index.vue
@@ -7,7 +7,7 @@
     >
       <template #toolbar>
         <el-button v-permission="['dept:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('organization.create') }}</el-button>
-     </template>
+      </template>
       <el-table
         ref="table"
         :data="tableData"
@@ -184,10 +184,10 @@ export default {
     //   this.treeByRow(row)
     // },
     create() {
-      this.$router.push({ name: '组织表单' })
+      this.$router.push({ name: 'system-dept-form' })
     },
     edit(row) {
-      this.$router.push({ name: '组织表单', params: row })
+      this.$router.push({ name: 'system-dept-form', params: row })
     },
 
     treeByRow(row) {
diff --git a/frontend/src/views/system/menu/form.vue b/frontend/src/views/system/menu/form.vue
index 47b9fd5cd4..f894ea482c 100644
--- a/frontend/src/views/system/menu/form.vue
+++ b/frontend/src/views/system/menu/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <layout-content :header="formType=='add' ? $t('menu.create') : $t('menu.modify')" back-name="菜单管理">
+  <layout-content :header="formType=='add' ? $t('menu.create') : $t('menu.modify')" back-name="system-menu">
     <el-form ref="menuForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item label="菜单类型" prop="type">
         <el-radio-group v-model="form.type" size="mini" :disabled="formType!=='add'">
@@ -167,7 +167,7 @@ export default {
       })
     },
     backToList() {
-      this.$router.push({ name: '菜单管理' })
+      this.$router.push({ name: 'system-menu' })
     }
   }
 }
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index 58dcc70cd7..3a3b1e24e6 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -201,7 +201,7 @@ export default {
     //   this.formType = 'add'
     // },
     create() {
-      this.$router.push({ name: '菜单表单' })
+      this.$router.push({ name: 'system-menu-form' })
     },
     search(condition) {
       console.log(condition)
@@ -215,7 +215,7 @@ export default {
     //   this.treeByRow(row)
     // },
     edit(row) {
-      this.$router.push({ name: '菜单表单', params: row })
+      this.$router.push({ name: 'system-menu-form', params: row })
     },
 
     treeByRow(row) {
diff --git a/frontend/src/views/system/role/form.vue b/frontend/src/views/system/role/form.vue
index d737460029..fd7619736d 100644
--- a/frontend/src/views/system/role/form.vue
+++ b/frontend/src/views/system/role/form.vue
@@ -1,10 +1,10 @@
 <template>
-  <layout-content :header="formType=='add' ? $t('role.add') : $t('role.modify')" back-name="角色管理">
+  <layout-content :header="formType=='add' ? $t('role.add') : $t('role.modify')" back-name="system-role">
     <el-form ref="roleForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item :label="$t('commons.name')" prop="name">
         <el-input v-model="form.name" />
       </el-form-item>
-      <el-form-item :label="$t('commons.description')"  prop="description">
+      <el-form-item :label="$t('commons.description')" prop="description">
         <el-input v-model="form.description" type="textarea" />
       </el-form-item>
       <el-form-item>
@@ -97,7 +97,7 @@ export default {
       }
     },
     backToList() {
-      this.$router.push({ name: '角色管理' })
+      this.$router.push({ name: 'system-role' })
     }
   }
 }
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index 10f1452efd..13ee76ffe6 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -148,7 +148,7 @@ export default {
       console.log(tab, event)
     },
     create() {
-      this.$router.push({ name: '角色表单' })
+      this.$router.push({ name: 'system-role-form' })
     },
     search(condition) {
       const temp = formatCondition(condition)
@@ -160,7 +160,7 @@ export default {
       })
     },
     edit(row) {
-      this.$router.push({ name: '角色表单', params: row })
+      this.$router.push({ name: 'system-role-form', params: row })
     },
 
     saveRole(roleForm) {
@@ -250,9 +250,9 @@ export default {
       this.$refs.menu.setCheckedKeys(this.menuIds)
     },
     handleDelete(row) {
-      this.$confirm( this.$t('commons.confirm_delete') + ": " + row.name + '？', this.$t('role.tips'), {
+      this.$confirm(this.$t('commons.confirm_delete') + ': ' + row.name + '？', this.$t('role.tips'), {
         confirmButtonText: this.$t('commons.confirm'),
-        cancelButtonText:  this.$t('commons.cancel'),
+        cancelButtonText: this.$t('commons.cancel'),
         type: 'warning'
       }).then(() => {
         delRole(row.roleId).then(res => {
diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue
index 7d67c8e519..878d37f99b 100644
--- a/frontend/src/views/system/user/form.vue
+++ b/frontend/src/views/system/user/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <layout-content :header="formType=='add' ? $t('user.create') : $t('user.modify')" back-name="用户管理">
+  <layout-content :header="formType=='add' ? $t('user.create') : $t('user.modify')" back-name="system-user">
     <el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item :label="$t('commons.name')" prop="username">
         <el-input v-model="form.username" />
@@ -258,7 +258,7 @@ export default {
       })
     },
     backToList() {
-      this.$router.push({ name: '用户管理' })
+      this.$router.push({ name: 'system-user' })
     },
     filterData(instanceId) {
       const results = this.depts.map(node => {
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index c155dbe4cf..bd7e687540 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -299,7 +299,7 @@ export default {
       })
     },
     create() {
-      this.$router.push({ name: '用户表单' })
+      this.$router.push({ name: 'system-user-form' })
     },
     // create() {
     //   this.depts = null
@@ -308,7 +308,7 @@ export default {
     //   this.dialogVisible = true
     // },
     edit(row) {
-      this.$router.push({ name: '用户表单', params: row })
+      this.$router.push({ name: 'system-user-form', params: row })
     },
     // edit(row) {
     //   this.depts = null