From f39c5e65d1aac6f04405a5c4af97f828ca6ad2d9 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 5 Oct 2022 17:38:01 +0800
Subject: [PATCH] clay commit : css

---
 .../index/components/academy_and_sciences.vue | 77 ++++++++++++-------
 1 file changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/views/index/components/academy_and_sciences.vue b/src/views/index/components/academy_and_sciences.vue
index 3f3ca5d..e52ab22 100644
--- a/src/views/index/components/academy_and_sciences.vue
+++ b/src/views/index/components/academy_and_sciences.vue
@@ -90,21 +90,9 @@
             </div>
             <el-row>
               <el-col :span="11">
-                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
+                <div class="academy_content" @mouseleave="mouseLeave(1)">
                   <div class="academy_content_icontime">
-                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
-                    <span>2022-10-08</span>
-                  </div>
-                  <div class="academy_content_title">
-                    信息科学与技术学院开展英
-                  </div>
-                  <div class="academy_content_text">
-                    为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
-                  </div>
-                </div>
-                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
-                  <div class="academy_content_icontime">
-                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
+                    <div class="img"></div>
                     <span>2022-10-08</span>
                   </div>
                   <div class="academy_content_title">
@@ -119,9 +107,9 @@
                 <div class="grid-content"></div>
               </el-col>
               <el-col :span="11">
-                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
+                <div class="academy_content">
                   <div class="academy_content_icontime">
-                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
+                    <div class="img"></div>
                     <span>2022-10-08</span>
                   </div>
                   <div class="academy_content_title">
@@ -131,10 +119,29 @@
                     为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
                   </div>
                 </div>
-                <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
+              </el-col>
+              <el-col :span="11">
+                <div class="academy_content">
+                  <div class="academy_content_icontime">
+                    <div class="img"></div>
+                    <span>2022-10-08</span>
+                  </div>
+                  <div class="academy_content_title">
+                    信息科学与技术学院开展英
+                  </div>
+                  <div class="academy_content_text">
+                    为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
+                  </div>
+                </div>
+              </el-col>
+              <el-col :span="2">
+                <div class="grid-content"></div>
+              </el-col>
+              <el-col :span="11">
+                <div class="academy_content">
                   <div class="academy_content_icontime">
 <!--                    <img :src="src" alt="">-->
-                    <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
+                    <div class="img"></div>
                     <span>2022-10-08</span>
                   </div>
                   <div class="academy_content_title">
@@ -162,8 +169,6 @@ export default {
   name: "academy_and_sciences",
   data(){
     return{
-      bgColor:'rgba(10, 81, 174, 0.89)',
-      iconbgc:require('../../../assets/index/academy_and_sciences/shijian3.png')
     }
   }
 };
@@ -249,14 +254,33 @@ export default {
     }
   }
 
-  .academy_content {
-    &:hover {
-      box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5);
-      background: #FFFFFF;
-      color: #0049AF;
+  .academy_content:hover{
+    box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5);
+    background: #FFFFFF;
+    color: #0049AF;
+    .academy_content_text{
+      color: #575757;
     }
+
+    .img {
+      background-image: url("../../../assets/index/academy_and_sciences/shijian2.png");
+    }
+  }
+
+  .academy_content {
+
+    //&:hover{
+    //  box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5);
+    //  background: #FFFFFF;
+    //  color: #0049AF;
+    //  .academy_content_text{
+    //    color: #575757;
+    //  }
+    //}
+
+
+    background-color: rgba(10, 81, 174, 0.89);
     padding: 2.5rem 2.3rem;
-    //background: ;
     border-radius: 16px;
     margin-bottom: 1.9rem;
     color: #FFFFFF;
@@ -264,6 +288,7 @@ export default {
       display: flex;
       margin-bottom: 1.1rem;
       .img {
+        background-image: url("../../../assets/index/academy_and_sciences/shijian3.png");
         background-size: 1.5rem;
         width: 1.5rem;
         height: 1.5rem;