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

修改页面样式

Browse Source
This commit is contained in:
GGJ
2024-11-27 16:32:13 +08:00
parent 52b41a3248
commit a008424927
7 changed files with 67 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,9 +99,9 @@
</el-form-item>
<el-form-item label="筛选" v-if="!dataSet.includes('_')">
<el-input style="width: 160px" v-model="searchValue" autocomplete="off" clearable
placeholder="请输入关键词"></el-input>
@input="handleSearch" placeholder="请输入关键词"></el-input>
</el-form-item>
<el-form-item label="偶数/奇数" v-if="oddAndEvenFlag && !dataSet.includes('_')">
<el-form-item label="谐波次数" v-if="oddAndEvenFlag && !dataSet.includes('_')">
<el-select v-model="oddAndEven" style="min-width: 120px !important">
<el-option v-for="item in oddAndEvenList" :key="item.value" :label="item.label"
:value="item.value" />
@@ -401,7 +401,7 @@ const tableData = ref<any[]>([])
const tableHeight = mainHeight(290).height
const tableHeightBox = mainHeight(310).height
const searchValue = ref('')
const TrendList=ref({})
const TrendList = ref({})
const oddAndEven = ref('1')
const datePickerRef = ref('1')
const oddAndEvenFlag = ref(false)
@@ -418,6 +418,10 @@ const formInline = reactive({
dataLevel: 'Secondary'
})
const oddAndEvenList = [
{
value: '3',
label: '全部',
},
{
value: '1',
label: '奇次',
@@ -426,10 +430,7 @@ const oddAndEvenList = [
value: '2',
label: '偶次',
},
{
value: '3',
label: '全部',
},
]
const detail = ref<any>(null)
@@ -561,6 +562,42 @@ const handleReturn = async () => {
})
// handleClick()
}
const handleSearch = () => {
let queryListName = queryList.value.filter((item: any) => item.id == formInline.targetType)
let list = tableData.value.filter((item: any) => {
if (item.otherName.includes(searchValue.value)) {
return item
}
})
if (oddAndEvenFlag.value) {
list = list.filter((item: any) => {
let str = item.otherName.split("次")[0]
queryListName[0].name == '间谐波电压含有率' ? str = str - 0.5 : ''
if (oddAndEven.value == '1') {
// 奇次
if (str % 2 != 0) {
return item
}
} else if (oddAndEven.value == '2') {
// 偶次
if (str % 2 == 0) {
return item
}
} else {
return item
}
})
}
nearRealTimeDataRef.value?.setData(list, queryListName)
}
const getDeviceDataTrend = (e: any) => {
detail.value = {
devId: deviceId.value,
@@ -606,7 +643,7 @@ const nodeClick = async (e: anyObj) => {
if (e.level == 2) return
deviceId.value = e?.pid
lineId.value = e?.id
TrendList.value=e
TrendList.value = e
if (!e) {
loading.value = false
return
@@ -1012,7 +1049,7 @@ const handleClick = async (tab?: any) => {
tableData.value = res.data
formInline.total = res.data.total
let queryListName = queryList.value.filter((item: any) => item.id == formInline.targetType)
let list = res.data.filter((item: any) => {
let list = tableData.value.filter((item: any) => {
if (item.otherName.includes(searchValue.value)) {
return item
}

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

@@ -20,6 +20,7 @@ const key: any = ref(0)
const column: any = ref([])
const setData = (data: any, targetType: any) => {
dataList.value = JSON.parse(JSON.stringify(data))

13
src/views/govern/device/control/tabs/components/realtrend.vue
View File

@@ -2,8 +2,8 @@
<template>
<div class="realtrend" v-loading="loading">
<div class="select">
<div class="mr10">偶数/奇数 </div>
<el-select v-model="selectValue" v-if="!loading" style="width: 100px" >
<div class="mr10">谐波次数 </div>
<el-select v-model="selectValue" v-if="!loading" style="width: 100px">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
@@ -76,6 +76,11 @@ const tableList: any = []
const selectValue = ref('1')
const options = [
{
value: '3',
label: '全部',
},
{
value: '1',
label: '奇次',
@@ -84,10 +89,6 @@ const options = [
value: '2',
label: '偶次',
},
{
value: '3',
label: '全部',
},
]
interface RowVO {

6
src/views/govern/device/control/tabs/trend.vue
View File

@@ -20,8 +20,8 @@
<el-option value="Secondary" label="二次值"></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据类型">
<el-select style="min-width: 120px !important" placeholder="请选择" v-model="searchForm.valueType" clearable>
<el-form-item label="统计类型">
<el-select style="min-width: 120px !important" placeholder="请选择" v-model="searchForm.valueType">
<el-option value="max" label="最大值"></el-option>
<el-option value="min" label="最小值"></el-option>
<el-option value="avg" label="平均值"></el-option>
@@ -108,7 +108,7 @@ searchForm.value = {
searchBeginTime: '',
searchEndTime: '',
dataLevel: 'Primary',
valueType:''
valueType: 'avg'
}
//统计指标
const indexOptions: any = ref([])

7
src/views/govern/device/control/testItemRecords.vue
View File

@@ -31,6 +31,9 @@ const dataList = ref([])
const key: any = ref(0)
const column: any = ref([
{ field: 'itemName', title: '名称', width: '100px' },
{ field: 'startTime', title: '数据起始时间', width: '140px' },
{ field: 'endTime', title: '数据结束时间', width: '140px' },
{ field: 'statisticalInterval', title: '统计间隔', width: '100px' },
{ field: 'voltageLevel', title: '电压等级', width: '100px' },
{ field: 'volConType', title: ' 电压接线方式', width: '100px' },
{ field: 'capacitySi', title: '用户协议容量', width: '100px' },
@@ -38,9 +41,7 @@ const column: any = ref([
{ field: 'capacitySscmin', title: '最小短路容量', width: '100px' },
{ field: 'capacitySt', title: '供电设备容量', width: '100px' },
{ field: 'location', title: ' 测试位置', width: '100px' },
{ field: 'startTime', title: '数据起始时间', width: '140px' },
{ field: 'endTime', title: '数据结束时间', width: '140px' },
{ field: 'statisticalInterval', title: '统计间隔', width: '100px' },
{ field: 'ct', title: 'CT', width: '70px' },
{ field: 'pt', title: 'PT', width: '70px' },

4
src/views/govern/device/manage/index.vue
View File

@@ -5,14 +5,14 @@
<div class="device-manage-right" v-if="deviceData">
<el-descriptions title="设备基本信息" class="mb10" :column="3" border>
<template #extra>
<el-button
<!-- <el-button
type="primary"
icon="el-icon-Share"
@click="openGroup"
:loading="getGroupLoading"
>
模版数据分组
</el-button>
</el-button> -->
</template>
<el-descriptions-item label="名称">
{{ deviceData.name }}

4
src/views/govern/manage/factory.vue
View File

@@ -22,13 +22,13 @@
<el-option label="CLD" value="CLD"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态">
<!-- <el-form-item label="状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择状态">
<el-option label="未注册" :value="1"></el-option>
<el-option label="注册" :value="2"></el-option>
<el-option label="接入" :value="3"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
</template>
<template v-slot:operation>
<el-button type="primary" @click="downLoadFile" class="ml10" icon="el-icon-Download">