Merge remote-tracking branch 'origin/dev' into dev

src/views/dashboard/HomePage.vue

@@ -141,7 +141,7 @@
     <div  style="width: 100%; height:70%; margin-top: 11px; overflow-y: hidden"  :headStyle="{}" :bodyStyle="{height:'100%' , overflow:'hidden'}">
       <a-row :gutter="24">
         <a-col :span="24">
-          <a-card class="bottom-card" title="快捷" style="width: 100%; height:478px; margin-top: 11px; overflow-y: hidden" :headStyle="{}"  :bodyStyle="{height:'100%' , overflow:'hidden'}" >
+          <a-card class="bottom-card" title="快捷" style="width: 100%; height:100%; margin-top: 11px; overflow-y: hidden" :headStyle="{}"  :bodyStyle="{height:'100%' , overflow:'hidden'}" >
 <!--            <a slot="extra"  @click="keyApp" v-has="'dashboard:addKey'" >添加常用应用</a>-->
 <!--            <div style="max-height: 420px;overflow-y: auto;">-->
 <!--        <span class="ant-col-md-4" v-for="(item,index) in keyChildren" @click="goRouteView(item.path)" :title="item.meta.title"-->
@@ -162,17 +162,17 @@
           <a-tabs>
             <a-tab-pane tab="常用应用" key="1" forceRender >
 
-              <div style="max-height: 420px;overflow-y: auto; width: 100%"  >
+              <div  style="max-height: 420px;overflow-y: auto; width: 100%"  >
 <!--                <div> <a slot="extra" @click="keyApp">添加常用应用</a></div>-->
         <span class="ant-col-md-4" v-for="(item,index) in keyChildren" @click="goRouteView(item.path)" :title="item.meta.title"
               style="display: inline-block; margin: 25px;">
           <a-icon :type="item.meta.icon" :style="{'color':item.color}" style="font-size: 25px"></a-icon> &nbsp;&nbsp;{{ item.meta.title }}
         </span>
 
-              </div>
+              </div >
             </a-tab-pane>
-            <a-tab-pane tab="全部应用" key="2" forceRender>
-              <div style="max-height: 420px;overflow-y: auto; width: 100%">
+            <a-tab-pane tab="全部应用" key="2" forceRender >
+              <div  style="overflow-y: auto; width: 100%" :style=conheight >
         <span class="ant-col-md-4" v-for="(item,index) in userChildren" @click="goRouteView(item.path)" :title="item.meta.title"
               style="display: inline-block; margin: 25px;">
           <a-icon :type="item.meta.icon" :style="{'color':item.color}" style="font-size: 25px"></a-icon> &nbsp;&nbsp;{{ item.meta.title }}
@@ -344,12 +344,20 @@ export default {
       routerGo:"",
       timeLineHeight:"",
       colors:[],
+      conheight:{
+        height:''
+      },
     }
   },
   mounted() {
+      console.log("执行声明周期监听")
+      // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
+      window.addEventListener('resize', this.getHeight);
+      this.getHeight();
     this.timeLineHeight = document.documentElement.clientHeight - 330;
     window.onresize = () => {
       this.timeLineHeight = document.documentElement.clientHeight - 330;
+
     };
   },
   created() {
@@ -377,6 +385,9 @@ export default {
   },
 
   methods: {
+    getHeight(){
+      this.conheight.height=window.innerHeight-230+'px';
+    },
     regimeFileClick(record){
       console.log("执行文件信息展示....")