Commit 32bc95a5 authored by liwei's avatar liwei

修改了bug

parent 43ea53e8
......@@ -138,69 +138,69 @@ function getNumber() {
/** 导出按钮操作 */
const handleExport = () => {
const item = {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
if (item.alarmType === undefined){
item.alarmType = ''
}
console.log('selectedBtn.value:', selectedBtn.value)
if (selectedBtn.value === 1) {
console.log('11111')
exportMoveMonitorNewData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '动环监视最新信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
} else if (selectedBtn.value === 2) {
console.log('22222')
exportMoveMonitorHistoryData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '动环监视历史信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
} else if (selectedBtn.value === 3) {
console.log('33333')
exportMoveMonitorAlarmData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '动环监视报警信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
}
// const item = {
// stationId: queryParams.stationId,
// alarmStatus: queryParams.alarmStatus,
// alarmType: queryParams.alarmType,
// beginTime: queryParams.beginTime,
// endTime: queryParams.endTime,
// }
// if (item.stationId === undefined){
// item.stationId = ''
// }
// if (item.beginTime == null){
// item.beginTime = ''
// }
// if (item.endTime == null){
// item.endTime = ''
// }
// if (item.alarmStatus === undefined){
// item.alarmStatus = ''
// }
// if (item.alarmType === undefined){
// item.alarmType = ''
// }
// console.log('selectedBtn.value:', selectedBtn.value)
// if (selectedBtn.value === 1) {
// console.log('11111')
// exportMoveMonitorNewData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '动环监视最新信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// } else if (selectedBtn.value === 2) {
// console.log('22222')
// exportMoveMonitorHistoryData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '动环监视历史信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// } else if (selectedBtn.value === 3) {
// console.log('33333')
// exportMoveMonitorAlarmData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '动环监视报警信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// }
console.log('导出:', queryParams.value);
};
......
......@@ -202,69 +202,69 @@ function getNumber() {
/** 导出按钮操作 */
const handleExport = () => {
const item = {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
thermalAlarmType: queryParams.thermalAlarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
if (item.thermalAlarmType === undefined){
item.thermalAlarmType = ''
}
console.log('selectedBtn.value:', selectedBtn.value)
if (selectedBtn.value === 1) {
console.log('11111')
exportPipelineTempNewData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度最新信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
} else if (selectedBtn.value === 2) {
console.log('22222')
exportPipelineTempHistoryData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度历史信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
} else if (selectedBtn.value === 3) {
console.log('33333')
exportPipelineTempAlarmData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度报警信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
}
// const item = {
// stationId: queryParams.stationId,
// alarmStatus: queryParams.alarmStatus,
// thermalAlarmType: queryParams.thermalAlarmType,
// beginTime: queryParams.beginTime,
// endTime: queryParams.endTime,
// }
// if (item.stationId === undefined){
// item.stationId = ''
// }
// if (item.beginTime == null){
// item.beginTime = ''
// }
// if (item.endTime == null){
// item.endTime = ''
// }
// if (item.alarmStatus === undefined){
// item.alarmStatus = ''
// }
// if (item.thermalAlarmType === undefined){
// item.thermalAlarmType = ''
// }
// console.log('selectedBtn.value:', selectedBtn.value)
// if (selectedBtn.value === 1) {
// console.log('11111')
// exportPipelineTempNewData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '管道温度最新信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// } else if (selectedBtn.value === 2) {
// console.log('22222')
// exportPipelineTempHistoryData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '管道温度历史信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// } else if (selectedBtn.value === 3) {
// console.log('33333')
// exportPipelineTempAlarmData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '管道温度报警信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// }
console.log('导出:', queryParams.value);
};
......
......@@ -45,7 +45,7 @@ function selectRow(row) {
selectedRow.value = row;
selectedRowIndex.value = index;
audioUrl.value = row.businessId
playAudio(audioUrl.value)
// playAudio(audioUrl.value)
}
const status = ref(false)
const audioPlayer = ref(null);
......@@ -349,22 +349,6 @@ function getDataByParams(){
if (item.endTime == null){
item.endTime = ''
}
console.log('item-----------',item)
/* getRecycleListNewData(item).then(res => {
if(res.total === 0){
ElMessage.success({
message: '数据为空!'
})
}
if(res.total === 500){
ElMessage.error({
message: '网络错误!'
})
}
RecyclePumpData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})*/
RecyclePumpData.value = buscirculatingpumpList.rows
Page.total = buscirculatingpumpList.total
Page.rows = buscirculatingpumpList.pageSize
......@@ -390,7 +374,7 @@ function getDataNew(item) {
Page.total = buscirculatingpumpList.total
Page.rows = buscirculatingpumpList.pageSize
}
getDataNew()
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
......
......@@ -79,7 +79,9 @@ const queryParams = reactive({
// 搜索
const Page = reactive({total: 0, rows: 20, page: 1});
const searchData = ref({});
const search = () => {
function search(){
console.log('111111')
let stationId = ''
if (queryParams.stationId === undefined){
stationId = queryParams.stationId = ''
......@@ -127,65 +129,65 @@ function getNumber() {
/** 导出按钮操作 */
const handleExport = () => {
const item = {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
if (item.stationId === undefined) {
item.stationId = ''
}
if (item.beginTime == null) {
item.beginTime = ''
}
if (item.endTime == null) {
item.endTime = ''
}
if (item.alarmStatus === undefined) {
item.alarmStatus = ''
}
console.log('selectedBtn.value:', selectedBtn.value)
if (selectedBtn.value === 1) {
console.log('11111')
exportRecyclePumpNewData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '循环泵最新信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
} else if (selectedBtn.value === 2) {
console.log('22222')
exportRecyclePumpHistoryData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '循环泵历史信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
} else if (selectedBtn.value === 3) {
console.log('33333')
exportRecyclePumpAlarmData(item).then(res => {
const blob = new Blob([res])
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '循环泵报警信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
}
// const item = {
// stationId: queryParams.stationId,
// alarmStatus: queryParams.alarmStatus,
// beginTime: queryParams.beginTime,
// endTime: queryParams.endTime,
// }
// if (item.stationId === undefined) {
// item.stationId = ''
// }
// if (item.beginTime == null) {
// item.beginTime = ''
// }
// if (item.endTime == null) {
// item.endTime = ''
// }
// if (item.alarmStatus === undefined) {
// item.alarmStatus = ''
// }
// console.log('selectedBtn.value:', selectedBtn.value)
// if (selectedBtn.value === 1) {
// console.log('11111')
// exportRecyclePumpNewData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '循环泵最新信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// } else if (selectedBtn.value === 2) {
// console.log('22222')
// exportRecyclePumpHistoryData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '循环泵历史信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// } else if (selectedBtn.value === 3) {
// console.log('33333')
// exportRecyclePumpAlarmData(item).then(res => {
// const blob = new Blob([res])
// const downloadElement = document.createElement('a')
// const href = window.URL.createObjectURL(blob)// 创建下载的链接
// downloadElement.href = href
// downloadElement.download = '循环泵报警信息' + '.xls' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// }
console.log('导出:', queryParams.value);
};
......@@ -270,37 +272,6 @@ function getEnterprise() {
}
}
// function getSupplys(){
// loading.value = true;
// // tableData.length = 0;
// options.length = 0;
// const result = store.getters.getEnterprise();
// if (result) {
// console.log('result:',result)
// result.forEach(element=>{
// let allItems = []
// if(element.enterpriseId === enterpriseId.value){
// if(element.enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){
// element.serviceCenterList.forEach(center=>{//遍历一级目录下的
// center.supplyList.forEach(supply => {//拿到一级目录下的然后遍历它二级目录下的
// supply.transferList.forEach(unit => {
// allItems.push({ stationId: unit.stationId, stationName: unit.unitName,supplyId: unit.supplyId,unitId:unit.unitId})
// })
// });
// });
// console.log('allItems:',allItems)
// }else{
// element.supplyList.forEach(supply => {
// supply.transferList.forEach(unit => {
// allItems.push({ stationId: unit.stationId, stationName: unit.unitName,supplyId: unit.supplyId,unitId:unit.unitId})
// })
// })
// }
// }
// options.value = allItems;
// });
// }
// }
function getSupplys(){
loading.value = true;
// tableData.length = 0;
......@@ -387,14 +358,6 @@ watch(
<el-form-item label="换热站:">
<el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="min-width: 210px;" />
<!-- <el-select v-model="queryParams.stationId" placeholder="请选择" style="min-width: 200px" filterable clearable>-->
<!-- <el-option-->
<!-- v-for="item in options"-->
<!-- :key="item.value"-->
<!-- :label="item.stationName"-->
<!-- :value="item.stationId">-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
......
......@@ -346,14 +346,18 @@ function handleAddButton(row) {
//修改按钮触发
function handleUpdateButton(row) {
getVoiceCommandsLocationDetail(row.businessId).then(res => {
addOrUpdateForm.value = res.data
formTitle.value = '修改'
dialogFormVisible.value = true
}).catch((err) => {
console.log('err:', err)
dialogFormVisible.value = false
})
addOrUpdateForm.value = {}
addOrUpdateForm.value = row
formTitle.value = '修改'
dialogFormVisible.value = true
// getVoiceCommandsLocationDetail(row.businessId).then(res => {
// addOrUpdateForm.value = res.data
// formTitle.value = '修改'
// dialogFormVisible.value = true
// }).catch((err) => {
// console.log('err:', err)
// dialogFormVisible.value = false
// })
}
//删除按钮
......@@ -364,19 +368,10 @@ function deleteButton(row) {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteVoiceCommandsLocation(row.businessId).then(res => {
if (res.code === 200) {
ElMessage.success({
message: '删除成功!'
});
loadData()
} else {
ElMessage.error({
message: '删除失败!'
});
loadData()
}
})
ElMessage.success({
message: '删除成功!'
});
loadData()
}).catch(() => {
ElMessage.info({
message: '已取消删除'
......@@ -565,7 +560,7 @@ const handleSortChange = (data) => {
Page.rows = busVoiceCommandsLocationList.pageSize
Page.total = busVoiceCommandsLocationList.total
};
loadData()
const rules = reactive({
macAddress: [
{required: true, message: '请输入MAC地址', trigger: 'blur'},
......
......@@ -368,6 +368,7 @@ const handleSortChange = (data) => {
Page.rows = busVoiceCommandsList.pageSize
Page.total = busVoiceCommandsList.total
};
loadData()
</script>
<template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment