From 4e5b071027437d812b60761012f1e42c6be6fadb Mon Sep 17 00:00:00 2001
From: zjc <1034206993@qq.com>
Date: Wed, 12 Mar 2025 17:30:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E5=96=84=E6=99=AF=E5=8C=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/box-3.vue          |  2 +-
 src/views/monitor/components/box-1.vue       | 58 +++++++++-----------
 src/views/scenic/components/box-1.vue        |  4 +-
 src/views/scenic/components/box-2.vue        | 16 +++---
 src/views/scenic/components/jam.vue          | 10 ++--
 src/views/scenic/components/traffic-flow.vue |  6 +-
 6 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/src/views/home/components/box-3.vue b/src/views/home/components/box-3.vue
index d7df75e..315e861 100644
--- a/src/views/home/components/box-3.vue
+++ b/src/views/home/components/box-3.vue
@@ -57,7 +57,7 @@
         </div>
       </div>
     </div>
-    <Title1 title="停车信息(调试中)" />
+    <Title1 title="停车信息" />
     <div class="stop-box">
       <div>
         <img class="icon" src="@/assets/images/icon-5.png" alt="" />
diff --git a/src/views/monitor/components/box-1.vue b/src/views/monitor/components/box-1.vue
index 6a69c49..fb4201c 100644
--- a/src/views/monitor/components/box-1.vue
+++ b/src/views/monitor/components/box-1.vue
@@ -41,7 +41,7 @@
           <countup class="scenic-item__value" :end-val="scenicAiAnalyzeData.handled" />
         </div>
       </div>
-      <div class="flex pt-20">
+      <div class="flex pt-20 gap8">
         <div class="box">
           <Title3 title="异常告警" />
           <Line
@@ -66,20 +66,13 @@
           :key="index"
         >
           <span class="scenic-item__label">{{ item.name }}</span>
-          <!--          <countup class="scenic-item__value" :end-val="item.value" />-->
-          <span class="scenic-item__value"> {{ item.value }}</span>
+          <countup class="scenic-item__value" :end-val="item.value" />
         </div>
       </div>
       <div class="flex pt-20">
         <div class="box">
           <Title3 title="拥堵告警" />
-          <Line :width="370" :height="180" :data="jamlData" :xAxisData="jamXAxisData" />
-        </div>
-        <div class="box">
-          <Title3 title="拥堵告警占比" />
-          <div class="flex">
-            <alarmRate :dataList="trafficAbnormalityData.dataLists" />
-          </div>
+          <Line :width="760" :height="180" :data="jamlData" :xAxisData="jamXAxisData" />
         </div>
       </div>
     </template>
@@ -303,6 +296,9 @@
 </script>
 
 <style scoped lang="scss">
