From e9e8d61a677c956b75ddcf289cecd5888b64f96d Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 14 Aug 2024 14:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7-=E6=B2=BB?=
=?UTF-8?q?=E7=90=86=E8=AE=BE=E5=A4=87=E6=B7=BB=E5=8A=A0=E5=80=BC=E7=B1=BB?=
=?UTF-8?q?=E5=9E=8B=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/cs-device-boot/EquipmentDelivery.ts | 10 +++----
src/api/cs-device-boot/csGroup.ts | 1 +
src/views/govern/device/control/detail.vue | 19 +++++++++----
src/views/govern/device/control/index.vue | 30 ++++++++++++++-------
4 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/api/cs-device-boot/EquipmentDelivery.ts b/src/api/cs-device-boot/EquipmentDelivery.ts
index 4b585bc..481a767 100644
--- a/src/api/cs-device-boot/EquipmentDelivery.ts
+++ b/src/api/cs-device-boot/EquipmentDelivery.ts
@@ -1,7 +1,7 @@
import createAxios from '@/utils/request'
// 装置基础数据和模板数据
-export function getDeviceData(deviceId: string, type: string, lineId = '') {
+export function getDeviceData(deviceId: string, type: string, lineId:string) {
let form = new FormData()
form.append('deviceId', deviceId)
form.append('lineId', lineId)
@@ -49,7 +49,7 @@ export function uploadOffLineDataFile(data: any) {
export function getDeviceTrendDataGroup() {
return createAxios({
url: '/cs-device-boot/csGroup/getDeviceTrendDataGroup',
- method: 'GET',
+ method: 'GET'
})
}
@@ -66,7 +66,7 @@ export function getDeviceTrendData(query: any) {
export function getGroupPortableStatistical() {
return createAxios({
url: '/cs-device-boot/csGroup/getGroupPortableStatistical',
- method: 'GET',
+ method: 'GET'
})
}
@@ -75,6 +75,6 @@ export function getDeviceHarmonicSpectrumData(data: any) {
return createAxios({
url: '/cs-device-boot/csGroup/getDeviceHarmonicSpectrumData',
method: 'POST',
- data:data
+ data: data
})
-}
\ No newline at end of file
+}
diff --git a/src/api/cs-device-boot/csGroup.ts b/src/api/cs-device-boot/csGroup.ts
index 73e0f1a..c50d04a 100644
--- a/src/api/cs-device-boot/csGroup.ts
+++ b/src/api/cs-device-boot/csGroup.ts
@@ -41,6 +41,7 @@ export function deviceRtData(data: any) {
form.append('pageNum', data.pageNum)
form.append('pageSize', data.pageSize)
form.append('searchValue', data.searchValue)
+ form.append('dataLevel',data.dataLevel)
return createAxios({
url: '/cs-device-boot/csGroup/deviceRtData',
method: 'POST',
diff --git a/src/views/govern/device/control/detail.vue b/src/views/govern/device/control/detail.vue
index 6feab29..7a00fae 100644
--- a/src/views/govern/device/control/detail.vue
+++ b/src/views/govern/device/control/detail.vue
@@ -12,6 +12,12 @@
+
+
+
+
+
+
查询
@@ -48,7 +54,8 @@ const form: any = reactive({
remark: '',
routeName: '',
sort: 100,
- type: 0
+ type: 0,
+ dataLevel: ''
})
const echartsData = ref(null)
const dialogVisible = ref(false)
@@ -59,12 +66,14 @@ onMounted(() => {
const init = () => {
echartsData.value = null
loading.value = true
+ form.dataLevel = props.detail.dataLevel
getDeviceDataTrend({
- devId:props.detail.devId,
+ devId: props.detail.devId,
endTime: datePickerRef.value.timeValue[1],
lineId: props.detail.lineId,
startTime: datePickerRef.value.timeValue[0],
- statisticalParams: props.detail.children
+ statisticalParams: props.detail.children,
+ dataLevel: form.dataLevel
}).then(res => {
if (res.data.length && res.data[0].length) {
let arr: any[] = []
@@ -147,9 +156,9 @@ const init = () => {
defineExpose({ open })
\ No newline at end of file
+
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index deae0bf..dfc7e57 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -90,14 +90,20 @@
+
+
+
+
+
+
查询
+