From 4db64f287b216b27acd8be09190e6327e55b1e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E5=90=AF=E9=BE=99?= <shiqilong@beyondcent.com>
Date: Mon, 9 Sep 2024 14:28:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9A=90=E8=97=8F=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E9=9B=86=E7=BE=A4=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctstack/page/container/addCluster.vue     | 91 -------------------
 .../ctstack/page/container/cluster.vue        | 10 +-
 .../ctstack/page/container/deleteCluster.vue  |  2 +-
 .../ctstack/page/container/detail.vue         |  6 +-
 .../resource/ctstack/page/container/index.vue |  2 +-
 .../ctstack/page/container/instance/index.vue | 16 ++--
 .../src/views/resource/ctstack/router.js      |  1 -
 7 files changed, 15 insertions(+), 113 deletions(-)
 delete mode 100644 webs/cmp-web/src/views/resource/ctstack/page/container/addCluster.vue

diff --git a/webs/cmp-web/src/views/resource/ctstack/page/container/addCluster.vue b/webs/cmp-web/src/views/resource/ctstack/page/container/addCluster.vue
deleted file mode 100644
index e91b606..0000000
--- a/webs/cmp-web/src/views/resource/ctstack/page/container/addCluster.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div>
-    <el-dialog title="新增集群" width="40%" :close-on-click-modal="false" v-if="addData.dialog" :visible.sync="addData.dialog">
-      <cb-form :model="addData.data" ref="data">
-        <el-row :gutter="10">
-          <el-col :span="24">
-            <cb-form-item label="地域：" prop="region" validate="required" required-message="请选择地域">
-              <el-select v-model="addData.data.region" filterable>
-                <el-option v-for="(item, index) in regions" :key="index" :label="item.regionName" :value="item.alias"></el-option>
-              </el-select>
-            </cb-form-item>
-          </el-col>
-        </el-row>
-      </cb-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="ghost" @click.native="addData.dialog = false">取消</el-button>
-        <el-button type="primary" @click.native="ok">确定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-/* global $ */
-import { modifyInstance, getTKERegions } from 'views/resource/ctstack/services/tke.js'
-export default {
-  props: {
-    addData: {
-      type: Object,
-      default: function () {
-        return {
-          data: {
-            name: '',
-            vendorId: -1
-          },
-          dialog: false
-        }
-      }
-    },
-    vendorId: {
-      type: Number,
-      default: 0
-    },
-    platformObject: {
-      type: Object,
-      default() {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      regions: []
-    }
-  },
-  methods: {
-    getRegionList() {
-      this.regions = []
-      getTKERegions({
-        vendorId: this.vendorId
-      }).then(data => {
-        if (data.success) {
-          this.regions = data.data.regionInstanceSet
-        }
-      })
-    },
-    ok() {
-      this.$refs.data.validate(valid => {
-        if (valid) {
-          const param = {
-            id: this.addData.data.id,
-            newName: this.addData.data.name
-          }
-        }
-      })
-    }
-  },
-  created() {},
-  watch: {
-    'addData.dialog': {
-      handler(newVal, oldVal) {
-        if (newVal) {
-          this.getRegionList()
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  }
-}
-</script>
diff --git a/webs/cmp-web/src/views/resource/ctstack/page/container/cluster.vue b/webs/cmp-web/src/views/resource/ctstack/page/container/cluster.vue
index e176993..c9786bb 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/container/cluster.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/container/cluster.vue
@@ -30,11 +30,11 @@
     <service ref="serviceTable" v-if="serviceVisible" :vendorId="platformObject.vendorId" :clusterInfo="clusterInfo" @close="closeService"></service>
     <modify-cluster :add-data="modifyClusterData" :vendor-id="platformObject.vendorId" v-if="modifyClusterData.dialog"></modify-cluster>
     <delete-cluster :data="deleteClusterData" :vendor-id="platformObject.vendorId" v-if="deleteClusterData.dialog" :clusterInfo="clusterInfo"></delete-cluster>
-    <add-cluster :add-data="addClusterData" :vendor-id="platformObject.vendorId" :platform-object="platformObject" v-if="addClusterData.dialog"></add-cluster>
   </div>
 </template>
 
 <script>
+// 整个 container 都是从 TCE 复制过来, 有不需要的暂时不删除
 import bind from './bind.vue'
 import { getClusterList } from 'views/resource/ctstack/services/tke.js'
 import { removeFloatIp, detailFloatIp } from 'views/resource/ctstack/services/floatips.js'
@@ -42,9 +42,8 @@ import { getRegion } from 'views/resource/ctstack/services/regions.js'
 import service from './service/index.vue'
 import modifyCluster from './modifyCluster.vue'
 import deleteCluster from './deleteCluster.vue'
-import addCluster from './addCluster.vue'
 import webSocket from '@cmp/cmp-common/mixins/getGlobalSocket'
-import detail from './detail'
+import detail from './detail.vue'
 import AssignTenant from 'views/platform/assign/index.vue'
 const Clustercolumns = [
   {
@@ -111,7 +110,6 @@ export default {
     service,
     modifyCluster,
     deleteCluster,
-    addCluster,
     detail,
     AssignTenant
   },
@@ -156,10 +154,6 @@ export default {
         dialog: false,
         data: {}
       },
-      addClusterData: {
-        dialog: false,
-        data: {}
-      },
       deleteClusterData: {
         dialog: false,
         data: {}
diff --git a/webs/cmp-web/src/views/resource/ctstack/page/container/deleteCluster.vue b/webs/cmp-web/src/views/resource/ctstack/page/container/deleteCluster.vue
index f685dcf..143549a 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/container/deleteCluster.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/container/deleteCluster.vue
@@ -9,7 +9,7 @@
           </template>
         </cb-advance-table>
       </div>
-      <div style="padding-top: 20px; padding-ledt: 10px">
+      <div style="padding-top: 20px; padding-left: 10px">
         <el-checkbox disabled checked>销毁按量计费的节点（销毁后不可恢复，请谨慎操作，并提前备份好数据）</el-checkbox>
       </div>
       <div slot="footer" class="dialog-footer">
diff --git a/webs/cmp-web/src/views/resource/ctstack/page/container/detail.vue b/webs/cmp-web/src/views/resource/ctstack/page/container/detail.vue
index adbf3d9..fc218f2 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/container/detail.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/container/detail.vue
@@ -48,13 +48,13 @@
           <el-tab-pane label="节点管理" name="instance">
             <instance :detail="detail"></instance>
           </el-tab-pane>
-          <el-tab-pane label="伸缩组" name="2">
+          <el-tab-pane label="伸缩组" name="2" v-if="false">
             <flexible :clusterInfo="detail" :vendor-id="detail.vendorId"></flexible>
           </el-tab-pane>
-          <el-tab-pane label="地域列表" name="3">
+          <el-tab-pane label="地域列表" name="3" v-if="false">
             <region :detail="detail" :platform-object="platformObject"></region>
           </el-tab-pane>
-          <el-tab-pane label="密钥信息" name="4">
+          <el-tab-pane label="密钥信息" name="4" v-if="false">
             <key :detail="detail"></key>
           </el-tab-pane>
         </el-tabs>
diff --git a/webs/cmp-web/src/views/resource/ctstack/page/container/index.vue b/webs/cmp-web/src/views/resource/ctstack/page/container/index.vue
index fb18aed..15aa7b5 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/container/index.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/container/index.vue
@@ -6,7 +6,7 @@
 
 <script>
 import cluster from './cluster.vue'
-// 从 TCE 复制过来
+// 整个 container 都是从 TCE 复制过来, 有不需要的暂时不删除
 export default {
   props: {
     platformObject: {
diff --git a/webs/cmp-web/src/views/resource/ctstack/page/container/instance/index.vue b/webs/cmp-web/src/views/resource/ctstack/page/container/instance/index.vue
index cbeee39..9ee88f8 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/container/instance/index.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/container/instance/index.vue
@@ -94,15 +94,15 @@ const columns = [
   {
     label: '创建时间',
     prop: 'createTime'
-  },
-  {
-    label: '操作',
-    prop: 'id',
-    width: '200px',
-    disabled: true,
-    showOverflowTooltip: false,
-    scopedSlots: { customRender: 'operate' }
   }
+  // {
+  //   label: '操作',
+  //   prop: 'id',
+  //   width: '200px',
+  //   disabled: true,
+  //   showOverflowTooltip: false,
+  //   scopedSlots: { customRender: 'operate' }
+  // }
 ]
 export default {
   components: {
diff --git a/webs/cmp-web/src/views/resource/ctstack/router.js b/webs/cmp-web/src/views/resource/ctstack/router.js
index e572944..8afee6e 100644
--- a/webs/cmp-web/src/views/resource/ctstack/router.js
+++ b/webs/cmp-web/src/views/resource/ctstack/router.js
@@ -13,7 +13,6 @@ export default {
   ctstackFloatIp: () => import('views/resource/ctstack/page/floatIp/index.vue'),
   ctstackSnapshot: () => import('views/resource/ctstack/page/snapshot/index.vue'),
   ctstackContainer: () => import('views/resource/ctstack/page/container/index.vue'),
-  ctstackClusterAdd: () => import('views/resource/ctstack/page/container/addCluster.vue'),
   ctstackCreateCluster: () => import('views/resource/ctstack/page/container/creatCluster/index.vue'),
   ctstackInstanceAdd: () => import('views/resource/ctstack/page/container/instance/create/index.vue'),
   ctstackAddBareMetal: () => import('views/resource/ctstack/page/bareMetal/addBareMetal.vue'),