From 4de7034f2c4bc36ffd8fba365eaddd000f14db7a Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 27 May 2020 16:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app-list/app-card.vue  |  1 -
 src/components/app-list/app-list.vue  | 16 +++++++++++++++-
 src/pages/authority/organization.vue  |  2 +-
 src/pages/workbench/yygl/yyglList.vue |  5 +++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/app-list/app-card.vue b/src/components/app-list/app-card.vue
index d0ed0b5..f9134d9 100644
--- a/src/components/app-list/app-card.vue
+++ b/src/components/app-list/app-card.vue
@@ -61,7 +61,6 @@ export default {
 
 <style scoped>
 .app_card {
-  width: calc(20% - 36px);
   background-image: url(../../assets/imgs/bg_block.png);
   background-size: 100% 100%;
   padding: 33px 25px 34px;
diff --git a/src/components/app-list/app-list.vue b/src/components/app-list/app-list.vue
index aec7a9d..4e004bd 100644
--- a/src/components/app-list/app-list.vue
+++ b/src/components/app-list/app-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app_list">
+  <div class="app_list" ref="container">
     <app-card
       v-for="(item, index) in data"
       :key="'app_card_' + index"
@@ -8,6 +8,7 @@
       @deployment-action="deploymentAction"
       @delete-action="deleteAction"
       :details-url="detailsUrl"
+      :style="{ width: 'calc(100% / ' + rowNum + ' - 36px)' }"
     ></app-card>
   </div>
 </template>
@@ -33,6 +34,9 @@ export default {
       default: 0,
     },
   },
+  data: () => ({
+    rowNum: 5,
+  }),
   methods: {
     deploymentAction(item) {
       this.$emit("deployment-action", item);
@@ -40,6 +44,16 @@ export default {
     deleteAction(item) {
       this.$emit("delete-action", item);
     },
+    pageResize() {
+      let listWidth = this.$refs.container.clientWidth;
+      this.rowNum = Math.floor(listWidth / 310);
+    },
+  },
+  mounted() {
+    this.pageResize();
+    window.onresize = () => {
+      this.pageResize();
+    };
   },
 };
 </script>
diff --git a/src/pages/authority/organization.vue b/src/pages/authority/organization.vue
index c61a541..5c7b884 100644
--- a/src/pages/authority/organization.vue
+++ b/src/pages/authority/organization.vue
@@ -213,7 +213,7 @@ export default {
   overflow: auto;
 }
 .main_container {
-  min-height: calc(100% - 74px);
+  min-height: calc(100% - 84px);
   padding: 15px 20px;
   border-radius: 10px;
   background-color: #fff;
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index 1e5dd86..20fd322 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -531,16 +531,17 @@ export default {
 
 <style scoped>
 .list_container {
-  min-height: 100%;
+  height: 100%;
   padding: 0 20px;
   overflow: auto;
 }
 .main_container {
-  min-height: calc(100% - 75px);
+  min-height: calc(100% - 84px);
   padding: 15px 20px;
   border-radius: 10px;
   overflow: hidden;
   background-color: #fff;
+  margin-bottom: 42px;
 }
 .main_container.card {
   display: flex;
-- 
2.26.0