切换集群功能

src/App.vue

@@ -6,6 +6,12 @@
 
 <script>
 export default{
-  name: 'App'
+  name: 'App',
+  created() {
+    if (sessionStorage.getItem('cluster')) {
+      console.log(sessionStorage.getItem('cluster'))
+      this.$store.dispatch('changeCluster', sessionStorage.getItem('cluster'))
+    }
+  }
 }
 </script>

src/api/docker.js

@@ -198,10 +198,10 @@ export function modifyIngressHost(data) {
   })
 }
 
-export function initNamespace(data) {
-  return request({
-    url: '/k8s/namespace/init',
-    method: 'post',
-    data
-  })
-}
+// export function initNamespace(data) {
+//   return request({
+//     url: '/k8s/namespace/init',
+//     method: 'post',
+//     data
+//   })
+// }

src/store/getters.js

@@ -15,6 +15,7 @@ const getters = {
   permission_routers: state => state.permission.routers,
   addRouters: state => state.permission.addRouters,
   errorLogs: state => state.errorLog.logs,
-  timer: state => state.timer.switchBool
+  timer: state => state.timer.switchBool,
+  cluster: state => state.cluster.name
 }
 export default getters

src/store/index.js

@@ -6,6 +6,7 @@ import permission from './modules/permission'
 import tagsView from './modules/tagsView'
 import user from './modules/user'
 import timer from './modules/timer'
+import cluster from './modules/cluster'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -17,6 +18,7 @@ const store = new Vuex.Store({
     permission,
     tagsView,
     user,
+    cluster,
     timer
   },
   getters

src/store/modules/cluster.js

+
+const cluster = {
+  state: {
+    name: 'qa'
+  },
+  mutations: {
+    CHANGE_CLUSTER: (state, clusterName) => {
+      state.name = clusterName
+    }
+  },
+  actions: {
+    changeCluster({ commit }, data) {
+      commit('CHANGE_CLUSTER', data)
+    }
+  }
+}
+
+export default cluster

src/utils/request.js

@@ -19,6 +19,9 @@ service.interceptors.request.use(
       // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
       config.headers['x-token'] = getToken()
     }
+    if (store.getters.cluster) {
+      config.headers['cluster'] = store.getters.cluster
+    }
     return config
   },
   error => {

src/views/docker/runingEnvDev.vue

@@ -4,6 +4,10 @@
       <p class="warn-content">
         <svg-icon icon-class="list"/>
         运行环境列表
+        <el-select v-model="cluster" placeholder="请选择集群名称" @change="changeCluster">
+          <el-option label="qa" value="qa"/>
+          <el-option label="dev-ops" value="dev-ops"/>
+        </el-select>
       </p>
       <el-table
         :data="tableData"
@@ -54,7 +58,8 @@ export default {
   data() {
     return {
       name: 'hello',
-      tableData: []
+      tableData: [],
+      cluster: this.$store.getters.cluster
     }
   },
   created() {
@@ -67,6 +72,11 @@ export default {
         query: { namespace: namespace }
       })
     },
+    changeCluster() {
+      this.$store.dispatch('changeCluster', this.cluster)
+      sessionStorage.setItem('cluster', this.cluster)
+      this.fetchK8sList()
+    },
     syncMQ(namespace) {
       this.$router.push({
         path: `/dockers/syncMq/${namespace}`
@@ -79,12 +89,7 @@ export default {
     },
     fetchK8sList() {
       fetchKubernetesList().then(res => {
-        const exculde = ['default', 'kube-system']
-        this.tableData = res.data.namespaces.filter((item) => {
-          if (!exculde.includes(item.name) && item.description === 'dev') {
-            return item
-          }
-        })
+        this.tableData = res.data.namespaces
       })
     },
     indexMethod(index) {

src/views/docker/runingEnvTest.vue

@@ -4,6 +4,10 @@
       <p class="warn-content">
         <svg-icon icon-class="list"/>
         运行环境列表
+        <el-select v-model="cluster" placeholder="请选择集群名称" @change="changeCluster">
+          <el-option label="qa" value="qa"/>
+          <el-option label="dev-ops" value="dev-ops"/>
+        </el-select>
       </p>
       <el-table
         :data="tableData"
@@ -54,7 +58,8 @@ export default {
   data() {
     return {
       name: 'hello',
-      tableData: []
+      tableData: [],
+      cluster: this.$store.getters.cluster
     }
   },
   created() {
@@ -79,17 +84,17 @@ export default {
     },
     fetchK8sList() {
       fetchKubernetesList().then(res => {
-        const exculde = ['default', 'kube-system']
-        this.tableData = res.data.namespaces.filter((item) => {
-          if (!exculde.includes(item.name)) {
-            return item
-          }
-        })
+        this.tableData = res.data.namespaces
       })
     },
     indexMethod(index) {
       return index + 1
     },
+    changeCluster() {
+      this.$store.dispatch('changeCluster', this.cluster)
+      sessionStorage.setItem('cluster', this.cluster)
+      this.fetchK8sList()
+    },
     handleDetail(namespace) {
       this.$router.push({
         path: `/dockers/runingEnv/${namespace}`

src/views/layout/components/Navbar.vue

@@ -3,7 +3,6 @@
     <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
 
     <breadcrumb class="breadcrumb-container"/>
-
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <!-- <search class="right-menu-item" /> -->

src/views/resources/cpuDetails.vue

@@ -41,7 +41,7 @@
           <span >{{ scope.row.cpuMaxUsage }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="百分比" prop="Namespace" align="center">
+      <el-table-column label="Cpu最大利用率" prop="Namespace" align="center">
         <template slot-scope="scope">
           <span >{{ (scope.row.Percentage*100).toFixed(2)+'%' }}</span>
         </template>

src/views/resources/memoryDetails.vue

@@ -41,7 +41,7 @@
           <span >{{ scope.row.memoryMaxUsage }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="百分比" prop="Namespace" align="center">
+      <el-table-column label="Memory最大利用率" prop="Namespace" align="center">
         <template slot-scope="scope">
           <span >{{ (scope.row.Percentage*100).toFixed(2)+'%' }}</span>
         </template>