From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/SecurityControl.vue | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index 233548d..5eb0b21 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -4,7 +4,7 @@
<img src="@/assets/images/SecurityControl/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
<img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
- <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-瀹夐槻鏅鸿兘鐩戞祴</div>
+ <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-鏅鸿兘瀹夐槻鐩戞祴</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
<span class="week">{{ week }}</span>
@@ -164,7 +164,7 @@
<img src="@/assets/images/SecurityControl/title_short@2x.png" class="bg" alt="">
</div>
<div class="num_wrap">
- <div class="num">{{ data.internalCarTotal }}</div>
+ <div class="num">{{ data.inParkCarTotal || 0 }}</div>
<img src="@/assets/images/SecurityControl/anfang_ic_data@2x.png" class="bg" alt="">
</div>
</div>
@@ -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">
@@ -423,7 +423,7 @@
</div>
<div class="list two-swiper">
<div class="swiper-wrapper">
- <template v-for="item, i in dataList2.filter(i => i.total > 0)">
+ <template v-for="item, i in dataList2.filter(i => i.totalNum > 0)">
<div class="item two-swiper-slide swiper-slide">
<div class="line">
<div class="driver">{{ item.deviceType }}</div>
@@ -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 = ['#FEAF01', '#01ABFE', '#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,6 +828,8 @@
}
return item
})
+ console.log('dataList2', dataList2.value)
+
data2.value = total
if (online >= outline) {
temp.push({ name: '鍦ㄧ嚎', value: online, rate: ((online / (online + outline)) * 100).toFixed(1) })
@@ -849,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) {
@@ -859,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
@@ -963,7 +968,7 @@
initialSlide: 0,
direction: 'vertical', //绔栫洿鏂瑰悜
slidesPerView: 3,
- autoplay: autoplayFlag(dataList2.value.filter(i => i.total > 0), 3, 4000),
+ autoplay: autoplayFlag(dataList2.value.filter(i => i.totalNum > 0), 3, 4000),
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -1597,6 +1602,7 @@
width: 786px;
margin-right: 20px;
position: relative;
+
/* one-swiper */
.one_swiper_wrap {
height: 140px;
@@ -1928,11 +1934,11 @@
}
.dept {
- flex: 5;
+ flex: 8;
}
.time {
- flex: 4;
+ flex: 5;
}
}
--
Gitblit v1.9.3