Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备监控-治理设备添加值类型选择

Browse Source
This commit is contained in:
zhujiyan
2024-08-14 14:39:27 +08:00
parent 390252bf16
commit e9e8d61a67
4 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/cs-device-boot/EquipmentDelivery.ts
View File

@@ -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
})
}

1
src/api/cs-device-boot/csGroup.ts
View File

@@ -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',

17
src/views/govern/device/control/detail.vue
View File

@@ -12,6 +12,12 @@
<el-form-item label="日期">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
<el-form-item label="值类型">
<el-select v-model="form.dataLevel">
<el-option value="Primary" label="一次值"></el-option>
<el-option value="Secondary" label="二次值"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-Search" @click="init">查询</el-button>
</el-form-item>
@@ -48,7 +54,8 @@ const form: any = reactive({
remark: '',
routeName: '',
sort: 100,
type: 0
type: 0,
dataLevel: ''
})
const echartsData = ref<any>(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,7 +156,7 @@ const init = () => {
defineExpose({ open })
</script>
<style lang="scss">
.device-control-detail{
.device-control-detail {
padding-bottom: 10px;
display: flex;
flex-direction: column;

30
src/views/govern/device/control/index.vue
View File

@@ -90,14 +90,20 @@
<el-form-item label="日期" v-show="dataSet.indexOf('_history') != -1">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
<el-form-item label="值类型">
<el-select v-model="formInline.dataLevel">
<el-option value="Primary" label="一次值"></el-option>
<el-option value="Secondary" label="二次值"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-Search" @click="handleClick">查询</el-button>
</el-form-item>
</el-form>
<div style="height: calc(100vh - 300px)" v-if="tableData.length == 0" v-loading="tableLoading"></div>
<div
style="overflow: auto"
:style="{ height: tableHeight }"
v-loading="tableLoading"
v-if="
dataSet.indexOf('_trenddata') == -1 &&
dataSet.indexOf('_realtimedata') == -1 &&
@@ -140,7 +146,8 @@
MAX
</el-tag>
{{
item.children[0].maxValue === 3.1415956 || !item.children[0].maxValue
item.children[0].maxValue === 3.1415956 ||
typeof item.children[0].maxValue != 'number'
? '暂无数据'
: item.children[0].maxValue
}}
@@ -155,7 +162,8 @@
AVG
</el-tag>
{{
item.children[0].avgValue === 3.1415956 || !item.children[0].avgValue
item.children[0].avgValue === 3.1415956 ||
typeof item.children[0].avgValue != 'number'
? '暂无数据'
: item.children[0].avgValue
}}
@@ -169,9 +177,9 @@
>
MIN
</el-tag>
<!-- || !item.children[0].minValue -->
{{
item.children[0].minValue === 3.1415956
item.children[0].minValue === 3.1415956 ||
typeof item.children[0].minValue != 'number'
? '暂无数据'
: item.children[0].minValue
}}
@@ -287,12 +295,13 @@ const datePickerRef = ref()
const formInline = reactive({
searchValue: '',
pageNum: 1,
pageSize: 30,
pageSize: 20,
total: 0,
startTime: '',
endTime: '',
id: '',
lineId: ''
lineId: '',
dataLevel: ''
})
const detail = ref<any>(null)
//是否显示实时数据默认内容
@@ -332,6 +341,7 @@ const getDeviceDataTrend = (e: any) => {
detail.value = {
devId: deviceId.value,
lineId: lineId.value,
dataLevel: dataLevel.value,
...e
}
}
@@ -357,6 +367,7 @@ const handleaddDevice = () => {
//树节点点击事件
const deviceId: any = ref('')
const lineId: any = ref('')
const dataLevel: any = ref('')
const nodeClick = async (e: anyObj) => {
deviceId.value = e?.pid
lineId.value = e?.id
@@ -369,6 +380,8 @@ const nodeClick = async (e: anyObj) => {
formInline.lineId = e.id
await getDeviceData(e.pid, 'history', e.id).then((res: any) => {
deviceData.value = res.data
formInline.dataLevel = res.data.dataLevel
dataLevel.value = res.data.dataLevel
if (!res.data.dataSetList) {
dataSet.value = ''
tableData.value = []
@@ -585,8 +598,7 @@ watch(
)
watch(
() => tableData.value,
(val: any, oldVal: any) => {
}
(val: any, oldVal: any) => {}
)
onMounted(() => {})
</script>