Explorar el Código

Merge branch 'fix-new-高知新UI' of http://101.43.129.26:10880/psychological_camera/cpdm_pc into fix-new-学生新UI

plg hace 3 meses
padre
commit
060f3fb171
Se han modificado 5 ficheros con 62 adiciones y 5 borrados
  1. BIN
      src/assets/home/01.png
  2. BIN
      src/assets/home/02.png
  3. BIN
      src/assets/home/03.png
  4. BIN
      src/assets/home/031.png
  5. 62 5
      src/views/HomeView.vue

BIN
src/assets/home/01.png


BIN
src/assets/home/02.png


BIN
src/assets/home/03.png


BIN
src/assets/home/031.png


+ 62 - 5
src/views/HomeView.vue

@@ -169,8 +169,10 @@ const brightStatusLevel = () => {
       <div style="text-align: center;">
       <div style="text-align: center;">
         <!-- <img src="../assets/home/group_zc.png" style="width: 30vw;margin-bottom: 55px;" alt=""> -->
         <!-- <img src="../assets/home/group_zc.png" style="width: 30vw;margin-bottom: 55px;" alt=""> -->
         <div>
         <div>
-
+          <span class="zc_des">职场心理问题频发</span>
         </div>
         </div>
+        <div style="margin-top:20px;color:#818996">工作压力逐渐成为每个人都无法回避的现实问题,这种压力</div>
+        <div style="color:#818996">往往会引发一系列心理问题。</div>
       </div>
       </div>
 
 
       <el-carousel :interval="114000" type="card" indicator-position="outside" style="flex: 1;">
       <el-carousel :interval="114000" type="card" indicator-position="outside" style="flex: 1;">
@@ -197,8 +199,20 @@ const brightStatusLevel = () => {
 
 
     </div>
     </div>
     <div class="home_two">
     <div class="home_two">
-      <div style="text-align: center;"><img src="../assets/home/group_two.png" style="width: 30vw;margin-bottom: 55px;"
-          alt=""></div>
+      <!-- <div style="text-align: center;"><img src="../assets/home/group_two.png" style="width: 30vw;margin-bottom: 55px;"
+          alt="">
+      </div> -->
+
+      <div style="text-align: center;">
+        <!-- <img src="../assets/home/group_zc.png" style="width: 30vw;margin-bottom: 55px;" alt=""> -->
+        <div>
+          <span class="zc_des">职业心理健康需要引起重视</span>
+        </div>
+        <div style="margin-top:20px;color:#818996;margin-bottom: 40px;">健康、和谐的工作环境需要个人、企业和社会的共努力。</div>
+        <!-- <div style="color:#818996">往往会引发一系列心理问题。</div> -->
+      </div>
+
+
       <div style="display: flex; justify-content: space-around;">
       <div style="display: flex; justify-content: space-around;">
         <div class="home_two_img">
         <div class="home_two_img">
           <img src="../assets/home/group_six2.png" style="width: 500px;" alt="">
           <img src="../assets/home/group_six2.png" style="width: 500px;" alt="">
@@ -214,8 +228,16 @@ const brightStatusLevel = () => {
     </div>
     </div>
 
 
     <div class="home_two">
     <div class="home_two">
-      <div style="text-align: center;"><img src="../assets/home/group_four.png" style="width: 30vw;margin-bottom: 55px;"
-          alt=""></div>
+
+      <div style="text-align: center;">
+        <!-- <img src="../assets/home/group_zc.png" style="width: 30vw;margin-bottom: 55px;" alt=""> -->
+        <div>
+          <span class="zc_des3">工作虽苦,解压有道</span>
+        </div>
+        <div style="margin-top:20px;color:#818996;">养成定期自我评估的习惯,关注自身的心理状态变化,适时</div>
+        <div style="color:#818996;margin-bottom: 40px;">进行调整,在忙碌的工作中找到身与心的平衡。</div>
+        <!-- <div style="color:#818996">往往会引发一系列心理问题。</div> -->
+      </div>
       <div style="display: flex; justify-content: space-around;position: relative;">
       <div style="display: flex; justify-content: space-around;position: relative;">
         <div class="home_two_img">
         <div class="home_two_img">
           <img src="../assets/home/group_senven1.png" alt="" style="width: 500px;">
           <img src="../assets/home/group_senven1.png" alt="" style="width: 500px;">
@@ -283,6 +305,17 @@ body {
     text-align: center;
     text-align: center;
   }
   }
 
 
+  .zc_des {
+    margin-top: 40px;
+    display: inline-flex;
+    padding-top: 40px;
+    font-size: 32px;
+    color: #00DE7E;
+    font-weight: 700;
+    background: url(../assets/home/01.png) no-repeat;
+    background-size: auto 72px;
+    background-position: center;
+  }
 }
 }
 
 
 
 
@@ -299,6 +332,30 @@ body {
   height: 100vh;
   height: 100vh;
   scroll-snap-align: center;
   scroll-snap-align: center;
 
 
+  .zc_des {
+    margin-top: 40px;
+    display: inline-flex;
+    padding-top: 40px;
+    font-size: 32px;
+    color: #00DE7E;
+    font-weight: 700;
+    background: url(../assets/home/02.png) no-repeat;
+    background-size: auto 72px;
+    background-position: center;
+  }
+
+  .zc_des3 {
+    margin-top: 40px;
+    display: inline-flex;
+    padding-top: 40px;
+    font-size: 32px;
+    color: #00DE7E;
+    font-weight: 700;
+    background: url(../assets/home/03.png) no-repeat;
+    background-size: auto 72px;
+    background-position: bottom;
+  }
+
   .home_two_img {
   .home_two_img {
     padding: 20px;
     padding: 20px;
     box-sizing: border-box;
     box-sizing: border-box;