修改测试bug

This commit is contained in:
GGJ
2024-12-06 16:11:33 +08:00
parent 5db2b1428c
commit 366f561aa5
18 changed files with 541 additions and 456 deletions

View File

@@ -41,8 +41,8 @@
<Table ref="tableRef" />
</div>
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="view2">
<waveForm senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
<waveForm ref="waveFormRef" senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
</div>
</div>
</template>
@@ -67,7 +67,7 @@ const interfereoption = dictData.getBasicData('Interference_Source')
const eventList = dictData.getBasicData('Event_Statis')
const view = ref(true)
const view2 = ref(false)
const waveFormRef = ref()
const tableStore = new TableStore({
url: '/event-boot/transient/getTransientValue',
method: 'POST',
@@ -129,20 +129,24 @@ const tableStore = new TableStore({
icon: 'el-icon-Plus',
render: 'basicButton',
click: async row => {
row.loading = true
boxoList.value = row
await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
.then(res => {
row.loading = false
if (res != undefined) {
wp.value = res.data
view.value = false
view2.value = true
}
})
.catch(() => {
row.loading = false
})
view.value = false
setTimeout(() => {
waveFormRef.value.open(row)
},100)
// row.loading = true
// boxoList.value = row
// await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
// .then(res => {
// row.loading = false
// if (res != undefined) {
// wp.value = res.data
// view.value = false
// view2.value = true
// }
// })
// .catch(() => {
// row.loading = false
// })
}
},
{
@@ -150,7 +154,7 @@ const tableStore = new TableStore({
title: '暂无波形',
type: '',
disabled: row => {
return row.fileFlag == 1
return row.fileFlag != 0
},
icon: 'el-icon-Plus',
render: 'basicButton'

View File

@@ -46,10 +46,7 @@ const dealStateList = ref([
label: '未解决',
value: '0'
},
{
label: '全部',
value: '1'
}
])
const tableStore = new TableStore({
url: '/supervision-boot/SupervisionUserComplaint/list',

View File

@@ -62,10 +62,10 @@
</el-form-item> -->
</template>
<template #operation>
<el-button icon="el-icon-Plus" :disabled="flag != '2'" type="primary" @click="launch('发起预警单')">
<el-button icon="el-icon-Plus" :disabled="flag > 2" type="primary" @click="launch('发起预警单')">
发起预警单
</el-button>
<el-button icon="el-icon-Plus" :disabled="flag != '2'" type="primary" @click="launch('发起告警单')">
<el-button icon="el-icon-Plus" :disabled="flag > 2" type="primary" @click="launch('发起告警单')">
发起告警单
</el-button>
</template>

View File

@@ -47,10 +47,7 @@ const dealStateList = ref([
label: '未解决',
value: '0'
},
{
label: '全部',
value: '1'
}
])
const tableStore = new TableStore({
url: '/supervision-boot/surveyTest/pageProblemSurvey',

View File

@@ -48,10 +48,7 @@ const dealStateList = ref([
label: '未解决',
value: '0'
},
{
label: '全部',
value: '1'
}
])
const tableStore = new TableStore({
url: '/supervision-boot/lineRunTestProblem/pageProblem',

View File

@@ -11,7 +11,7 @@
</el-form-item>
<el-form-item label="筛选">
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入关键字"
clearable></el-input>
clearable maxlength="32" show-word-limit></el-input>
</el-form-item>
</template>
<template #operation>

View File

@@ -10,7 +10,7 @@
</el-select>
</el-form-item>
<el-form-item label="筛选">
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入关键字" clearable></el-input>
<el-input v-model="tableStore.table.params.searchValue" placeholder="请输入关键字" clearable maxlength="32" show-word-limit></el-input>
</el-form-item>
</template>
<template #operation>

View File

@@ -10,7 +10,7 @@
<el-form-item label="是否解决">
<el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
<el-option label="未解决" value="0"></el-option>
<el-option label="全部" value="1"></el-option>
<!-- <el-option label="全部" value="1"></el-option> -->
</el-select>
</el-form-item>
</template>

View File

@@ -116,26 +116,28 @@
<el-input v-model.trim="form.latitude" :disabled="form.customSubstationFlag == 0" type="text"
placeholder="请输入纬度" />
</el-form-item>
<el-form-item for="-" label="终端编码:" prop="monitoringTerminalCode">
<el-input v-model.trim="form.monitoringTerminalCode" autocomplete="off" placeholder="请输入终端编码"
@input="encode" />
</el-form-item>
<el-form-item for="-" label="终端名称:" prop="monitoringTerminalName">
<el-input v-model.trim="form.monitoringTerminalName" autocomplete="off" placeholder="请输入终端名称" />
</el-form-item>
<el-form-item for="-" label="终端型号:" prop="terminalType">
<el-select v-model="form.terminalType" filterable clearable style="width: 100%" placeholder="请选择终端型号">
<el-option v-for="item in terminalTypeList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item for="-" label="终端名称:" prop="monitoringTerminalName">
<el-input v-model.trim="form.monitoringTerminalName" autocomplete="off" placeholder="请输入终端名称" />
</el-form-item>
<el-form-item for="-" label="通讯类型:">
<el-select v-model="form.frontType" clearable style="width: 100%" placeholder="请选择通讯类型">
<el-option v-for="item in frontTypeList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item for="-" label="终端编码:" prop="monitoringTerminalCode">
<el-input v-model.trim="form.monitoringTerminalCode" autocomplete="off" placeholder="请输入终端编码"
@change="encode" />
</el-form-item>
<el-form-item v-if="false" for="-" label="通讯状态:" prop="communicationStatus">
<el-select v-model="form.communicationStatus" clearable style="width: 100%" placeholder="请选择通讯状态"
:disabled="true">

View File

@@ -46,10 +46,7 @@ const dealStateList = ref([
label: '未解决',
value: '0'
},
{
label: '全部',
value: '1'
}
])
const tableStore = new TableStore({
url: '/supervision-boot/SupervisionUserComplaint/list',

View File

@@ -47,10 +47,7 @@ const dealStateList = ref([
label: '未解决',
value: '0'
},
{
label: '全部',
value: '1'
}
])
const tableStore = new TableStore({
url: '/supervision-boot/surveyTest/pageProblemSurvey',

View File

@@ -48,10 +48,7 @@ const dealStateList = ref([
label: '未解决',
value: '0'
},
{
label: '全部',
value: '1'
}
])
const tableStore = new TableStore({
url: '/supervision-boot/lineRunTestProblem/pageProblem',

View File

@@ -79,7 +79,7 @@
<Table ref="tableRef" />
</div>
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
<waveForm senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
<waveForm ref="waveFormRef" senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
</div>
<addForm ref="addFormRef" @onSubmit="tableStore.index()" />
</div>
@@ -103,8 +103,7 @@ defineOptions({
})
const dictData = useDictData()
const adminInfo = useAdminInfo()
const waveFormRef=ref()
const pageHeight = mainHeight(20)
const view = ref(true)
const addFormRef = ref()
@@ -216,19 +215,23 @@ const tableStore = new TableStore({
icon: 'el-icon-Plus',
render: 'basicButton',
click: async row => {
row.loading = true
boxoList.value = row
await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
.then(res => {
row.loading = false
if (res != undefined) {
wp.value = res.data
view.value = false
}
})
.catch(() => {
row.loading = false
})
// row.loading = true
view.value = false
setTimeout(() => {
waveFormRef.value.open(row)
},100)
// boxoList.value = row
// await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
// .then(res => {
// row.loading = false
// if (res != undefined) {
// wp.value = res.data
// view.value = false
// }
// })
// .catch(() => {
// row.loading = false
// })
}
},
{

View File

@@ -31,8 +31,8 @@
</vxe-table>
</el-dialog>
</div>
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="view2">
<waveForm senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
<waveForm ref="waveFormRef" senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
</div>
</div>
</template>
@@ -59,7 +59,7 @@ const loading = ref(false)
const view = ref(true)
const view2 = ref(false)
const TableHeaderRef = ref()
const waveFormRef = ref()
const tableStore = new TableStore({
url: '/advance-boot/process/querySagEventsPage',
method: 'POST',
@@ -126,20 +126,24 @@ const tableStore = new TableStore({
icon: 'el-icon-Plus',
render: 'basicButton',
click: async row => {
row.loading = true
boxoList.value = row
await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
.then(res => {
row.loading = false
if (res != undefined) {
wp.value = res.data
view.value = false
view2.value = true
}
})
.catch(() => {
row.loading = false
})
view.value = false
setTimeout(() => {
waveFormRef.value.open(row)
},100)
// row.loading = true
// boxoList.value = row
// await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
// .then(res => {
// row.loading = false
// if (res != undefined) {
// wp.value = res.data
// view.value = false
// view2.value = true
// }
// })
// .catch(() => {
// row.loading = false
// })
}
},
{
@@ -147,7 +151,7 @@ const tableStore = new TableStore({
title: '暂无波形',
type: '',
disabled: row => {
return row.fileFlag == 1
return row.fileFlag != 0
},
icon: 'el-icon-Plus',
render: 'basicButton'

View File

@@ -1,13 +1,19 @@
<template>
<div>
<!-- 表头 -->
<TableHeader date-picker>
<template v-slot:operation>
<el-button :icon='Download' type='primary' @click='download'>波形下载</el-button>
</template>
</TableHeader>
<!-- 表格 -->
<Table ref='tableRef' :checkboxConfig='checkboxConfig' />
<div v-show="view">
<!-- 表头 -->
<TableHeader date-picker>
<template v-slot:operation>
<el-button :icon='Download' type='primary' @click='download'>波形下载</el-button>
</template>
</TableHeader>
<!-- 表格 -->
<Table ref='tableRef' :checkboxConfig='checkboxConfig' />
</div>
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
<waveForm ref="waveFormRef" senior @backbxlb="backbxlb" />
</div>
</div>
</template>
<script setup lang='ts'>
@@ -21,9 +27,13 @@ import { mainHeight } from '@/utils/layout'
import { useMonitoringPoint } from '@/stores/monitoringPoint'
import { useDictData } from '@/stores/dictData'
import { checkUser } from '@/api/user-boot/user'
import waveForm from '@/components/echarts/waveForm.vue'
import { VxeTablePropTypes } from 'vxe-table'
import { downloadWaveFile, getMonitorEventAnalyseWave } from '@/api/event-boot/transient'
const view = ref(true)
const waveFormRef = ref()
const view2 = ref(false)
const pageHeight = mainHeight(20)
const dictData = useDictData()
const eventTypeOptions = dictData.getBasicData('Event_Statis')
const monitoringPoint = useMonitoringPoint()
@@ -53,7 +63,7 @@ const tableStore = new TableStore({
buttons: [
{
name: 'edit',
title: '波形查看',
title: '波形分析',
type: 'primary',
icon: 'el-icon-Lock',
render: 'basicButton',
@@ -61,15 +71,29 @@ const tableStore = new TableStore({
return row.fileFlag === 0
},
click: row => {
getMonitorEventAnalyseWave({
id: row.eventId,
systemType: 0,
type: 0
}).then(res => {
console.log(res)
ElMessage.error('暂无可下载的波形文件!')
})
// getMonitorEventAnalyseWave({
// id: row.eventId,
// systemType: 0,
// type: 0
// }).then(res => {
// console.log(res)
// ElMessage.error('暂无可下载的波形文件!')
// })
view.value = false
setTimeout(() => {
waveFormRef.value.open(row)
}, 100)
}
},
{
name: 'edit',
title: '暂无波形',
type: '',
disabled: row => {
return row.fileFlag != 0
},
icon: 'el-icon-Plus',
render: 'basicButton'
}
]
}
@@ -96,6 +120,10 @@ const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig<any>>({
return row.fileFlag === 1
}
})
const backbxlb = () => {
view.value = true
view2.value = false
}
const download = () => {
if (!tableStore.table.selection.length) {
ElMessage.warning('请选择数据')