Skip to content

W
web-project
Commit 5157e779 authored by liwei's avatar liwei
Browse files
Options

修改了AI工作站的查询bug和导出bug

parent bf8c1405
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 82 deletions
src/api/AIStation/PipelineTemp.js
View file @ 5157e779
......@@ -9,7 +9,7 @@ export const getPipListHistoryData = (item) =>{
}
export const getPipListAlarmData = (item) =>{
return httpTwo.get(`/buspipelinetemperaturealarm/list?page=${item.page}&rows=${item.size}&thermalAlarmType=${item.alarmType}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.get(`/buspipelinetemperaturealarm/list?page=${item.page}&rows=${item.size}&thermalAlarmType=${item.thermalAlarmType}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
}
export const getPipAlarmNumber = () =>{
......
src/api/AIStation/VoiceCommand.js
View file @ 5157e779
......@@ -2,7 +2,7 @@ import httpTwo from '../httpTwo'
export const getVoiceCommandsData = (item) => {
return httpTwo.get(`/busVoiceCommands/list?page=${item.page}&rows=${item.rows}&stationId=${item.stationId}&ipAddress=${item.ipAddress}&macAddress=${item.macAddress}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.get(`/busVoiceCommands/list?page=${item.page}&rows=${item.rows}&stationId=${item.stationId}&ipAddress=${item.ipAddress}&macAddress=${item.macAddress}&beginTime=${item.beginTime}&endTime=${item.endTime}&column=${item.column}&order=${item.order}`)
}
export const addVoiceCommands = (item) => {
......
src/views/AIStation/ExtinguisherPage/index.vue
View file @ 5157e779
......@@ -182,7 +182,6 @@ const handleExport = () => {
// 重置
const resetSearch = () => {
console.log("怎么不执行重置啊？")
queryParams.alarmStatus = ''
queryParams.beginTime = ''
queryParams.endTime = ''
......@@ -260,18 +259,12 @@ watch(
if(route.path === '/AIStation/Extinguisher') {
// 路由变化，执行相应操作
handleGetAIToken();
// setTimeout(() => {
// if(localStorage.getItem('AIToken')){
// getNumber()
// getData()
// }
// }, 500);
// 轮询检测 localStorage 是否更新
const checkAIToken = setInterval(() => {
if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询
getNumber();
getData();
// getData();
resetSearch();
}
}, 100); // 每100ms检查一次
console.log('route.path', route.path)
......@@ -305,7 +298,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.beginTime"
......@@ -316,7 +309,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 180px"
v-model="queryParams.endTime"
......
src/views/AIStation/MoveMonitorPage/index.vue
View file @ 5157e779
......@@ -142,7 +142,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度最新信息' + '.xls' // 下载后文件名
downloadElement.download = '动环监视最新信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -155,7 +155,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度历史信息' + '.xls' // 下载后文件名
downloadElement.download = '动环监视历史信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -168,7 +168,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度报警信息' + '.xls' // 下载后文件名
downloadElement.download = '动环监视报警信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -264,7 +264,8 @@ watch(
if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询
getNumber();
getData();
// getData();
resetSearch();
}
}, 100); // 每100ms检查一次
console.log('route.path', route.path)
......@@ -298,7 +299,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.beginTime"
......@@ -309,7 +310,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 180px"
v-model="queryParams.endTime"
......
src/views/AIStation/PipelineTempPage/PipelineTempAlarmPage.vue
View file @ 5157e779
......@@ -62,7 +62,7 @@ function getData(){
size: Page.rows,
stationId: '',
alarmStatus: '',
alarmType: '',
thermalAlarmType: '',
beginTime: '',
endTime: '',
});
......
src/views/AIStation/PipelineTempPage/PipelineTempNewDataPage.vue
View file @ 5157e779
......@@ -69,7 +69,7 @@ function getData() {
size: Page.rows,
stationId: '',
alarmStatus: '',
alarmType: '',
thermalAlarmType: '',
beginTime: '',
endTime: ''
})
......
src/views/AIStation/PipelineTempPage/index.vue
View file @ 5157e779
......@@ -113,7 +113,7 @@ const search = () => {
size: Page.rows,
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.thermalAlarmType,
thermalAlarmType: queryParams.thermalAlarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
......@@ -129,8 +129,8 @@ const search = () => {
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
if (item.alarmType === undefined){
item.alarmType = ''
if (item.thermalAlarmType === undefined){
item.thermalAlarmType = ''
}
if (selectedBtn.value === 1) {
childParams.value = item
......@@ -154,7 +154,7 @@ const handleExport = () => {
const item = {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.thermalAlarmType,
thermalAlarmType: queryParams.thermalAlarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
......@@ -207,7 +207,7 @@ const resetSearch = () => {
queryParams.alarmStatus = ''
queryParams.beginTime = ''
queryParams.endTime = ''
queryParams.alarmType = ''
queryParams.thermalAlarmType = ''
queryParams.stationId = ''
searchData.value = []
getData()
......@@ -289,7 +289,8 @@ watch(
if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询
getNumber();
getData();
// getData();
resetSearch();
}
}, 100); // 每100ms检查一次
console.log('route.path', route.path)
......@@ -320,7 +321,7 @@ watch(
</el-select>
</el-form-item>
<el-form-item label="报警类型:" prop="thermalAlarmType" v-show="selectedBtn === 3">
<el-select placeholder="" clearable style="width: 200px" v-model="queryParams.alarmType">
<el-select placeholder="" clearable style="width: 200px" v-model="queryParams.thermalAlarmType">
<el-option v-for="item in thermalAlarmTypeList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
......@@ -328,7 +329,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.beginTime"
......@@ -339,7 +340,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 180px"
v-model="queryParams.endTime"
......
src/views/AIStation/RecyclePumpPage/index.vue
View file @ 5157e779
......@@ -62,36 +62,9 @@ const alarmStatusList = [
}
]
const alarmTypeList = [
{
label: '最高温度',
value: 0
},
{
label: '最低温度',
value: 1
},
{
label: '平均温度',
value: 2
},
{
label: '温差',
value: 3
},
{
label: '温度突升',
value: 4
},
{
label: '温度突降',
value: 5
}
]
const queryParams = reactive({
stationId: '',
alarmStatus: '',
alarmType: '',
beginTime: '',
endTime: '',
});
......@@ -104,7 +77,6 @@ const search = () => {
size: Page.rows,
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
......@@ -120,9 +92,6 @@ const search = () => {
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
if (item.alarmType === undefined){
item.alarmType = ''
}
if (selectedBtn.value === 1) {
childParams.value = item
} else if (selectedBtn.value === 2) {
......@@ -145,7 +114,6 @@ const handleExport = () => {
const item = {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
......@@ -157,7 +125,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度最新信息' + '.xls' // 下载后文件名
downloadElement.download = '循环泵最新信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -170,7 +138,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度历史信息' + '.xls' // 下载后文件名
downloadElement.download = '循环泵历史信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -183,7 +151,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度报警信息' + '.xls' // 下载后文件名
downloadElement.download = '循环泵报警信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -198,7 +166,6 @@ const resetSearch = () => {
queryParams.alarmStatus = ''
queryParams.beginTime = ''
queryParams.endTime = ''
queryParams.alarmType = ''
queryParams.stationId = ''
searchData.value = []
getData()
......@@ -222,7 +189,8 @@ watch(
if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询
getNumber();
getData();
// getData();
resetSearch()
}
}, 100); // 每100ms检查一次
console.log('route.path', route.path)
......@@ -321,7 +289,7 @@ getSupplys();
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.beginTime"
......@@ -332,7 +300,7 @@ getSupplys();
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 180px"
v-model="queryParams.endTime"
......
src/views/AIStation/TransTempPage/index.vue
View file @ 5157e779
......@@ -174,7 +174,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度最新信息' + '.xls' // 下载后文件名
downloadElement.download = '换热站温度最新信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -187,7 +187,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度历史信息' + '.xls' // 下载后文件名
downloadElement.download = '换热站温度历史信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -200,7 +200,7 @@ const handleExport = () => {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '管道温度报警信息' + '.xls' // 下载后文件名
downloadElement.download = '换热站温度报警信息' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......@@ -298,7 +298,8 @@ watch(
if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询
getNumber();
getData();
// getData();
resetSearch();
}
}, 100); // 每100ms检查一次
console.log('route.path', route.path)
......@@ -337,7 +338,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.beginTime"
......@@ -348,7 +349,7 @@ watch(
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 180px"
v-model="queryParams.endTime"
......
src/views/AIStation/VoiceCommandLocationPage.vue
View file @ 5157e779
......@@ -369,7 +369,8 @@ watch(
const checkAIToken = setInterval(() => {
if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询
loadData();
// loadData();
resetSearch();
}
}, 100); // 每100ms检查一次
}
......
src/views/AIStation/VoiceCommandPage.vue
View file @ 5157e779
......@@ -44,6 +44,8 @@ const queryParams = ref({
endTime: '',
ipAddress: '',
macAddress: '',
column: '',
order: '',
});
//加载列表数据
......@@ -57,15 +59,18 @@ function loadData(){
endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
column: queryParams.value.column,
order: queryParams.value.order,
}
if(item.stationId === undefined || item.beginTime == null || item.endTime == null || item.ipAddress === undefined || item.macAddress === undefined){
if (item.stationId === undefined){
item.stationId = ''
item.endTime = ''
}
if (item.beginTime == null){
item.beginTime = ''
item.ipAddress = ''
item.macAddress= ''
}
if (item.endTime == null){
item.endTime = ''
}
console.log('item:',item)
//查询数据
getVoiceCommandsData(item).then(res => {
......@@ -105,6 +110,8 @@ const resetSearch = () => {
endTime: '',
ipAddress: '',
macAddress: '',
column: '',
order: '',
}
loadData();
};
......@@ -194,7 +201,8 @@ watch(
const checkAIToken = setInterval(() => {
if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询
loadData();
// loadData();
resetSearch();
}
}, 100); // 每100ms检查一次
}
......@@ -203,8 +211,11 @@ watch(
)
// 处理排序事件
const handleSortChange = (column, prop, order) => {
console.log(column,prop,order)
queryParams.value.sortBy = prop;
queryParams.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
queryParams.value.column = column.prop;
queryParams.value.order = column.order;
loadData();
};
</script>
......@@ -273,6 +284,11 @@ const handleSortChange = (column, prop, order) => {
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationName" align="center" label="换热站" sortable />
<el-table-column prop="stationName" align="center" label="换热站" sortable>
<template #default="scope">
<span>{{ scope.row.stationName === null ? '-' : scope.row.stationName }}</span>
</template>
</el-table-column>
<el-table-column prop="updateDate" align="center" width="180" label="触发时间" sortable/>
<el-table-column prop="question" align="center" label="提问"/>
<el-table-column prop="answer" align="center" label="回答"/>
......
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