From 2b477234dc09bd9fdbd9789948474a9c474adfd8 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 9 Jul 2020 15:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=91=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/apass-list.vue                 |   1 +
 src/pages/workbench/fwgl/approveWorkspace.vue | 210 +++++++++++++++
 src/pages/workbench/fwgl/fwglList.vue         |  20 +-
 .../fwgl/organizationCloudResource.vue        | 242 ++++++++++++++++++
 src/router/index.js                           |  10 +
 5 files changed, 473 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/workbench/fwgl/approveWorkspace.vue
 create mode 100644 src/pages/workbench/fwgl/organizationCloudResource.vue

diff --git a/src/components/apass-list.vue b/src/components/apass-list.vue
index e5ebbd6..b6d60d0 100644
--- a/src/components/apass-list.vue
+++ b/src/components/apass-list.vue
@@ -243,6 +243,7 @@ export default {
 }
 .header-container .select_container .select_title {
   font-size: 14px;
+  font-weight: 700;
   color: #242c43;
   margin-right: 10px;
 }
diff --git a/src/pages/workbench/fwgl/approveWorkspace.vue b/src/pages/workbench/fwgl/approveWorkspace.vue
new file mode 100644
index 0000000..8bda3f4
--- /dev/null
+++ b/src/pages/workbench/fwgl/approveWorkspace.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="approve_workspace">
+    <apass-list
+      ref="list"
+      search-placeholder="请输入关键字"
+      :other-filter="otherFilter"
+      :list-header="listHeader"
+      :list-data="listData"
+      :list-total="listTotal"
+      @list-action="init"
+    >
+      <el-breadcrumb separator="/" slot="breadcrumb">
+        <el-breadcrumb-item :to="`/fwgl/${level}`">
+          我的服务
+        </el-breadcrumb-item>
+        <el-breadcrumb-item :to="`/fwgl/${level}/${type}`">
+          云资源管理
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          工作区域审批
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+    </apass-list>
+
+    <apass-dialog
+      ref="dialog"
+      :title="dialogInfo.title"
+      :msg="dialogInfo.msg"
+      :submit="dialogInfo.submit"
+    ></apass-dialog>
+  </div>
+</template>
+
+<script>
+import helper from "@/services/helper.js";
+import apassList from "@/components/apass-list";
+import apassDialog from "@/components/apass-dialog";
+
+export default {
+  components: {
+    apassList,
+    apassDialog,
+  },
+  data: () => ({
+    level: 0, // 用户等级
+    type: 0, // 访问的页面
+    otherFilter: [],
+    listHeader: [],
+    listData: [],
+    listTotal: 0,
+    dialogInfo: {
+      title: "",
+      msg: "",
+      submit: null,
+    },
+  }),
+  computed: {},
+  methods: {
+    init(filter) {
+      console.log(filter);
+    },
+    showDialog() {
+      this.$refs.dialog.show();
+    },
+    detailAction(item) {
+      console.log("detailAction");
+    },
+    approveAction(item) {
+      console.log("approveAction");
+    },
+    deleteAction(item) {
+      console.log("deleteAction");
+    },
+  },
+  created() {
+    this.level = parseInt(this.$route.params.level);
+    this.type = parseInt(this.$route.params.type);
+
+    this.otherFilter = [
+      {
+        name: "审批状态",
+        prop: "approve_state",
+        default: "",
+        options: [
+          {
+            name: "全部",
+            value: "",
+          },
+          {
+            name: "待审批",
+            value: 0,
+          },
+          {
+            name: "审批通过",
+            value: 1,
+          },
+          {
+            name: "审批未通过",
+            value: -1,
+          },
+        ],
+      },
+    ];
+    this.listHeader = [
+      {
+        label: "工作区域名称",
+        prop: "name_space",
+        type: "button",
+        callback: this.detailAction,
+      },
+      {
+        label: "CPU（核）",
+        prop: "cpu",
+        align: "center",
+      },
+      {
+        label: "内存（GB）",
+        prop: "memory",
+        align: "center",
+      },
+      {
+        label: "容器组（个）",
+        prop: "containers",
+        align: "center",
+      },
+      {
+        label: "数据盘（块/GB）",
+        type: "tooltip",
+        align: "center",
+        getLength(item) {
+          let disks = (item.disk && item.disk.trim().split(" ")) || [];
+          return disks.length;
+        },
+        getText(item) {
+          let disks = (item.disk && item.disk.trim().split(" ")) || [];
+          return disks[0];
+        },
+        getContent(item) {
+          let disks = (item.disk && item.disk.trim().split(" ")) || [];
+          let htmlStr = `<span>数据盘（块/GB）</span><br />`;
+
+          disks.forEach((v) => {
+            htmlStr += `<span>数据盘：${v}</span><br />`;
+          });
+
+          return htmlStr;
+        },
+      },
+      {
+        label: "申请用户",
+        prop: "user_name",
+        align: "center",
+      },
+      {
+        label: "业务系统名",
+        prop: "system_name",
+        align: "center",
+      },
+      {
+        label: "申请类型",
+        prop: "type",
+        align: "center",
+      },
+      {
+        label: "所属组织",
+        prop: "org_name",
+      },
+      {
+        label: "用户申请时间",
+        prop: "apply_time",
+        align: "center",
+      },
+      {
+        label: "审批状态",
+        align: "center",
+        getText(item) {
+          return ["未通过", "待审批", "通过"][(item.approve_state || 0) + 1];
+        },
+      },
+      {
+        label: "操作",
+        type: "buttons",
+        align: "center",
+        width: 160,
+        actionList: [
+          {
+            label: "审批",
+            callback: this.approveAction,
+            disabledRule(item) {
+              return item.approve_state != 0;
+            },
+          },
+          {
+            label: "删除",
+            class: "warn",
+            callback: this.deleteAction,
+          },
+        ],
+      },
+    ];
+    this.listData = [{}, {}, {}];
+  },
+};
+</script>
+
+<style scoped>
+.approve_workspace {
+  height: 100%;
+}
+</style>
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 8452a80..dea5321 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -72,7 +72,7 @@
               </div>
             </div>
           </div>
