fix 优化

src/components/Title1/index.vue

@@ -21,7 +21,7 @@
     position: relative;
     .title {
       margin: vh(20) auto;
-      width: vw(500);
+      width: vw(450);
       height: vh(66);
       display: flex;
       align-items: center;

src/layout/components/Header/index.vue

@@ -169,7 +169,6 @@
 	 router.push('/home')
   }
   const handleCommand = (item, type) => {
-
     current.value = ''
     if (type === 'hotel') {
       otherRightLabel.value = '其他场馆'
@@ -546,7 +545,7 @@
         height: vh(56);
         line-height: vh(46);
         font-weight: 600;
-        font-size: vw(28);
+        font-size: font-vw(24);
         text-align: center;
         padding: 0 vw(50);
         color: rgba(208, 236, 255, 0.9);
@@ -573,7 +572,7 @@
         height: vh(56);
         line-height: vh(46);
         font-weight: 600;
-        font-size: vw(28);
+        font-size: font-vw(24);
         text-align: center;
         color: rgba(208, 236, 255, 0.9);
         background-image: url('@/assets/images/title-3.png');

src/views/home/components/box-2.vue

@@ -53,11 +53,16 @@
 			<div class="flex-1">
 				<Title1 title="车船信息" class="title1" />
 			</div>
-		<!--  <div class="flex-1" >
+			<div class="flex-1" >
 				<Title1 title="酒店信息" class="title1" />
-		  </div> -->
 			</div>
-		<div class="flex">
+		    <div class="flex-1" >
+				<Title1 title="工单信息" class="title1" />
+		    </div>
+		</div>
+		<div style="display: flex;">
+			<!-- 车船信息 -->
+			<div class="flex" style="flex:1;">
 			  <div class="car-ship">
 			    <div class="mb-6">
 			      <div class="car">
@@ -139,7 +144,8 @@
 			    </div>
 			  </div>
 			</div>
-		<div class="hotel" v-if="false" >
+			<!-- 酒店入住 -->
+			<div class="hotel" >
 				
 			  <div >
 			    <div class="item">
@@ -172,12 +178,13 @@
 			    <div class="occupancy">
 			      <Title3 title="酒店入住率" />
 			    </div>
+				
 			    <occupancy :list="homeStore.hotelData?.list" />
 			  </div>
 			</div>
-		
+			<!-- 工单 -->
-		
+			<div>
-      <div class="left" v-if="false">
+				<div  class="left">
 					<div>
 					  <div class="flex justify-center pt-30">
 					    <div class="item">
@@ -223,7 +230,7 @@
 					  </div>
 					</div>
 				</div>
-      <div v-if="false">
+				<div>
 				  <vue3-seamless-scroll
 				    class="right"
 				    :list="homeStore.wordkOrderList"
@@ -246,6 +253,8 @@
 				</div>
 			</div>
 		</div>
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -491,7 +500,7 @@
 	  // flex: 1;
 	  & > div {
 	    position: relative;
-	    height: vh(299);
+	    height: vh(265);
 	    display: flex;
 	    align-items: center;
 	    background-image: url('@/assets/images/bg-4.png');
@@ -541,10 +550,10 @@
 	    .table {
 	      position: absolute;
 	      left: vw(200);
-	      // width: vw(350);
+	      width: vw(450);
-		  width:85%;
+		  // width:5%;
 	      // height: vh(196);
-		  height:100%;
+		  // height:100%;
 	      z-index: 2;
 	      background: rgba(0, 150, 255, 0.17);
 	      .header {
@@ -626,7 +635,7 @@
 		flex:1;
 	    margin: 0 vw(6);
 	    .occupancy{
-		  height:100%;
+		  // height:vh(200);
 	    }
 	  & > div:nth-child(1) {
 	    display: flex;
@@ -693,7 +702,7 @@
   }
   .map {
     width: 100%;
-    height: vh(1170);
+    height: vh(1240);
     background-color: transparent;
   }
   .box-3 {
@@ -811,18 +820,20 @@
       }
     }
     .footer {
+	  position: absolute;
+	  width:vw(2630);
       margin-top: vh(8);
       // display: flex;
-      // height: vh(500);
+      height: vh(650);
-	  height:100%;
+	  // height:100%;
       background-image: url('@/assets/images/bg-2.png');
       background-size: 100% 100%;
 	  flex-wrap: wrap;
       .left {
-        // flex: 1;
+        flex: 1;
         display: flex;
-        margin-top: vh(14);
+        // margin-top: vh(14);
-		width:100%;
+		// width:100%;
         & > div {
           flex: 1;
           height: vh(180);
@@ -841,7 +852,7 @@
           .label {
             margin-bottom: vh(10);
             font-weight: 400;
-            font-size: font-vw(20);
+            font-size: font-vw(18);
             color: #ffffff;
           }
           .countup-wrap {
@@ -863,7 +874,7 @@
             .text {
               margin-right: vw(10);
               font-weight: 400;
-              font-size: font-vw(20);
+              font-size: font-vw(18);
               color: #ffffff;
             }
             .progress {

src/views/home/components/box-3.vue

@@ -121,7 +121,7 @@
       </div>
     </div>
 
-    <div class="flex">
+    <div class="flex" v-if="false">
    <!--   <div class="flex-1">
         <Title1 title="车船信息" class="title1" />
       </div> -->
@@ -130,7 +130,7 @@
       </div>
     </div>
 
-    <div class="flex">
+    <div class="flex" v-if="false">
       <div class="car-ship" v-if="false">
         <div class="mb-6">
           <div class="car">
@@ -304,7 +304,7 @@
     // height: vh(2056);
     padding-left: vw(8);
     box-sizing: border-box;
-    background-image: url('@/assets/images/bg-5.png');
+    // background-image: url('@/assets/images/bg-5.png');
     background-size: 100% 100%;
     .traffic-info {
       // height: vh(80);

src/views/home/components/occupancy.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 酒店入住人数及入住率 -->
-  <div class="occupancy" :id="id" />
+  <div class="occupancyNew" :id="id" />
 </template>
 
 <script setup>
@@ -19,10 +19,11 @@
   watch(
     () => props.list,
     (val) => {
+		
       if (val.length > 0) {
         setTimeout(() => {
           init()
-        }, 1000)
+        }, 1500)
       }
     },
     { immediate: true }
@@ -190,8 +191,8 @@
 </script>
 
 <style scoped lang="scss">
-  .occupancy {
+  .occupancyNew {
     width: 100%;
-    height: vh(340);
+    height: vh(360);
   }
 </style>