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

数据类型-数据类型添加conType字段

Browse Source
This commit is contained in:
GGJ
2024-12-02 09:14:28 +08:00
parent 6522aaa499
commit 2ed728ee71
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@
<el-input style="width: 160px" v-model="searchValue" autocomplete="off" clearable <el-input style="width: 160px" v-model="searchValue" autocomplete="off" clearable
@input="handleSearch" placeholder="请输入关键词"></el-input> @input="handleSearch" placeholder="请输入关键词"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="谐波次数" v-if="oddAndEvenFlag && !dataSet.includes('_')"> <el-form-item label="谐波次数" v-show="oddAndEvenFlag && !dataSet.includes('_')">
<el-select v-model="oddAndEven" style="min-width: 120px !important"> <el-select v-model="oddAndEven" style="min-width: 120px !important">
<el-option v-for="item in oddAndEvenList" :key="item.value" :label="item.label" <el-option v-for="item in oddAndEvenList" :key="item.value" :label="item.label"
:value="item.value" /> :value="item.value" />
@@ -631,9 +631,11 @@ const deviceId: any = ref('')
const lineId: any = ref('') const lineId: any = ref('')
const dataLevel: any = ref('') const dataLevel: any = ref('')
const nodeClick = async (e: anyObj) => { const nodeClick = async (e: anyObj) => {
console.log("🚀 ~ nodeClick ~ e:", e)
searchValue.value = '' searchValue.value = ''
await queryDictType({ await queryDictType({
lineId: e?.id lineId: e?.id,
conType: e.conType
}).then(res => { }).then(res => {
oddAndEvenFlag.value = false oddAndEvenFlag.value = false
queryList.value = res.data queryList.value = res.data

2
src/views/govern/device/control/nearRealTimeData.vue
View File

@@ -9,7 +9,7 @@
<vxe-table v-if="flag1" auto-resize :data="dataList1" <vxe-table v-if="flag1" auto-resize :data="dataList1"
v-bind="defaultAttribute" :key="key" :mergeCells="mergeCells"> v-bind="defaultAttribute" :key="key" :mergeCells="mergeCells">
<vxe-column field="otherName" title="名称" width="350"></vxe-column> <vxe-column field="otherName" title="名称" width="350"></vxe-column>
<vxe-column field="valueM" title="其他数据"></vxe-column> <vxe-column field="valueM" title="数据"></vxe-column>
</vxe-table> </vxe-table>
<el-empty :style="height" description="暂无数据"v-if="!flag && !flag1" ></el-empty> <el-empty :style="height" description="暂无数据"v-if="!flag && !flag1" ></el-empty>

9
src/views/govern/setting/statisticalType/binding.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标" <el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标"
style="width: 1040px" @closed="close"> style="width: 1200px" @closed="close">
<el-scrollbar style="padding-right: 0"> <el-scrollbar style="padding-right: 0">
<div class="box"> <div class="box">
<div class="box-left"> <div class="box-left">
@@ -450,6 +450,13 @@ defineExpose({ open })
} }
} }
} }
.hide-txt {
width: 150px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
} }
</style> </style>