From a574f9efbde6613840939e9089085c2a4e29ab67 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Tue, 7 Jul 2020 15:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86-=E8=B6=85?=
 =?UTF-8?q?=E7=AE=A1=E4=BA=91=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=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         |  4 +-
 src/pages/workbench/fwgl/fwglList.vue | 63 +++++++++++++++++----------
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/components/apass-list.vue b/src/components/apass-list.vue
index 0f5fd94..e5ebbd6 100644
--- a/src/components/apass-list.vue
+++ b/src/components/apass-list.vue
@@ -143,10 +143,10 @@ export default {
     showListFilter: false,
     filter: {},
     searchValue: "",
-    pageSize: 15,
+    pageSize: 10,
     currentPage: 1,
     timer: null,
-    pageSizes: [15, 50, 100],
+    pageSizes: [10, 20, 50],
     selectFilter: [],
   }),
   methods: {
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 8a4e1d1..fda2c73 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -17,7 +17,7 @@
       </el-breadcrumb>
 
       <template slot="top">
-        <div class="cloud_info" v-if="cloud_zuzhi">
+        <div class="zuzhi_preview" v-if="cloud_zuzhi">
           <div class="cloud_title">
             <span>{{ userInfo && userInfo.department_name }}</span>
             <span>
@@ -46,30 +46,33 @@
           </div>
         </div>
 
-        <div class="cloud_info" v-if="cloud_admin">
-          <div class="cloud_title">
-            <span>云资源概览</span>
-          </div>
-          <div class="dashboard_contaner">
-            <div
-              class="dashborad_list"
-              v-for="(item, index) in cloud_admin.dashboard_list"
-              :key="index"
-            >
-              <chart
-                :options="getDashboardOptions(item)"
-                class="dashboard_chart"
-              />
-              <p class="dashboard_info">
-                <span>物理总量</span>
-                <span v-text="item.total + item.unit"></span>
-              </p>
-              <p class="dashboard_info">
-                <span>剩余量</span>
-                <span v-text="item.value + item.unit"></span>
-              </p>
+        <div class="admin_preview" v-if="cloud_admin">
+          <div class="admin_preview-left">
+            <div class="cloud_title">
+              <span>云资源概览</span>
+            </div>
+            <div class="dashboard_contaner">
+              <div
+                class="dashborad_list"
+                v-for="(item, index) in cloud_admin.dashboard_list"
+                :key="index"
+              >
+                <chart
+                  :options="getDashboardOptions(item)"
+                  class="dashboard_chart"
+                />
+                <p class="dashboard_info">
+                  <span>物理总量</span>
+                  <span v-text="item.total + item.unit"></span>
+                </p>
+                <p class="dashboard_info">
+                  <span>剩余量</span>
+                  <span v-text="item.value + item.unit"></span>
+                </p>
+              </div>
             </div>
           </div>
+          <div class="admin_preview-right"></div>
         </div>
       </template>
 
@@ -1734,4 +1737,18 @@ export default {
 .dashboard_info > span:nth-of-type(2) {
   color: #0d1847;
 }
+.admin_preview {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.admin_preview > * {
+  width: calc(50% - 10px);
+}
+.admin_preview-right {
+  height: 245px;
+  margin-top: 15px;
+  box-sizing: border-box;
+  background-color: #233;
+}
 </style>
-- 
2.26.0