Commit 1ca4b660 authored by liwei's avatar liwei

修改了管道温度、换热站温度、语音指令、语音指令部署的查询,改为了post,并增加了小按钮的排序功能

parent 3e5ca5ba
import httpTwo from "../httpTwo.js"; import httpTwo from "../httpTwo.js";
export const getPipListNewData = (item) =>{ export const getPipListNewData = (item) =>{
return httpTwo.get(`/buspipelinetemperature/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&alarmStatus=${item.alarmStatus}`) return httpTwo.post(`/buspipelinetemperature/list?page=${item.page}&rows=${item.size}`,item)
} }
export const getPipListHistoryData = (item) =>{ export const getPipListHistoryData = (item) =>{
return httpTwo.get(`/buspipelinetemperature/historyList?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`) return httpTwo.post(`/buspipelinetemperature/historyList?page=${item.page}&rows=${item.size}`,item)
} }
export const getPipListAlarmData = (item) =>{ export const getPipListAlarmData = (item) =>{
......
import httpTwo from "../httpTwo.js"; import httpTwo from "../httpTwo.js";
export const getTransListNewData = (item) =>{ export const getTransListNewData = (item) =>{
return httpTwo.get(`/bustransfertemperature/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&alarmStatus=${item.alarmStatus}`) return httpTwo.post(`/bustransfertemperature/list?page=${item.page}&rows=${item.size}`,item)
} }
export const getTransListHistoryData = (item) =>{ export const getTransListHistoryData = (item) =>{
return httpTwo.get(`/bustransfertemperature/historyList?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`) return httpTwo.post(`/bustransfertemperature/historyList?page=${item.page}&rows=${item.size}`,item)
} }
export const getTransListAlarmData = (item) =>{ export const getTransListAlarmData = (item) =>{
return httpTwo.get(`/bustransfertemperaturealarm/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&alarmType=${item.alarmType}&beginTime=${item.beginTime}&endTime=${item.endTime}`) return httpTwo.post(`/bustransfertemperaturealarm/list?page=${item.page}&rows=${item.size}`,item)
} }
export const getTransAlarmNumber = () => { export const getTransAlarmNumber = () => {
......
...@@ -2,7 +2,7 @@ import httpTwo from '../httpTwo' ...@@ -2,7 +2,7 @@ import httpTwo from '../httpTwo'
export const getVoiceCommandsData = (item) => { 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}&column=${item.column}&order=${item.order}`) return httpTwo.post(`/busVoiceCommands/list?page=${item.page}&rows=${item.rows}`,item)
} }
export const addVoiceCommands = (item) => { export const addVoiceCommands = (item) => {
......
...@@ -3,7 +3,7 @@ import axios from "axios"; ...@@ -3,7 +3,7 @@ import axios from "axios";
export const getVoiceCommandsLocationData = (item) => { export const getVoiceCommandsLocationData = (item) => {
return httpTwo.get(`/busVoiceCommandsLocation/list?page=${item.page}&rows=${item.rows}&stationId=${item.stationId}&ipAddress=${item.ipAddress}&macAddress=${item.macAddress}`) return httpTwo.post(`/busVoiceCommandsLocation/list?page=${item.page}&rows=${item.rows}`,item)
} }
export const addVoiceCommandsLocation = (item) => { export const addVoiceCommandsLocation = (item) => {
......
...@@ -49,7 +49,6 @@ watch( ...@@ -49,7 +49,6 @@ watch(
(newData) => { (newData) => {
params.value = newData params.value = newData
getDataNew(params.value) getDataNew(params.value)
console.log('data值eeeee---------', data.value)
} }
) )
...@@ -84,7 +83,26 @@ function getData() { ...@@ -84,7 +83,26 @@ function getData() {
} }
function getDataByParams() { function getDataByParams() {
getPipListHistoryData(params.value).then(res => { const item = {
page: historyPage.page,
size: historyPage.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
thermalAlarmType: props.queryParams.thermalAlarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
getPipListHistoryData(item).then(res => {
HistoryData.value = res.rows HistoryData.value = res.rows
historyPage.total = res.total historyPage.total = res.total
historyPage.rows = res.pageSize historyPage.rows = res.pageSize
...@@ -94,17 +112,52 @@ function getDataByParams() { ...@@ -94,17 +112,52 @@ function getDataByParams() {
defineExpose({ defineExpose({
getData getData
}); });
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件 // 处理排序事件
const handleSortChange = (column, prop, order) => { const handleSortChange = (data) => {
params.value.sortBy = prop; sortList = []
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc'; // 添加新的排序属性
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){ const sortMap = sortMapData;
getData() //将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
console.log('空对象') if (sortMap.get(data.prop) && data.order === null) {
}else{ sortMap.delete(data.prop);
getDataByParams(); } else {
console.log('非空对象') sortMap.set(data.prop, { prop: data.prop, order: data.order });
sortNewData.value = sortMap
}
//将sortMap的value放到sortList中
sortMap.forEach((value, key) => {
sortList.push(value)
})
const item = {
page: historyPage.page,
size: historyPage.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
thermalAlarmType: props.queryParams.thermalAlarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
} }
if (item.endTime == null){
item.endTime = ''
}
console.log('item--------------',item)
//查询数据
getPipListHistoryData(item).then(res => {
HistoryData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
}; };
</script> </script>
...@@ -122,14 +175,14 @@ const handleSortChange = (column, prop, order) => { ...@@ -122,14 +175,14 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <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 :sort-map="sortMapData">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.stationName || '-' }}</span> <span>{{ scope.row.stationName || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/> <el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="sid" align="center" label="测温点" sortable/> <el-table-column prop="sid" align="center" label="测温点" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable/> <el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="averageTemperature" align="center" label="平均温°C"/> <el-table-column prop="averageTemperature" align="center" label="平均温°C"/>
<el-table-column prop="maxTemperature" align="center" label="最高温°C"/> <el-table-column prop="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/> <el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
...@@ -82,7 +82,26 @@ function getData() { ...@@ -82,7 +82,26 @@ function getData() {
} }
function getDataByParams() { function getDataByParams() {
getPipListNewData(params.value).then(res => { const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
thermalAlarmType: props.queryParams.thermalAlarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
getPipListNewData(item).then(res => {
data.value = res.rows data.value = res.rows
Page.total = res.total Page.total = res.total
Page.rows = res.pageSize Page.rows = res.pageSize
...@@ -102,17 +121,52 @@ watch( ...@@ -102,17 +121,52 @@ watch(
defineExpose({ defineExpose({
getData getData
}); });
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件 // 处理排序事件
const handleSortChange = (column, prop, order) => { const handleSortChange = (data) => {
params.value.sortBy = prop; sortList = []
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc'; // 添加新的排序属性
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){ const sortMap = sortMapData;
getData() //将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
console.log('空对象') if (sortMap.get(data.prop) && data.order === null) {
}else{ sortMap.delete(data.prop);
getDataByParams(); } else {
console.log('非空对象') sortMap.set(data.prop, { prop: data.prop, order: data.order });
sortNewData.value = sortMap
}
//将sortMap的value放到sortList中
sortMap.forEach((value, key) => {
sortList.push(value)
})
const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
thermalAlarmType: props.queryParams.thermalAlarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
} }
console.log('item--------------',item)
//查询数据
getPipListNewData(item).then(res => {
data.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
}; };
</script> </script>
...@@ -130,14 +184,14 @@ const handleSortChange = (column, prop, order) => { ...@@ -130,14 +184,14 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <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 :sort-map="sortMapData">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.stationName || '-' }}</span> <span>{{ scope.row.stationName || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/> <el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="sid" align="center" label="测温点" sortable/> <el-table-column prop="sid" align="center" label="测温点" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable/> <el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="averageTemperature" align="center" label="平均温°C"/> <el-table-column prop="averageTemperature" align="center" label="平均温°C"/>
<el-table-column prop="maxTemperature" align="center" label="最高温°C"/> <el-table-column prop="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/> <el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
...@@ -67,7 +67,6 @@ function getData() { ...@@ -67,7 +67,6 @@ function getData() {
endTime: '', endTime: '',
}); });
getTransListAlarmData(item).then(res => { getTransListAlarmData(item).then(res => {
console.log(res, 12)
TransTempAlarmData.value = res.rows; TransTempAlarmData.value = res.rows;
Page.total = res.total Page.total = res.total
Page.rows = res.pageSize Page.rows = res.pageSize
...@@ -75,7 +74,26 @@ function getData() { ...@@ -75,7 +74,26 @@ function getData() {
} }
function getDataByParams() { function getDataByParams() {
getTransListAlarmData(params.value).then(res => { const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
getTransListAlarmData(item).then(res => {
TransTempAlarmData.value = res.rows TransTempAlarmData.value = res.rows
Page.total = res.total Page.total = res.total
Page.rows = res.pageSize Page.rows = res.pageSize
...@@ -92,17 +110,52 @@ function getDataNew(item) { ...@@ -92,17 +110,52 @@ function getDataNew(item) {
defineExpose({ defineExpose({
getData getData
}); });
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件 // 处理排序事件
const handleSortChange = (column, prop, order) => { const handleSortChange = (data) => {
params.value.sortBy = prop; sortList = []
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc'; // 添加新的排序属性
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){ const sortMap = sortMapData;
getData() //将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
console.log('空对象') if (sortMap.get(data.prop) && data.order === null) {
}else{ sortMap.delete(data.prop);
getDataByParams(); } else {
console.log('非空对象') sortMap.set(data.prop, { prop: data.prop, order: data.order });
sortNewData.value = sortMap
}
//将sortMap的value放到sortList中
sortMap.forEach((value, key) => {
sortList.push(value)
})
const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
} }
console.log('item--------------',item)
//查询数据
getTransListAlarmData(item).then(res => {
TransTempAlarmData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
}; };
</script> </script>
...@@ -120,13 +173,13 @@ const handleSortChange = (column, prop, order) => { ...@@ -120,13 +173,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationName" label="换热站" align="center" sortable> <el-table-column prop="stationName" label="换热站" align="center" sortable :sort-map="sortMapData">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.stationName || '-' }}</span> <span>{{ scope.row.stationName || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="srcName" label="设备名称" align="center" sortable/> <el-table-column prop="srcName" label="设备名称" align="center" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable/> <el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable :sort-map="sortMapData"/>
<el-table-column prop="alarmLevel" align="center" label="报警等级"> <el-table-column prop="alarmLevel" align="center" label="报警等级">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.alarmLevel=== 0">预警</span> <span v-if="scope.row.alarmLevel=== 0">预警</span>
......
...@@ -78,7 +78,26 @@ function getData() { ...@@ -78,7 +78,26 @@ function getData() {
} }
function getDataByParams() { function getDataByParams() {
getTransListHistoryData(params.value).then(res => { const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
getTransListHistoryData(item).then(res => {
TransTempHistoryData.value = res.rows TransTempHistoryData.value = res.rows
Page.total = res.total Page.total = res.total
Page.rows = res.pageSize Page.rows = res.pageSize
...@@ -96,17 +115,52 @@ function getDataNew(item) { ...@@ -96,17 +115,52 @@ function getDataNew(item) {
defineExpose({ defineExpose({
getData getData
}); });
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件 // 处理排序事件
const handleSortChange = (column, prop, order) => { const handleSortChange = (data) => {
params.value.sortBy = prop; sortList = []
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc'; // 添加新的排序属性
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){ const sortMap = sortMapData;
getData() //将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
console.log('空对象') if (sortMap.get(data.prop) && data.order === null) {
}else{ sortMap.delete(data.prop);
getDataByParams(); } else {
console.log('非空对象') sortMap.set(data.prop, { prop: data.prop, order: data.order });
sortNewData.value = sortMap
}
//将sortMap的value放到sortList中
sortMap.forEach((value, key) => {
sortList.push(value)
})
const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
} }
console.log('item--------------',item)
//查询数据
getTransListHistoryData(item).then(res => {
TransTempHistoryData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
}; };
</script> </script>
...@@ -124,13 +178,13 @@ const handleSortChange = (column, prop, order) => { ...@@ -124,13 +178,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <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 :sort-map="sortMapData">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.stationName || '-' }}</span> <span>{{ scope.row.stationName || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/> <el-table-column prop="deviceName" align="center" label="设备名称" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180px" sortable/> <el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180px" sortable :sort-map="sortMapData"/>
<el-table-column prop="averageTemperature" align="center" label="平均温°C"/> <el-table-column prop="averageTemperature" align="center" label="平均温°C"/>
<el-table-column prop="maxTemperature" align="center" label="最高温°C"/> <el-table-column prop="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/> <el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
...@@ -84,7 +84,26 @@ function getData() { ...@@ -84,7 +84,26 @@ function getData() {
} }
function getDataByParams() { function getDataByParams() {
getTransListNewData(params.value).then(res => { const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
getTransListNewData(item).then(res => {
TransTempNewData.value = res.rows TransTempNewData.value = res.rows
Page.total = res.total Page.total = res.total
Page.rows = res.pageSize Page.rows = res.pageSize
...@@ -102,17 +121,53 @@ function getDataNew(item) { ...@@ -102,17 +121,53 @@ function getDataNew(item) {
defineExpose({ defineExpose({
getData getData
}); });
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件 // 处理排序事件
const handleSortChange = (column, prop, order) => { const handleSortChange = (data) => {
params.value.sortBy = prop; sortList = []
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc'; // 添加新的排序属性
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){ const sortMap = sortMapData;
getData() //将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
console.log('空对象') if (sortMap.get(data.prop) && data.order === null) {
}else{ sortMap.delete(data.prop);
getDataByParams(); } else {
console.log('非空对象') sortMap.set(data.prop, { prop: data.prop, order: data.order });
sortNewData.value = sortMap
}
//将sortMap的value放到sortList中
sortMap.forEach((value, key) => {
sortList.push(value)
})
const item = {
page: Page.page,
size: Page.rows,
stationId: props.queryParams.stationId,
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
} }
console.log('item--------------',item)
//查询数据
getTransListNewData(item).then(res => {
TransTempNewData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
}; };
</script> </script>
...@@ -130,13 +185,13 @@ const handleSortChange = (column, prop, order) => { ...@@ -130,13 +185,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <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 :sort-map="sortMapData">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.stationName || '-' }}</span> <span>{{ scope.row.stationName || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/> <el-table-column prop="deviceName" align="center" label="设备名称" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180px" sortable/> <el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180px" sortable :sort-map="sortMapData"/>
<el-table-column prop="averageTemperature" align="center" label="平均温°C"/> <el-table-column prop="averageTemperature" align="center" label="平均温°C"/>
<el-table-column prop="maxTemperature" align="center" label="最高温°C"/> <el-table-column prop="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/> <el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
...@@ -44,6 +44,7 @@ const voiceCommandLocationData = ref([ ...@@ -44,6 +44,7 @@ const voiceCommandLocationData = ref([
} }
]) ])
const enterpriseId = ref(); const enterpriseId = ref();
const loading = ref(true); const loading = ref(true);
const props = { multiple: true, emitPath: false } const props = { multiple: true, emitPath: false }
...@@ -68,6 +69,7 @@ function loadData(){ ...@@ -68,6 +69,7 @@ function loadData(){
stationId: queryParams.value.stationId, stationId: queryParams.value.stationId,
ipAddress: queryParams.value.ipAddress, ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress, macAddress: queryParams.value.macAddress,
sortList: sortList,
} }
if (item.stationId === undefined){ if (item.stationId === undefined){
item.stationId = '' item.stationId = ''
...@@ -378,12 +380,56 @@ watch( ...@@ -378,12 +380,56 @@ watch(
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
) )
getSupplys() getSupplys()
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件 // 处理排序事件
const handleSortChange = (column, prop, order) => { const handleSortChange = (data) => {
queryParams.value.sortBy = prop; sortList = []
queryParams.value.sortOrder = order === 'ascending' ? 'asc' : 'desc'; // 添加新的排序属性
loadData(); const sortMap = sortMapData;
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
sortNewData.value = sortMap
}
//将sortMap的value放到sortList中
sortMap.forEach((value, key) => {
sortList.push(value)
})
console.log('sortList:',sortList)
const item = {
page: Page.page,
rows: Page.rows,
stationId: queryParams.value.stationId,
beginTime: queryParams.value.beginTime,
endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
console.log('item.sortMap:',item.sortMap)
console.log('item--------------',item)
//查询数据
getVoiceCommandsLocationData(item).then(res => {
VoiceCommandData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
}; };
</script> </script>
<template> <template>
...@@ -429,8 +475,8 @@ const handleSortChange = (column, prop, order) => { ...@@ -429,8 +475,8 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <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 :sort-map="sortMapData"/>
<el-table-column prop="code" align="center" label="编号" sortable/> <el-table-column prop="code" align="center" label="编号" sortable :sort-map="sortMapData"/>
<el-table-column prop="macAddress" align="center" label="MAC地址"/> <el-table-column prop="macAddress" align="center" label="MAC地址"/>
<el-table-column prop="ipAddress" align="center" label="IP 地址"/> <el-table-column prop="ipAddress" align="center" label="IP 地址"/>
<el-table-column label="操作" align="center" width="190" fixed="right"> <el-table-column label="操作" align="center" width="190" fixed="right">
......
...@@ -2,12 +2,17 @@ ...@@ -2,12 +2,17 @@
import {reactive, ref, watch} from "vue"; import {reactive, ref, watch} from "vue";
import zhCn from "element-plus/dist/locale/zh-cn.mjs" import zhCn from "element-plus/dist/locale/zh-cn.mjs"
import store from "../../store/index.js"; import store from "../../store/index.js";
import {getVoiceCommandsData,deleteVoiceCommands,addVoiceCommands,updateVoiceCommands,exportVoiceCommands} from "../../api/AIStation/VoiceCommand"; import {
getVoiceCommandsData,
deleteVoiceCommands,
addVoiceCommands,
updateVoiceCommands,
exportVoiceCommands,
} from "../../api/AIStation/VoiceCommand";
import {useRoute} from "vue-router"; import {useRoute} from "vue-router";
import {handleGetAIToken} from "./AItoken"; import {handleGetAIToken} from "./AItoken";
const options = ref([]); const options = ref([]);
const enterpriseId = ref(); const enterpriseId = ref();
const props = { multiple: true, emitPath: false } const props = { multiple: true, emitPath: false }
...@@ -59,8 +64,7 @@ function loadData(){ ...@@ -59,8 +64,7 @@ function loadData(){
endTime: queryParams.value.endTime, endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress, ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress, macAddress: queryParams.value.macAddress,
column: queryParams.value.column, sortList: sortList,
order: queryParams.value.order,
} }
if (item.stationId === undefined){ if (item.stationId === undefined){
item.stationId = '' item.stationId = ''
...@@ -209,14 +213,57 @@ watch( ...@@ -209,14 +213,57 @@ watch(
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
) )
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件 // 处理排序事件
const handleSortChange = (column, prop, order) => { const handleSortChange = (data) => {
console.log(column,prop,order) sortList = []
queryParams.value.sortBy = prop; // 添加新的排序属性
queryParams.value.sortOrder = order === 'ascending' ? 'asc' : 'desc'; const sortMap = sortMapData;
queryParams.value.column = column.prop; //将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
queryParams.value.order = column.order; if (sortMap.get(data.prop) && data.order === null) {
loadData(); sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
sortNewData.value = sortMap
}
//将sortMap的value放到sortList中
sortMap.forEach((value, key) => {
sortList.push(value)
})
console.log('sortList:',sortList)
const item = {
page: Page.page,
rows: Page.rows,
stationId: queryParams.value.stationId,
beginTime: queryParams.value.beginTime,
endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
// if (item.sortMap === undefined){
// item.sortMap = new Map();
// }
console.log('item.sortMap:',item.sortMap)
console.log('item--------------',item)
//查询数据
getVoiceCommandsData(item).then(res => {
VoiceCommandData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
}; };
</script> </script>
...@@ -283,13 +330,12 @@ const handleSortChange = (column, prop, order) => { ...@@ -283,13 +330,12 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <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 :sort-map="sortMapData">
<el-table-column prop="stationName" align="center" label="换热站" sortable>
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.stationName === null ? '-' : scope.row.stationName }}</span> <span>{{ scope.row.stationName === null ? '-' : scope.row.stationName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="updateDate" align="center" width="180" label="触发时间" sortable/> <el-table-column prop="createDate" align="center" width="180" label="触发时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="question" align="center" label="提问"/> <el-table-column prop="question" align="center" label="提问"/>
<el-table-column prop="answer" align="center" label="回答"/> <el-table-column prop="answer" align="center" label="回答"/>
<el-table-column prop="macAddress" align="center" width="200" label="MAC地址"/> <el-table-column prop="macAddress" align="center" width="200" label="MAC地址"/>
......
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