Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/yl.vue

@@ -109,17 +109,52 @@
         <div class="yd_title familyPlanning">
           <!-- <span class="text">计划生育</span> -->
         </div>
-        <div style="width: 100%; height: 280px">
+        <!-- <div class="visitLog">
+          <div class="visitLog_item">
+            <img src="../assets/img_02.png" width="48px" height="51px" alt="" />
+            <div class="visitLog_item_box">
+              <h4>故居走访</h4>
+              <p>走访人员：陈思思</p>
+              <p>走访时间：2023-03-19 09:00:03</p>
+            </div>
+            <span class="check">点击查看</span>
+          </div>
+          <div class="visitLog_item">
+            <img src="../assets/img_02.png" width="48px" height="51px" alt="" />
+            <div class="visitLog_item_box">
+              <h4>节日走访</h4>
+              <p>走访人员：陈思思</p>
+              <p>走访时间：2023-03-19 09:00:03</p>
+            </div>
+            <span class="check">点击查看</span>
+          </div>
+          <div class="visitLog_item">
+            <img src="../assets/img_02.png" width="48px" height="51px" alt="" />
+            <div class="visitLog_item_box">
+              <h4>新年走访</h4>
+              <p>走访人员：陈思思</p>
+              <p>走访时间：2023-03-19 09:00:03</p>
+            </div>
+            <span class="check">点击查看</span>
+          </div>
+        </div> -->
+        <div style="width: 490px; height: 400px">
           <ylJHSY></ylJHSY>
         </div>
       </div>
     </div>
-    <div class="displayFlex center_bg">
+    <div class="displayFlex">
       <div class="flex2">
         <div class="yd_title mechanism">
           <!-- <span class="text">养老机构</span> -->
         </div>
         <div class="history">
+          <!-- <p>2002年至2009年担任浙江大学计算机学院和软件学院院长；</p>
+          <p>1984年获得浙江大学计算机应用专业硕士学位，之后留校任教；</p>
+          <p>1990年获得浙江大学计算机应用专业博士学位；</p>
+          <p>1994年至1996年担任浙江大学计算机系副系主任；</p>
+          <p>1997年至2002年担任浙江大学计算机系系主任；</p>
+          <p>2002年至2009年担任浙江大学计算机学院和软件学院院长；</p> -->
           <div class="history1">
             <div>
               <span>16<span class="unit">个</span></span>
@@ -151,7 +186,7 @@
           <div class="serviceTop">
             <div class="visit">
               <img class="serviceimg" src="@/assets/YLimg/ylimg8.png" alt="" />
-              <div style="width: 340px;height: 220px">
+              <div style="width: 290px">
                 <ylSMFW></ylSMFW>
               </div>
             </div>
@@ -164,12 +199,8 @@
             </div>
           </div>
           <div class="mealAssistance">
-            <img
+            <img class="mealAssistanceimg" src="@/assets/YLimg/ylimg7.png" alt="" />
-              class="mealAssistanceimg"
+            <div style="width: 490px">
-              src="@/assets/YLimg/ylimg7.png"
-              alt=""
-            />
-            <div style="width: 490px;height: 150px">
               <ylXZZC></ylXZZC>
             </div>
           </div>
@@ -210,8 +241,7 @@ const change = (name, index) => {
   height: 90vh;
   display: flex;
   flex-direction: column;
-  // flex: 1;
+  flex: 1;
-  width: 33.333333333%;
 }
 
 .flex1 {
@@ -254,26 +284,19 @@ const change = (name, index) => {
 
 .familyPlanning {
   background-image: url(@/assets/YLTitle/titleImg9.png);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
 }
 
 .mechanism {
   background-image: url(@/assets/YLTitle/titleImg10.png);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
 }
 
 .service {
   background-image: url(@/assets/YLTitle/titleImg11.png);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
 }
 
 .serviceBox {
   display: flex;
   flex-direction: column;
-  box-sizing: border-box;
 
   .serviceimg {
     width: 182px;
@@ -283,21 +306,15 @@ const change = (name, index) => {
   .serviceTop {
     display: flex;
     justify-content: space-between;
-    padding: 10px 36px  0px 20px ;
+
-    box-sizing: border-box;
-    .visit {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-    }
     .medicalService {
       display: flex;
       flex-direction: column;
       align-items: center;
 
       .ylimg {
-        width: 200px;
+        width: 205px;
-        height: 220px;
+        height: 239px;
       }
 
       .medicalServiceTop {
@@ -305,10 +322,10 @@ const change = (name, index) => {
 
         span {
           position: absolute;
-          left: 39px;
+          left: 38px;
           top: 35%;
           font-weight: bold;
-          font-size: 32px;
+          font-size: 36px;
           color: #ffffff;
           line-height: 41px;
           letter-spacing: 1px;
@@ -360,7 +377,6 @@ const change = (name, index) => {
 .left_bg {
   width:642px;
   box-sizing: border-box;
-  width: 100%;
   padding-left:50px;
   margin-right:28px;
   background-image: url(@/assets/images/left_bg.png);
@@ -474,7 +490,7 @@ const change = (name, index) => {
 .history {
   padding-top: 12px;
   display: flex;
-  justify-content: space-around;
+
   .history1 {
     font-size: 26px;
     color: #ffffff;