From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007
---
screen/src/views/SecurityControl.vue | 224 +++++++++++++++++++++++++++++++------------------------
1 files changed, 127 insertions(+), 97 deletions(-)
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index c13e8f9..48985ac 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -3,8 +3,8 @@
<div class="main_app">
<img src="@/assets/images/SecurityControl/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
- <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-瀹夐槻鏅鸿兘鐩戞祴</div>
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
+ <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-鏅鸿兘瀹夐槻鐩戞祴</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
<span class="week">{{ week }}</span>
@@ -19,7 +19,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>瀹炴椂鍥尯杞﹁締</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="second_title">
<div class="title">
@@ -108,10 +108,12 @@
</div>
</div>
<div class="center_box">
- <div v-if="showJk" class="jiankong">
+ <div v-show="showJk" class="jiankong">
<img class="jk_bg" src="@/assets/images/SecurityControl/jiankong_bg@2x.png" alt="">
<div class="content">
- <video :src="activeVideo" class="video"></video>
+ <Video v-if="showJk && activeMenu && activeMenu.indexCode" :href="data.videoPluginUrl"
+ :indexCode="activeMenu.indexCode" />
+ <!-- <div class="player_bg" style="width: 100%;height: 100%;" id="playWnd"> </div> -->
</div>
<div class="right_wrap">
<div class="menus">
@@ -144,7 +146,7 @@
</div>
</div>
- <div v-else class="center_box_one">
+ <div v-show="!showJk" class="center_box_one">
<div class="list">
<div class="item">
<div class="name_wrap">
@@ -162,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>
@@ -196,7 +198,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>鍦ㄥ洯浜哄憳鍒嗘瀽</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="second_title">
<div class="title">
@@ -218,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">
@@ -247,7 +249,7 @@
</div>
<div class="spacing"></div>
<div class="item">
- <div class="name">宸茬櫥璁�</div>
+ <div class="name">宸茶闂�</div>
<div class="num_wrap">
<span class="num">{{ data4.registerVisitNum }}</span>
<span>浜�</span>
@@ -287,7 +289,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>褰撳墠杞﹁締婊炵暀棰勮</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="table">
<div class="line header">
@@ -310,6 +312,7 @@
</div>
</div> -->
<div class="safe_warning">
+ <Loading v-if="loading1" />
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
@@ -322,7 +325,7 @@
<div class="separate"></div>
<div class="tab" :class="{ active: warningTab == '2' }" @click="tasClick('2')">琛屼负鍛婅</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="one_swiper_wrap">
<div class="list one-swiper">
@@ -367,6 +370,9 @@
</div>
</div>
</div>
+ <div v-if="warningList.length == 0" class="empty_wrap">
+ <img src="@/assets/images/default_empty.png" alt="">
+ </div>
</div>
</div>
</div>
@@ -378,9 +384,9 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>鍥尯瀹夐槻璁惧</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
- <div class="monitoring" @click="showJk = !showJk">
+ <div class="monitoring" @click="changeMon">
<img src="@/assets/images/SecurityControl/ic_jiankong@2x.png" class="icon" alt="">
<div>鐩戞帶鍒楄〃</div>
<img v-if="showJk" src="@/assets/images/SecurityControl/jiankong_ic_close@2x.png" class="top" alt="">
@@ -417,7 +423,7 @@
</div>
<div class="list two-swiper">
<div class="swiper-wrapper">
- <template v-for="item, i in dataList2">
+ <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>
@@ -441,13 +447,13 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>浠婃棩璁垮婊炵暀鎯呭喌</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="table">
<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">
@@ -455,14 +461,14 @@
<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>
</div>
</div>
- <div class="empty_wrap">
- <img v-if="dataList3.length == 0" src="@/assets/images/default_empty.png" alt="">
+ <div v-if="dataList3.length == 0" class="empty_wrap">
+ <img src="@/assets/images/default_empty.png" alt="">
</div>
</div>
</div>
@@ -472,7 +478,7 @@
</template>
<script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, nextTick } from 'vue'
import VScaleScreen from 'v-scale-screen'
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
@@ -481,6 +487,8 @@
import * as echarts from 'echarts'
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
+import Video from './videoUrl/Video.vue'
+import Loading from '@/components/Loading.vue'
import {
getEnergyCenterData,
afgetCarmeraPreviemUrl,
@@ -503,8 +511,6 @@
time.value = dayjs().format('HH:mm:ss')
}, 1000)
-
-
const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
const initEnergy = () => {
@@ -606,7 +612,7 @@
})
}
-const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
+const colors = ['#01ABFE', '#FEAF01', '#51F9E4']
const initEchart2 = () => {
const myChart = echarts.init(document.getElementById('echart2'))
const option = {
@@ -655,23 +661,34 @@
}]),
new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0,
+ color: '#4370f2'
+ }, {
+ offset: 1,
+ color: '#61d3f9'
+ }]),
+ new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+ offset: 0,
color: '#4679f6'
}, {
offset: 1,
color: '#4674f6'
}]),
- new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
- offset: 0,
- color: '#4370f2'
- }, {
- offset: 1,
- color: '#61d3f9'
- }])]
+ ]
const data = []
- data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum, rate: data4.value.waitVisitNum / data4.value.total })
- data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum, rate: data4.value.registerVisitNum / data4.value.total })
- data.push({ name: '宸茬寮�', value: data4.value.levelNum, rate: data4.value.levelNum / data4.value.total })
- data.push({ name: '婊炵暀', value: data4.value.retentionNum, rate: data4.value.retentionNum / data4.value.total })
+ if (data4.value.total) {
+ 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,
tooltip: {
@@ -735,12 +752,16 @@
label: {
show: true,
position: 'outside',
- formatter: '{a|{b}} {a|{d}%}',
+ formatter: (params) => {
+ const index = params.dataIndex
+ return `{color${index}|${params.data.name} ${(params.data.rate * 100).toFixed(1)}%}`
+ // return `<div>${params.data.name}</div>`
+ },
rich: {
- a: {
- color: '#869CC9',
- fontSize: 13
- },
+ color0: { color: 'orange', fontSize: 14 },
+ color1: { color: '#869CC9', fontSize: 13 },
+ color2: { color: '#869CC9', fontSize: 13 },
+ color3: { color: '#869CC9', fontSize: 13 }
}
},
labelLine: {
@@ -807,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) })
@@ -819,7 +842,6 @@
dataListT2.value = temp
}
initEchart2()
- loopFn2()
})
}
@@ -831,7 +853,8 @@
data4.value = res.data || {}
let obj = data4.value
data4.value.total = obj.levelNum + obj.retentionNum + obj.registerVisitNum + obj.waitVisitNum
- const result = res.data.visitRetentionDataList || []
+
+ const result = res.data?.visitRetentionDataList || []
dataList3.value = result.map(i => {
if (i.timeOutMinute) {
i.timeOutMinute = Math.abs(i.timeOutMinute)
@@ -841,48 +864,23 @@
} 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
})
initEchart3()
- loopFn3()
})
-
- // getVisitRetentionData().then(res => {
- // const result = res.data || []
- // dataList3.value = result.map(i => {
- // if (i.timeOutMinute) {
- // i.timeOutMinute = Math.abs(i.timeOutMinute)
- // }
- // if (i.timeOutMinute > 60 * 24) {
- // i.timeOutMinuteT = dayjs.duration(i.timeOutMinute * 60 * 1000).format('D澶〩鏃秏鍒�')
- // } else if (i.timeOutMinute > 60) {
- // i.timeOutMinuteT = dayjs.duration(i.timeOutMinute * 60 * 1000).format('H鏃秏鍒�')
- // } else {
- // i.timeOutMinuteT = item.timeOutMinuteT + '鍒�'
- // }
-
- // return i
- // })
- // loopFn3()
- // })
}
-// const data4 = ref({})
-// const getData4 = () => {
-// afgetVisitData().then(res => {
-// const result = res.data || {}
-// data4.value = result
-// initEchart3()
-// })
-// }
+const loading1 = ref(false)
const warningTab = ref('0')
const warningNum = ref(0)
const warningList = ref([])
const getWarning = () => {
+ loading1.value = true
afwarningEventData({ type: warningTab.value }).then(res => {
+ loading1.value = false
if (!res.data) return
const result = res.data.list || []
warningNum.value = res.data.total
@@ -894,7 +892,6 @@
warningList.value.forEach((item, i) => {
// console.log(i);
if (i == 0 || i % 2 == 0) {
- console.log(i)
temp.push(item)
} else {
temp[temp.length - 1].addr0 = item.addr
@@ -906,7 +903,8 @@
})
warningList.value = temp
// console.log('temp', warningList.value);
- loopFn1()
+ }, () => {
+ loading1.value = false
})
}
const tasClick = (val) => {
@@ -930,6 +928,13 @@
data5.value = result.filter(item => item.carmeraList && item.carmeraList.length > 0)
})
}
+const changeMon = () => {
+ showJk.value = !showJk.value
+ if (!showJk.value) {
+ activeJkIndex.value = -1
+ activeMenu.value = {}
+ }
+}
const menuClick = (val) => {
if (val == activeJkIndex.value) {
activeJkIndex.value = -1
@@ -939,11 +944,8 @@
}
const menuItemClick = (val) => {
activeMenu.value = val
- afgetCarmeraPreviemUrl({ indexCode: val.indexCode }).then(res => {
- activeVideo.value = res.data
- })
-}
+}
const autoplayFlag = (list = [], leng = 4, time = 2000) => {
if (list.length > leng) {
return { delay: time, disableOnInteraction: false }
@@ -966,7 +968,7 @@
initialSlide: 0,
direction: 'vertical', //绔栫洿鏂瑰悜
slidesPerView: 3,
- autoplay: autoplayFlag(dataList2.value, 3, 4000),
+ autoplay: autoplayFlag(dataList2.value.filter(i => i.totalNum > 0), 3, 4000),
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -984,15 +986,31 @@
+
onMounted(() => {
getData1()
getData2()
getData3()
- // getData4()
getData5()
getWarning()
- // initEchart1()
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getWarning()
+ }, 1000 * 60)
+
+ setInterval(() => {
+ getData5()
+ }, 1000 * 60 * 60)
+
+ setTimeout(() => {
+ loopFn1()
+ loopFn2()
+ loopFn3()
+ }, 12000)
+
})
@@ -1020,6 +1038,8 @@
margin-bottom: 20px;
font-size: 14px;
color: #D2E0FF;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.second_title {
margin-top: 24px;
@@ -1273,7 +1293,7 @@
.menu_wrap {
margin-top: 15px;
max-height: 440px;
- overflow: hidden;
+ overflow: auto;
.menu {
.menu_name {
@@ -1368,6 +1388,8 @@
.right_box_one {
margin-bottom: 20px;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.second_title {
margin-top: 20px;
@@ -1450,9 +1472,15 @@
}
}
- .right_box_two {}
+ .right_box_two {
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+ }
- .right_box_three {}
+ .right_box_three {
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+ }
}
}
@@ -1573,12 +1601,16 @@
.safe_warning {
width: 786px;
margin-right: 20px;
+ position: relative;
/* one-swiper */
- .one_swiper_wrap{
+ .one_swiper_wrap {
height: 140px;
overflow: hidden;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
}
+
.list {
height: 204px;
overflow: hidden;
@@ -1665,6 +1697,8 @@
flex: 1;
margin-right: 20px;
position: relative;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.content {
display: flex;
@@ -1675,7 +1709,8 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 16px 24px;
+ padding-top: 16px;
+ padding-left: 24px;
.echart_wrap {
position: relative;
@@ -1711,7 +1746,7 @@
}
.list {
- margin-left: 36px;
+ margin-left: 32px;
flex: 1;
display: flex;
flex-direction: column;
@@ -1809,6 +1844,8 @@
.visitor_warning {
width: 360px;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.table {
.list {
@@ -1844,13 +1881,6 @@
align-items: center;
font-weight: bold;
font-size: 16px;
- background-image: -webkit-linear-gradient(top,
- #ffffff 0%,
- #c8ddff 66%,
- #85b4ff 72%,
- #74a9ff 100%);
- -webkit-background-clip: text;
- -webkit-text-fill-color: transparent;
.icon {
width: 16px;
@@ -1904,11 +1934,11 @@
}
.dept {
- flex: 5;
+ flex: 8;
}
.time {
- flex: 4;
+ flex: 5;
}
}
@@ -2001,4 +2031,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3