From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/views/alarmmanage/measuremen/measuremen.vue | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/zhitan-vue/src/views/alarmmanage/measuremen/measuremen.vue b/zhitan-vue/src/views/alarmmanage/measuremen/measuremen.vue
index cbd3852..d831208 100644
--- a/zhitan-vue/src/views/alarmmanage/measuremen/measuremen.vue
+++ b/zhitan-vue/src/views/alarmmanage/measuremen/measuremen.vue
@@ -97,10 +97,13 @@
timeType: null,
dataTime: null,
nodeId: null,
+ modelCode: ''
})
import { getByNodeId, getCountInfo } from "@/api/alarmManage/alarmManage"
import { el } from "element-plus/es/locales.mjs"
+import { useRoute } from "vue-router"
+const route = useRoute()
let form = ref({})
let currentNode = ref()
@@ -114,6 +117,7 @@
handleTimeType(period.value[0].value)
getByNodeIdFun()
+ getCountInfoFun()
}
function getByNodeIdFun() {
@@ -155,10 +159,12 @@
// getByNodeIdFun()
function handleQuery() {
getByNodeIdFun()
+ getCountInfoFun()
}
function resetQuery() {
handleTimeType("YEAR")
getByNodeIdFun()
+ getCountInfoFun()
}
let dataArray = ref({
indexCount: 0,
@@ -166,14 +172,16 @@
monthCount: 0,
})
function getCountInfoFun() {
- getCountInfo(queryParams.value).then((res) => {
+ getCountInfo({
+ ...queryParams.value,
+ modelCode: route.query.modelCode,
+ }).then((res) => {
if (res.code == 200) {
dataArray.value = res.data
}
})
}
-getCountInfoFun()
function pieChart(Id, data, name) {
console.log(data)
let total = 0
@@ -274,11 +282,11 @@
axisPointer: {
type: "shadow",
},
- axisTick: {
- show: false,
- alignWithLabel: true,
- length: 5,
- },
+ // axisTick: {
+ // show: false,
+ // alignWithLabel: true,
+ // length: 5,
+ // },
// 鍧愭爣杞村埢搴︾嚎鏍峰紡
axisTick: {
show: false,
@@ -313,11 +321,11 @@
padding: [0, 0, 5, 0],
},
// 鍧愭爣杞村埢搴�
- axisTick: {
- show: false,
- alignWithLabel: true,
- length: 5,
- },
+ // axisTick: {
+ // show: false,
+ // alignWithLabel: true,
+ // length: 5,
+ // },
// 鍧愭爣杞村埢搴︾嚎鏍峰紡
axisTick: {
show: false,
--
Gitblit v1.9.3