From b4b73d095b7469e586d6afab2a132c5b34ed97d1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 24 二月 2025 17:10:44 +0800
Subject: [PATCH] ll

---
 screen/src/views/SecurityControl.vue |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index 1b4ec61..5eb0b21 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -220,8 +220,8 @@
                 <div class="content">
                   <div class="name">闀挎湡鐩稿叧鏂�</div>
                   <div class="num today"><span>{{ data.relatedTotal || 0
-                      }}</span> | {{ data.inParkTotal ? ((data.relatedTotal / data.inParkTotal) * 100).toFixed(1) : 0
-                    }}%</div>
+                  }}</span> | {{ data.inParkTotal ? ((data.relatedTotal / data.inParkTotal) * 100).toFixed(1) : 0
+                      }}%</div>
                 </div>
               </div>
               <div class="item">
@@ -453,7 +453,7 @@
             <div class="line header">
               <div>濮撳悕</div>
               <div class="dept">鎷滆閮ㄩ棬</div>
-              <div class="dept">瓒呮椂鏃堕暱</div>
+              <div class="time">瓒呮椂鏃堕暱</div>
             </div>
             <div v-if="dataList3.length > 0" class="three-swiper list">
               <div class="swiper-wrapper">
@@ -461,7 +461,7 @@
                   <div class="line">
                     <div>{{ item.name }}</div>
                     <div class="dept">{{ item.companyName }}</div>
-                    <div class="dept">{{ item.timeOutMinuteT }}</div>
+                    <div class="time">{{ item.timeOutMinuteT }}</div>
                   </div>
                   <div class="separate"></div>
                 </div>
@@ -612,7 +612,7 @@
   })
 }
 
-const colors = [ '#01ABFE','#FEAF01', '#51F9E4']
+const colors = ['#01ABFE', '#FEAF01', '#51F9E4']
 const initEchart2 = () => {
   const myChart = echarts.init(document.getElementById('echart2'))
   const option = {
@@ -676,16 +676,18 @@
   ]
   const data = []
   if (data4.value.total) {
-    data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum, rate: (data4.value.waitVisitNum / data4.value.total).toFixed(1) })
-    data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum, rate: (data4.value.registerVisitNum / data4.value.total).toFixed(1) })
-    data.push({ name: '宸茬寮�', value: data4.value.levelNum, rate: (data4.value.levelNum / data4.value.total).toFixed(1) })
-    data.push({ name: '婊炵暀', value: data4.value.retentionNum, rate: (data4.value.retentionNum / data4.value.total).toFixed(1) })
+    data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum, rate: (data4.value.waitVisitNum / data4.value.total).toFixed(3) })
+    data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum, rate: (data4.value.registerVisitNum / data4.value.total).toFixed(3) })
+    data.push({ name: '宸茬寮�', value: data4.value.levelNum, rate: (data4.value.levelNum / data4.value.total).toFixed(3) })
+    data.push({ name: '婊炵暀', value: data4.value.retentionNum, rate: (data4.value.retentionNum / data4.value.total).toFixed(3) })
   } else {
     data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum, rate: 0 })
     data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum, rate: 0 })
     data.push({ name: '宸茬寮�', value: data4.value.levelNum, rate: 0 })
     data.push({ name: '婊炵暀', value: data4.value.retentionNum, rate: 0 })
   }
+  data.sort((a, b) => (b.value - a.value))
+  // console.log('data', data);
 
   const option = {
     color: colors,
@@ -752,7 +754,7 @@
           position: 'outside',
           formatter: (params) => {
             const index = params.dataIndex
-            return `{color${index}|${params.data.name} ${params.data.rate}%}`
+            return `{color${index}|${params.data.name} ${(params.data.rate * 100).toFixed(1)}%}`
             // return `<div>${params.data.name}</div>`
           },
           rich: {
@@ -826,8 +828,8 @@
         }
         return item
       })
-      console.log('dataList2', dataList2.value);
-      
+      console.log('dataList2', dataList2.value)
+
       data2.value = total
       if (online >= outline) {
         temp.push({ name: '鍦ㄧ嚎', value: online, rate: ((online / (online + outline)) * 100).toFixed(1) })
@@ -851,6 +853,7 @@
     data4.value = res.data || {}
     let obj = data4.value
     data4.value.total = obj.levelNum + obj.retentionNum + obj.registerVisitNum + obj.waitVisitNum
+
     const result = res.data?.visitRetentionDataList || []
     dataList3.value = result.map(i => {
       if (i.timeOutMinute) {
@@ -861,7 +864,7 @@
       } else if (i.timeOutMinute > 60) {
         i.timeOutMinuteT = dayjs.duration(i.timeOutMinute * 60 * 1000).format('H鏃秏鍒�')
       } else {
-        i.timeOutMinuteT = item.timeOutMinuteT + '鍒�'
+        i.timeOutMinuteT = i.timeOutMinute + '鍒�'
       }
 
       return i
@@ -1599,6 +1602,7 @@
     width: 786px;
     margin-right: 20px;
     position: relative;
+
     /* one-swiper */
     .one_swiper_wrap {
       height: 140px;
@@ -1930,11 +1934,11 @@
     }
 
     .dept {
-      flex: 5;
+      flex: 8;
     }
 
     .time {
-      flex: 4;
+      flex: 5;
     }
   }
 

--
Gitblit v1.9.3