From fc29fc6c6de512db248db49f15770c07ae3e62ca Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Fri, 9 Oct 2020 10:00:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=87=B3Header=E6=A0=8F=20(#417)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 工单入口移动至Header栏

* feat: 工单入口移动至Header栏

Co-authored-by: Orange <orangemtony@gmail.com>
---
 src/i18n/langs/cn.json                      |  1 +
 src/i18n/langs/en.json                      |  1 +
 src/layout/components/NavHeader/Tickets.vue | 43 +++++++++++++++++++++
 src/layout/components/NavHeader/index.vue   |  7 +++-
 src/router/index.js                         |  9 +++--
 src/router/tickets.js                       |  3 +-
 6 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 src/layout/components/NavHeader/Tickets.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 7e6d9cb24..563f2cf5b 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -426,6 +426,7 @@
   },
   "route": {
     "": "",
+    "Ticket":"工单",
     "AdminUserCreate": "创建管理用户",
     "AdminUserDetail": "管理用户详情",
     "AdminUserList": "管理用户",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index b541945d1..3b2ea8f1b 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -425,6 +425,7 @@
   },
   "route": {
     "": "",
+    "Ticket": "Tickets",
     "AdminUserCreate": "Admin user create",
     "AdminUserDetail": "Admin user detail",
     "AdminUserList": "Admin users",
diff --git a/src/layout/components/NavHeader/Tickets.vue b/src/layout/components/NavHeader/Tickets.vue
new file mode 100644
index 000000000..4c9d23888
--- /dev/null
+++ b/src/layout/components/NavHeader/Tickets.vue
@@ -0,0 +1,43 @@
+<template>
+  <div>
+    <el-link class="el-link" target="_blank" @click="goToTickets">{{ $t('route.Ticket') }}</el-link>
+    <el-badge v-if="getBadgeValue() !== 0" :value="getBadgeValue()" size="mini" type="primary" />
+  </div>
+</template>
+
+<script>
+import { getTicketOpenCount } from '@/api/ticket'
+
+export default {
+  name: 'WebTerminal',
+  data: function() {
+    return {
+      assignedTicketCount: 0
+    }
+  },
+  created() {
+    this.getTicketsOpenCount()
+  },
+  methods: {
+    getBadgeValue() {
+      return this.assignedTicketCount
+    },
+    getTicketsOpenCount() {
+      getTicketOpenCount(1).then(data => {
+        this.assignedTicketCount = data.count
+      })
+    },
+    goToTickets() {
+      this.$router.push({ name: 'TicketList' })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.el-link {
+  color: #606266 !important;
+  font-size: 13px;
+  font-weight: 400
+}
+</style>
diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index 27da4ebf8..2ff6b1a68 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -10,6 +10,9 @@
       <div class="header-item">
         <Language />
       </div>
+      <div v-if="publicSettings.TICKETS_ENABLED&&publicSettings.XPACK_LICENSE_IS_VALID" class="header-item">
+        <Tickets />
+      </div>
       <div class="header-item">
         <WebTerminal />
       </div>
@@ -27,6 +30,7 @@ import AccountDropdown from './AccountDropdown'
 import Help from './Help'
 import Language from './Language'
 import WebTerminal from './WebTerminal'
+import Tickets from './Tickets'
 
 export default {
   components: {
@@ -35,6 +39,7 @@ export default {
     AccountDropdown,
     Language,
     Help,
+    Tickets,
     WebTerminal
   },
   data() {
@@ -43,7 +48,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'sidebar'
+      'sidebar', 'publicSettings'
     ])
   },
   methods: {
diff --git a/src/router/index.js b/src/router/index.js
index 9874e841c..694ccbe94 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -140,11 +140,12 @@ export const allRoleRoutes = [
     component: Layout,
     redirect: '/tickets/tickets/',
     children: TicketsRoutes,
+    hidden: true,
     meta: {
-      licenseRequired: true,
-      hidden: ({ settings }) => {
-        return !settings.TICKETS_ENABLED
-      }
+      licenseRequired: true
+      // hidden: ({ settings }) => {
+      //   return !settings.TICKETS_ENABLED
+      // }
     }
   },
   {
diff --git a/src/router/tickets.js b/src/router/tickets.js
index e89a6be48..f253d1789 100644
--- a/src/router/tickets.js
+++ b/src/router/tickets.js
@@ -4,7 +4,8 @@ export default [
     path: 'tickets',
     name: 'TicketList',
     component: () => import('@/views/tickets/TicketList'),
-    meta: { title: i18n.t('route.Tickets'), icon: 'check-square-o', activeMenu: '/tickets/tickets' }
+    meta: { title: i18n.t('route.Tickets'), icon: 'check-square-o', activeMenu: '/tickets/tickets' },
+    hidden: true
   },
   {
     path: 'tickets/:id',