fix

2021-03-18 11:31:48 +08:00 · 2021-03-18 11:31:48 +08:00 · ffe688079f
parent ee05f1f611
commit ffe688079f
17 changed files with 42 additions and 26 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# kubeX
+# JCCE

 ## 电脑需要安装 node 环境

--- a/package-lock.json
+++ b/package-lock.json
@ -1,5 +1,5 @@
 {
-  "name": "kubex",
+  "name": "jcce",
  "version": "4.4.0",
  "lockfileVersion": 1,
  "requires": true,
--- a/package.json
+++ b/package.json
@ -1,5 +1,5 @@
 {
-  "name": "kubex",
+  "name": "jcce",
  "version": "4.4.0",
  "description": "",
  "author": "",
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/src/api/kubeX/kubeConsole.js
+++ b/src/api/kubeX/kubeConsole.js
@ -1,7 +1,7 @@
 import request from '@/utils/kubeRequest'
 import axios from 'axios'

-// KubeX接口
+// JCCE接口
 export default {
  data() {
    return {
--- a/src/assets/JCCE-logo.png
+++ b/src/assets/JCCE-logo.png
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@ -1,12 +1,16 @@
 <template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
-    <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
-      </el-breadcrumb-item>
-    </transition-group>
-  </el-breadcrumb>
+  <div>
+    <a href="/monitor/overview"><img class="logo" src="@/assets/JCCE-logo.png" alt=""></a>
+    <el-breadcrumb class="app-breadcrumb" separator="/">
+      <transition-group name="breadcrumb">
+        <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+          <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+          <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        </el-breadcrumb-item>
+      </transition-group>
+    </el-breadcrumb>
+  </div>
+
 </template>

 <script>
@ -37,7 +41,7 @@ export default {
      const first = matched[0]

      if (!this.isDashboard(first)) {
-        matched = [{ path: '/', meta: { title: 'KUBEX' }}].concat(matched)
+        matched = [].concat(matched)
      }

      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
@ -68,6 +72,12 @@ export default {
 </script>

 <style lang="scss" scoped>
+.logo{
+  height: 40px;
+  margin-top: 5px;
+  display: block;
+  float: left;
+}
 .app-breadcrumb.el-breadcrumb {
  display: inline-block;
  font-size: 14px;
--- a/src/components/ClusterManagement/clusterMessage.vue
+++ b/src/components/ClusterManagement/clusterMessage.vue
@ -2,7 +2,7 @@
  <el-card class="chartCard" style="height: 150px">
    <el-table style="padding:20px 0" :data="clusterMessage">
      <el-table-column prop="agent" label="服务商" width="140" />
-      <el-table-column prop="version" label="KubeX版本" width="140" />
+      <el-table-column prop="version" label="JCCE版本" width="140" />
      <el-table-column prop="visible" label="集群可见性" width="140" />
    </el-table>
  </el-card>
@ -14,7 +14,7 @@ export default {
  data() {
    return {
      clusterMessage: [
-        { agent: 'KubeX', version: 'v0.1', visible: '部分可见' }
+        { agent: 'JCCE', version: 'v0.1', visible: '部分可见' }
      ]
    }
  }
--- a/src/components/console/overview.vue
+++ b/src/components/console/overview.vue
@ -2,14 +2,14 @@
  <div class="overview">
    <h4>hostHost 集群 </h4>
    <span class="tips">
-      Automatically created by KubeX, we encourage you to use host cluster for clusters management only, deploy workloads to member clusters.</span>
+      Automatically created by JCCE, we encourage you to use host cluster for clusters management only, deploy workloads to member clusters.</span>
    <el-row :gutter="20">
      <el-col :span="12">
        <h5>集群信息</h5>
        <ClusterMessage />
      </el-col>
      <el-col :span="12">
-        <h5>KubeX组件状态</h5>
+        <h5>JCCE组件状态</h5>
        <ComponentStatus />
      </el-col>
      <el-col :span="16">
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@ -1,7 +1,6 @@
 <template>
  <div class="navbar">
    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />

    <div class="right-menu">
@ -30,6 +29,9 @@
          <router-link to="/">
            <el-dropdown-item>概览</el-dropdown-item>
          </router-link>
+          <router-link to="/prometheusMonitor">
+            <el-dropdown-item>数据监控总览</el-dropdown-item>
+          </router-link>
          <el-dropdown-item divided @click.native="logout">
            <span style="display:block;">退出登录</span>
          </el-dropdown-item>
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@ -24,7 +24,7 @@ export default {
  },
  data() {
    return {
-      title: 'kubeX',
+      title: 'JCCE',
      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
    }
  }
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@ -226,9 +226,9 @@ export default {
        margin-right: 15px;
      }
      &.active {
-        background-color: #42b983;
        color: #fff;
-        border-color: #42b983;
+        background-color: #419fff;
+        border-color: #419fff;
        &::before {
          content: '';
          background: #fff;
--- a/src/settings.js
+++ b/src/settings.js
@ -1,5 +1,5 @@
 module.exports = {
-  title: 'KubeX',
+  title: 'JCCE',

  /**
   * @type {boolean} true | false
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@ -205,4 +205,8 @@ span.tips {

 .el-table th {
  background: #F5F7FA;
+}
+
+.el-card{
+  margin: 10px;
 }
--- a/src/utils/get-page-title.js
+++ b/src/utils/get-page-title.js
@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'

-const title = defaultSettings.title || 'kubeX'
+const title = defaultSettings.title || 'JCCE'

 export default function getPageTitle(pageTitle) {
  if (pageTitle) {
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@ -2,14 +2,14 @@
  <div class="app-container">
    <h4>Host 集群 </h4>
    <span class="tips">
-      Automatically created by KubeX, we encourage you to use host cluster for clusters management only, deploy workloads to member clusters.</span>
+      Automatically created by JCCE, we encourage you to use host cluster for clusters management only, deploy workloads to member clusters.</span>
    <el-row :gutter="20">
      <el-col :span="12">
        <h5>集群信息</h5>
        <ClusterMessage />
      </el-col>
      <el-col :span="12">
-        <h5>KubeX组件状态</h5>
+        <h5>JCCE组件状态</h5>
        <ComponentStatus />
      </el-col>
      <el-col :span="16">
--- a/vue.config.js
+++ b/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || 'kubeX' // page title
+const name = defaultSettings.title || 'JCCE' // page title

 // If your port is set to 80,
 // use administrator privileges to execute the command line.