From abfe6985b2678445ea8da974b204d9fe2ffdb887 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 十二月 2024 15:23:41 +0800
Subject: [PATCH] ll
---
screen/src/views/SecurityControl.vue | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index 1496439..233548d 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -111,7 +111,8 @@
<div v-show="showJk" class="jiankong">
<img class="jk_bg" src="@/assets/images/SecurityControl/jiankong_bg@2x.png" alt="">
<div class="content">
- <Video v-if="showJk && activeMenu && activeMenu.indexCode" :href="data.videoPluginUrl" :indexCode="activeMenu.indexCode" />
+ <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">
@@ -311,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="" />
@@ -373,7 +375,6 @@
</div>
</div>
</div>
-
</div>
</div>
@@ -422,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.total > 0)">
<div class="item two-swiper-slide swiper-slide">
<div class="line">
<div class="driver">{{ item.deviceType }}</div>
@@ -487,6 +488,7 @@
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,
@@ -673,10 +675,18 @@
}]),
]
const data = []
- 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) })
+ 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) })
+ } 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 })
+ }
+
const option = {
color: colors,
tooltip: {
@@ -858,11 +868,14 @@
})
}
+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
@@ -885,6 +898,8 @@
})
warningList.value = temp
// console.log('temp', warningList.value);
+ }, () => {
+ loading1.value = false
})
}
const tasClick = (val) => {
@@ -910,7 +925,7 @@
}
const changeMon = () => {
showJk.value = !showJk.value
- if(!showJk.value){
+ if (!showJk.value) {
activeJkIndex.value = -1
activeMenu.value = {}
}
@@ -948,7 +963,7 @@
initialSlide: 0,
direction: 'vertical', //绔栫洿鏂瑰悜
slidesPerView: 3,
- autoplay: autoplayFlag(dataList2.value, 3, 4000),
+ autoplay: autoplayFlag(dataList2.value.filter(i => i.total > 0), 3, 4000),
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -1581,7 +1596,7 @@
.safe_warning {
width: 786px;
margin-right: 20px;
-
+ position: relative;
/* one-swiper */
.one_swiper_wrap {
height: 140px;
@@ -1688,7 +1703,8 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 16px 24px;
+ padding-top: 16px;
+ padding-left: 24px;
.echart_wrap {
position: relative;
@@ -1724,7 +1740,7 @@
}
.list {
- margin-left: 36px;
+ margin-left: 32px;
flex: 1;
display: flex;
flex-direction: column;
--
Gitblit v1.9.3