From 9b74b477139659d69fcf321d160724aa1cd90ce0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/FireFighting.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index 96d6c56..e0f7382 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -351,11 +351,13 @@
const initWatergage = (id, item) => {
const myChart = echarts.init(document.getElementById(id))
var data_value = item.obj.value.replaceAll('Mpa', '')
- const startI = item.level.indexOf('-')
- const endI = item.level.indexOf('Mpa')
- let maxNum = item.level.slice(startI + 1, endI)
- let minNum = item.level.slice(0, startI)
- // let maxNum =
+ // const startI = item.level.indexOf('-')
+ // const endI = item.level.indexOf('Mpa')
+ // let maxNum = item.level.slice(startI + 1, endI)
+ // let minNum = item.level.slice(0, startI)
+ let maxNum = item.max
+ let minNum = item.min
+ // let maxNum =
const option = {
barMaxWidth: 3,
polar: {
@@ -517,10 +519,12 @@
}
const initLiquidlevel = (id, item) => {
const myChart = echarts.init(document.getElementById(id))
- const startI = item.level.indexOf('-')
- const endI = item.level.indexOf('M')
- let maxNum = item.level.slice(startI + 1, endI)
- let minNum = item.level.slice(0, startI)
+ // const startI = item.level.indexOf('-')
+ // const endI = item.level.indexOf('M')
+ // let maxNum = item.level.slice(startI + 1, endI)
+ // let minNum = item.level.slice(0, startI)
+ let maxNum = item.max
+ let minNum = item.min
let conNum = maxNum - minNum
let acNum = item.obj.value.replaceAll('M', '')
var data = (((acNum - minNum) / conNum) * 100).toFixed(0)
@@ -1119,7 +1123,7 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
-
+
}
.name {
@@ -1893,4 +1897,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3