-          <div class="admin_preview-right apass_buttons">
+          <div class="admin_preview-right apass_button">
             <el-button type="primary" size="mini" @click="approveWorkspace">
               工作区域审批（1）
             </el-button>
@@ -96,7 +96,7 @@
         <organization-list
           slot="list"
           :data="listData"
-          details-url="/authority/organization/detail/"
+          :details-url="`/fwgl/${level}/${type}/organizationCloudResource/`"
           :hide-delete="true"
         ></organization-list>
       </template>
@@ -491,7 +491,7 @@ export default {
             getImage(item) {
               return item.state == 0
                 ? require("@/assets/imgs/ic_true.png")
-                : require("@/assets/imgs/ic_guoqi.png");
+                : require("@/assets/imgs/ic_failed.png");
             },
           },
           {
@@ -830,7 +830,7 @@ export default {
             getImage(item) {
               return item.state == 0
                 ? require("@/assets/imgs/ic_true.png")
-                : require("@/assets/imgs/ic_guoqi.png");
+                : require("@/assets/imgs/ic_failed.png");
             },
           },
           {
@@ -1995,11 +1995,11 @@ export default {
       }
     },
     approveWorkspace() {
-      if (this.cloud_admin_warn) {
+      /* if (this.cloud_admin_warn) {
         console.log("告警 ---");
-      } else {
-        console.log("审批 ---");
-      }
+      } else { */
+      this.$router.push(`/fwgl/${this.level}/${this.type}/approveWorkspace`);
+      // }
     },
   },
   created() {
@@ -2115,10 +2115,10 @@ export default {
   margin-top: 15px;
   box-sizing: border-box;
 }
-.apass_buttons {
+.apass_button {
   position: relative;
 }
-.apass_buttons > .el-button {
+.apass_button > .el-button {
   position: absolute;
   top: 0;
   right: 0;
diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue
new file mode 100644
index 0000000..b388043
--- /dev/null
+++ b/src/pages/workbench/fwgl/organizationCloudResource.vue
@@ -0,0 +1,242 @@
+<template>
+  <div class="organization_cloud_resource">
+    <apass-list
+      ref="list"
+      search-placeholder="请输入关键字"
+      :other-filter="otherFilter"
+      :list-header="listHeader"
+      :list-data="listData"
+      :list-total="listTotal"
+      @list-action="init"
+      :list-padding-left="0"
+    >
+      <el-breadcrumb separator="/" slot="breadcrumb">
+        <el-breadcrumb-item :to="`/fwgl/${level}`">
+          我的服务
+        </el-breadcrumb-item>
+        <el-breadcrumb-item :to="`/fwgl/${level}/${type}`">
+          云资源管理
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          组织云资源详情
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+    </apass-list>
+
+    <apass-dialog
+      ref="dialog"
+      :title="dialogInfo.title"
+      :msg="dialogInfo.msg"
+      :submit="dialogInfo.submit"
+    ></apass-dialog>
+  </div>
+</template>
+
+<script>
+import helper from "@/services/helper.js";
+import apassList from "@/components/apass-list";
+import apassDialog from "@/components/apass-dialog";
+
+export default {
+  components: {
+    apassList,
+    apassDialog,
+  },
+  data: () => ({
+    level: 0, // 用户等级
+    type: 0, // 访问的页面
+    otherFilter: [],
+    listHeader: [],
+    listData: [],
+    listTotal: 0,
+    dialogInfo: {
+      title: "",
+      msg: "",
+      submit: null,
+    },
+  }),
+  computed: {},
+  methods: {
+    init(filter) {
+      console.log(filter);
+    },
+    showDialog() {
+      this.$refs.dialog.show();
+    },
+    detailAction(item) {
+      console.log("detailAction");
+    },
+    approveAction(item) {
+      console.log("approveAction");
+    },
+    deleteAction(item) {
+      console.log("deleteAction");
+    },
+  },
+  created() {
+    this.level = parseInt(this.$route.params.level);
+    this.type = parseInt(this.$route.params.type);
+
+    this.otherFilter = [
+      {
+        name: "组织名称",
+        prop: "organization",
+        default: this.$route.params.id,
+        options: [
+          {
+            value: "1",
+            name: "不许删",
+          },
+          {
+            value: "39",
+            name: "应用测试一轮shf",
+          },
+          {
+            value: "38",
+            name: "我的组织",
+          },
+          {
+            value: "37",
+            name: "1234567890",
+          },
+          {
+            value: "36",
+            name: "测试bug",
+          },
+          {
+            value: "35",
+            name: "3213123",
+          },
+          {
+            value: "33",
+            name: "B.G.R.A123",
+          },
+          {
+            value: "32",
+            name: "Bgtest23.号",
+          },
+          {
+            value: "31",
+            name: "6",
+          },
+          {
+            value: "30",
+            name: "R.A.M.H.S.U",
+          },
+        ],
+      },
+    ];
+    this.listHeader = [
+      {
+        label: "运行状态",
+        align: "center",
+        type: "image",
+        getImage(item) {
+          return item.state == 0
+            ? require("@/assets/imgs/ic_true.png")
+            : require("@/assets/imgs/ic_failed.png");
+        },
+      },
+      {
+        label: "工作区域名称",
+        prop: "name_space",
+        type: "button",
+        callback: this.detailAction,
+      },
+      {
+        label: "CPU（核）",
+        prop: "cpu",
+        align: "center",
+      },
+      {
+        label: "内存（GB）",
+        prop: "memory",
+        align: "center",
+      },
+      {
+        label: "容器组（个）",
+        prop: "containers",
+        align: "center",
+      },
+      {
+        label: "数据盘（块/GB）",
+        type: "tooltip",
+        align: "center",
+        getLength(item) {
+          let disks = (item.disk && item.disk.trim().split(" ")) || [];
+          return disks.length;
+        },
+        getText(item) {
+          let disks = (item.disk && item.disk.trim().split(" ")) || [];
+          return disks[0];
+        },
+        getContent(item) {
+          let disks = (item.disk && item.disk.trim().split(" ")) || [];
+          let htmlStr = `<span>数据盘（块/GB）</span><br />`;
+
+          disks.forEach((v) => {
+            htmlStr += `<span>数据盘：${v}</span><br />`;
+          });
+
+          return htmlStr;
+        },
+      },
+      {
+        label: "申请用户",
+        prop: "user_name",
+        align: "center",
+      },
+      {
+        label: "业务系统名",
+        prop: "system_name",
+        align: "center",
+      },
+      {
+        label: "初次申请状态",
+        align: "center",
+        getText(item) {
+          return ["未通过", "待审批", "通过"][(item.approve_state || 0) + 1];
+        },
+      },
+      {
+        label: "资源调整结果",
+        align: "center",
+        getText(item) {
+          return ["未通过", "待审批", "通过"][
+            (item.approve_update_state || 0) + 1
+          ];
+        },
+      },
+      {
+        label: "用户申请时间",
+        prop: "apply_time",
+        align: "center",
+      },
+      {
+        label: "操作",
+        type: "buttons",
+        align: "center",
+        width: 80,
+        actionList: [
+          {
+            getLabel(item) {
+              return item.use_uid ? "已分配" : "分配";
+            },
+            callback: this.cloudAllot,
+            disabledRule(item) {
+              return item.use_uid;
+            },
+          },
+        ],
+      },
+    ];
+    this.listData = [{}, {}, {}];
+  },
+};
+</script>
+
+<style scoped>
+.organization_cloud_resource {
+  height: 100%;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index d042cb5..6f5b46c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,6 +73,16 @@ export default new Router({
               name: "servicedetail",
               component: () => import("@/pages/workbench/fwgl/cloud-detail"),
             }, // 云资源 - 详情
+            {
+              path: "/fwgl/:level/:type/approveWorkspace",
+              name: "servicedetail",
+              component: () => import("@/pages/workbench/fwgl/approveWorkspace"),
+            }, // 云资源 - 工作区域审批
+            {
+              path: "/fwgl/:level/:type/organizationCloudResource/:id",
+              name: "servicedetail",
+              component: () => import("@/pages/workbench/fwgl/organizationCloudResource"),
+            }, // 云资源 - 组织云资源详情
           ],
         }, // 工作台 - 服务管理模块
         {
-- 
2.26.0