From 39abebc6d54083556a393441e0628bc3d93b46c7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 25 Oct 2025 13:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v7.0/7.0.2' into feature/v7.0/7.0.2
---
src/views/wel/components/statistics.vue | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/views/wel/components/statistics.vue b/src/views/wel/components/statistics.vue
index ab9b6c4..cd08e27 100644
--- a/src/views/wel/components/statistics.vue
+++ b/src/views/wel/components/statistics.vue
@@ -67,7 +67,7 @@
</template>
<template v-else-if="test[item]?.name == '机巢保险'">
<div
- v-for="statusKey in [1, 0]"
+ v-for="statusKey in [1, 0,2]"
:key="statusKey"
class="status-item"
:class="getStatusStyle(test[item]?.name, statusKey)"
@@ -84,6 +84,28 @@
<span class="count">
{{ newtitleData[item].status_map[statusKey] }}
{{ test[item]?.name === '无人机' ? '架' : '个' }}
+ </span>
+ </div>
+ </template>
+ <template v-else-if="test[item]?.name == '无人机流量'">
+ <div
+ v-for="statusKey in [ 0,2,1]"
+ :key="statusKey"
+ class="status-item"
+ :class="getStatusStyle(test[item]?.name, statusKey)"
+ :style="{ color: getStatusColor(test[item]?.name, statusKey) }"
+ >
+ <span
+ class="indicator"
+ :style="{
+ backgroundColor: getStatusBackground(test[item]?.name, statusKey),
+ color: getStatusColor(test[item]?.name, statusKey),
+ }"
+ ></span>
+ <span class="label">{{ getStatusLabel(test[item]?.name, statusKey) }}</span>
+ <span class="count">
+ {{ newtitleData[item].status_map[statusKey] }}
+ {{ test[item]?.name === '无人机流量' ? '架' : '个' }}
</span>
</div>
</template>
@@ -179,7 +201,7 @@
};
const flowStatus = {
0: '无忧',
- 1: '到期',
+ 1: '临期',
2: '不足',
};
const monitorStatus = {
@@ -190,6 +212,7 @@
const insureStatus = {
0: '临近到期',
1: '正常期限',
+ 2:'保险过期'
};
const moveListStatus = {
'-1': '离线中',
@@ -199,13 +222,14 @@
const statusStyles = {
机巢保险: {
0: { class: 'expired', color: '#FFA600', background: '#FFA600' },
- 1: { class: 'normal', color: 'rgba(27, 148, 255, 1)', background: 'rgba(27, 148, 255, 1)' },
+ 1: { class: 'normal', color: 'rgba(0, 180, 69, 1)', background: 'rgba(0, 180, 69, 1)' },
+ 2: { class: 'flying',color: 'rgba(255, 36, 36, 1)', background: 'rgba(255, 36, 36, 1)' },
},
无人机流量: {
0: { class: 'offline', color: 'rgba(0, 180, 69, 1)', background: 'rgba(0, 180, 69, 1)' },
- 1: { class: 'flying', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
- 2: { class: 'flying', color: 'rgba(255, 36, 36, 1)', background: 'rgba(255, 36, 36, 1)' },
+ 1: { class: 'flying', color: 'rgba(255, 36, 36, 1)', background: 'rgba(255, 36, 36, 1)' },
+ 2: { class: 'flying', color: '#FFA600', background: '#FFA600' },
},
监控设备: {
0: { class: 'offline', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
--
Gitblit v1.9.3