+  .gap8 {
+    gap: vw(8);
+  }
   .none {
     width: vw(380);
     height: vh(200);
@@ -565,31 +561,29 @@
     }
 
     .box {
-      width: vw(394);
+      flex: 1;
       height: vh(220);
       background-image: url('@/assets/images/bg-3.png');
       background-size: 100% 100%;
-      &:nth-child(1) {
-        margin-right: vw(10);
-      }
-      .title-2 {
-        width: vw(253);
-        height: vh(28);
-        display: flex;
-        align-items: center;
-        background-image: url('@/assets/images/title-5.png');
-        background-size: 100% 100%;
-        & > span {
-          padding-left: vw(22);
-          font-weight: bold;
-          font-size: vw(15);
-          background-image: linear-gradient(to bottom, #ffffff 0%, #75c1ff 100%);
-          -webkit-background-clip: text;
-          background-clip: text;
-          -webkit-text-fill-color: transparent; /* 兼容WebKit内核浏览器 */
-          color: transparent; /* 兼容其他浏览器 */
-        }
-      }
+
+      // .title-2 {
+      //   width: vw(253);
+      //   height: vh(28);
+      //   display: flex;
+      //   align-items: center;
+      //   background-image: url('@/assets/images/title-5.png');
+      //   background-size: 100% 100%;
+      //   & > span {
+      //     padding-left: vw(22);
+      //     font-weight: bold;
+      //     font-size: vw(15);
+      //     background-image: linear-gradient(to bottom, #ffffff 0%, #75c1ff 100%);
+      //     -webkit-background-clip: text;
+      //     background-clip: text;
+      //     -webkit-text-fill-color: transparent; /* 兼容WebKit内核浏览器 */
+      //     color: transparent; /* 兼容其他浏览器 */
+      //   }
+      // }
       .statistic {
         display: flex;
         margin-top: vh(12);
diff --git a/src/views/scenic/components/box-1.vue b/src/views/scenic/components/box-1.vue
index 99c683a..d34e57d 100644
--- a/src/views/scenic/components/box-1.vue
+++ b/src/views/scenic/components/box-1.vue
@@ -43,7 +43,7 @@
           <circle-progress
             :width="170"
             :height="90"
-            :value="scenicStore.wordkOrderData.toDayData.rate"
+            :value="parseFloat(scenicStore.wordkOrderData.toDayData.rate)"
             :title="`${scenicStore.wordkOrderData.toDayData.rate}%`"
             subTitle="完成率"
           />
@@ -66,7 +66,7 @@
           <circle-progress
             :width="170"
             :height="90"
-            :value="scenicStore.wordkOrderData.warnData.rate"
+            :value="parseFloat(scenicStore.wordkOrderData.warnData.rate)"
             :title="`${scenicStore.wordkOrderData.warnData.rate}%`"
             subTitle="完成率"
           />
diff --git a/src/views/scenic/components/box-2.vue b/src/views/scenic/components/box-2.vue
index efd99cf..590be85 100644
--- a/src/views/scenic/components/box-2.vue
+++ b/src/views/scenic/components/box-2.vue
@@ -73,7 +73,7 @@
         </div>
       </div>
       <div class="box-1 mr-8">
-        <Title1 title="停车信息（调试中）" />
+        <Title1 title="停车信息" />
         <div class="flex">
           <div class="height70 flex flex-1">
             <circle-progress
@@ -81,7 +81,7 @@
               :key="index"
               :width="140"
               :height="70"
-              :value="item.rate"
+              :value="parseFloat(item.rate)"
               :title="item.occupied"
               :subTitle="`${item.name}剩余`"
             />
@@ -90,7 +90,7 @@
             <count-item label="总停车场" :count="scenicStore.stopCarData.info.count" suffix="个" />
             <count-item
               label="剩余车位数"
-              :count="scenicStore.stopCarData.info.remain"
+              :count="scenicStore.stopCarData.info.occupiedSpaces"
               suffix="个"
             />
           </div>
@@ -98,13 +98,13 @@
         <div class="flex">
           <div class="border mr-8 flex-1">
             <div class="pt-10">
-              <Title3 title="今日景区车流量（调试中）" />
+              <Title3 title="今日景区车流量" />
             </div>
             <Line :width="360" :height="300" :data="carBearData" :xAxisData="carBearXAxisData" />
           </div>
           <div class="border flex-1">
             <div class="pt-10">
-              <Title3 title="车辆归属地占比（调试中）" />
+              <Title3 title="车辆归属地占比" />
             </div>
             <PieRow
               label="停车总数"
@@ -144,13 +144,13 @@
     </div>
     <div class="flex mt-8">
       <div class="box-3 mr-8">
-        <Title1 title="交通信息（调试中）" />
+        <Title1 title="交通信息" />
         <div class="count-box flex">
           <count-item
             v-for="(item, index) in scenicStore.trafficData.infoList"
             :key="index"
             :label="item.name"
-            :count="item.value"
+            :count="item?.value || 0"
           />
         </div>
         <div class="flex">
@@ -347,7 +347,7 @@
 
   const carTotal = computed(() => {
     return scenicStore.stopCarData.dataLists.reduce((pre, cur) => {
-      return pre + cur.count
+      return pre + parseInt(cur.count)
     }, 0)
   })
 
diff --git a/src/views/scenic/components/jam.vue b/src/views/scenic/components/jam.vue
index e9f59d8..12eb9e2 100644
--- a/src/views/scenic/components/jam.vue
+++ b/src/views/scenic/components/jam.vue
@@ -40,10 +40,12 @@
 
   watch(
     () => props.list,
-    (val) => {
-      setTimeout(() => {
-        init()
-      }, 1000)
+    () => {
+      if (props.list.length > 0) {
+        setTimeout(() => {
+          init()
+        }, 1000)
+      }
     },
     { immediate: true }
   )
diff --git a/src/views/scenic/components/traffic-flow.vue b/src/views/scenic/components/traffic-flow.vue
index 977e564..21785f0 100644
--- a/src/views/scenic/components/traffic-flow.vue
+++ b/src/views/scenic/components/traffic-flow.vue
@@ -86,10 +86,8 @@
             label: {
               show: true,
               position: 'top',
-              textStyle: {
-                color: '#fff',
-                fontSize: fitChartSize(10)
-              }
+              color: '#fff',
+              fontSize: fitChartSize(10)
             },
             itemStyle: {
               color: {