Skip to content

W
web-project
Commit 221a9c43 authored by liwei's avatar liwei
Browse files
Options

修改了AI工作站的分页查询，该为了post，并且修改了排序的bug

parent aa73bf6a
Hide whitespace changes
Inline Side-by-side
Showing with 721 additions and 172 deletions
src/api/AIStation/Extinguisher.js
View file @ 221a9c43
......@@ -4,15 +4,15 @@ import httpTwo from '../httpTwo'
export const getListNewData = (item) => {
return httpTwo.get(`/busFireExtinguisher/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&alarmStatus=${item.alarmStatus}`)
return httpTwo.post(`/busFireExtinguisher/list?page=${item.page}&rows=${item.size}`,item)
}
export const getListHistoryData = (item) => {
return httpTwo.get(`/busFireExtinguisher/historyList?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.post(`/busFireExtinguisher/historyList?page=${item.page}&rows=${item.size}`,item)
}
export const getAlarmListData = (item) => {
return httpTwo.get(`/busFireExtinguisherAlarm/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.post(`/busFireExtinguisherAlarm/list?page=${item.page}&rows=${item.size}`,item)
}
export const getAlarmNumData = () => {
......
src/api/AIStation/MoveMonitor.js
View file @ 221a9c43
import httpTwo from '../httpTwo'
export const getMoveListNewData = (item) => {
return httpTwo.get(`/busdynamicenvironmental/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&alarmStatus=${item.alarmStatus}`)
return httpTwo.post(`/busdynamicenvironmental/list?page=${item.page}&rows=${item.size}`,item)
}
export const getMoveListHistoryData = (item) => {
return httpTwo.get(`/busdynamicenvironmental/historyList?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.post(`/busdynamicenvironmental/historyList?page=${item.page}&rows=${item.size}`,item)
}
export const getMoveListAlarmNewData = (item) => {
return httpTwo.get(`/busdynamicenvironmentalalarm/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.post(`/busdynamicenvironmentalalarm/list?page=${item.page}&rows=${item.size}`,item)
}
export const getMoveAlarmNumber = () => {
......
src/api/AIStation/PipelineTemp.js
View file @ 221a9c43
......@@ -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.thermalAlarmType}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.post(`/buspipelinetemperaturealarm/list?page=${item.page}&rows=${item.size}`,item)
}
export const getPipAlarmNumber = () =>{
......
src/api/AIStation/RecyclePump.js
View file @ 221a9c43
import httpTwo from "../httpTwo.js";
export const getRecycleListNewData = (item) =>{
return httpTwo.get(`/buscirculatingpump/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&alarmStatus=${item.alarmStatus}`)
return httpTwo.post(`/buscirculatingpump/list?page=${item.page}&rows=${item.size}`,item)
}
export const getRecycleListHistoryData = (item) =>{
return httpTwo.get(`/buscirculatingpump/historyList?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.post(`/buscirculatingpump/historyList?page=${item.page}&rows=${item.size}`,item)
}
export const getRecycleListAlarmData = (item) =>{
return httpTwo.get(`/buscirculatingpumpalarm/list?page=${item.page}&rows=${item.size}&stationId=${item.stationId}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
return httpTwo.post(`/buscirculatingpumpalarm/list?page=${item.page}&rows=${item.size}`,item)
}
export const getRecycleAlarmNumber = () => {
......
src/views/AIStation/ExtinguisherPage/ExtinguisherAlarmPage.vue
View file @ 221a9c43
......@@ -57,7 +57,29 @@ function getData() {
}
function getDataByParams() {
getAlarmListData(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 = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
getAlarmListData(item).then(res => {
AlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......@@ -83,17 +105,52 @@ function getDataNew(item) {
defineExpose({
getData
});
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getAlarmListData(item).then(res => {
AlarmData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -111,9 +168,9 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationName" align="center" label="换热站" sortable/>
<el-table-column prop="srcName" align="center" label="设备名称" sortable/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable/>
<el-table-column prop="stationName" align="center" label="换热站" sortable :sort-map="sortMapData"/>
<el-table-column prop="srcName" align="center" label="设备名称" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventType" align="center" label="报警类型">
<template #default="scope">
<span v-if="scope.row.eventType=== 0 ">最高温度</span>
......
src/views/AIStation/ExtinguisherPage/ExtinguisherHistoryPage.vue
View file @ 221a9c43
......@@ -69,7 +69,29 @@ function getData() {
}
function getDataByParams() {
getListHistoryData(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,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
getListHistoryData(item).then(res => {
HistoryData.value = res.rows
historyPage.total = res.total
historyPage.rows = res.pageSize
......@@ -95,17 +117,52 @@ function getDataNew(item) {
defineExpose({
getData
});
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
const item = {
page: historyPage.page,
size: historyPage.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)
//查询数据
getListHistoryData(item).then(res => {
HistoryData.value = res.rows
historyPage.rows = res.pageSize
historyPage.total = res.total
})
};
</script>
......@@ -123,9 +180,9 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationName" align="center" label="换热站" sortable/>
<el-table-column prop="srcName" align="center" label="设备" sortable/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable/>
<el-table-column prop="stationName" align="center" label="换热站" sortable :sort-map="sortMapData"/>
<el-table-column prop="srcName" align="center" label="设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="picUrl" align="center" label="图片">
<template #default="scope">
<el-image
......
src/views/AIStation/ExtinguisherPage/ExtinguisherNewDataPage.vue
View file @ 221a9c43
......@@ -5,7 +5,7 @@ import {getListNewData} from "../../../api/AIStation/Extinguisher.js";
import {useRoute} from "vue-router";
import {handleGetAIToken} from "../AItoken.js";
const data = ref([])
const ExtinguisherNewData = ref([])
//子组件接收父组件传递过来的值
const props = defineProps({
......@@ -68,15 +68,37 @@ function getData() {
endTime: ''
})
getListNewData(item).then(res => {
data.value = res.rows
ExtinguisherNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getDataByParams() {
getListNewData(params.value).then(res => {
data.value = res.rows
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 = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
getListNewData(item).then(res => {
ExtinguisherNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
......@@ -93,22 +115,58 @@ watch(
function getDataNew(item) {
getListNewData(item).then(res => {
data.value = res.rows
ExtinguisherNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getListNewData(item).then(res => {
console.log('res.rows:',res.rows)
ExtinguisherNewData.value = res.rows
console.log('data.value:',ExtinguisherNewData.value)
Page.rows = res.pageSize
Page.total = res.total
})
};
defineExpose({
getData
......@@ -120,7 +178,7 @@ defineExpose({
<div class="ExtinguisherPage-container">
<div>
<el-table
:data="data"
:data="ExtinguisherNewData"
border
style="width: 98%;margin-left: 15px"
height="calc(90vh - 170px)"
......@@ -129,9 +187,9 @@ defineExpose({
@sort-change="handleSortChange"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationName" align="center" label="换热站" sortable/>
<el-table-column prop="srcName" align="center" label="设备" sortable/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable/>
<el-table-column prop="stationName" align="center" label="换热站" sortable :sort-map="sortMapData"/>
<el-table-column prop="srcName" align="center" label="设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="picUrl" align="center" label="图片">
<template #default="scope">
<el-image
......
src/views/AIStation/MoveMonitorPage/MoveMonitorAlarmPage.vue
View file @ 221a9c43
......@@ -44,18 +44,7 @@ const props = defineProps({
required: true
}
});
// const route = useRoute()
// watch(
// () => route.path, // 只监听路径变化
// () => {
// if(route.path === '/AIStation/MoveMonitorPage/MoveMonitorAlarmPage') {
// // 路由变化，执行相应操作
// handleGetAIToken();
// console.log('route.path',route.path)
// }
// },
// { immediate: true } // 只在路径变化时触发
// )
watch(
() => props.queryParams,
(newData) => {
......@@ -83,7 +72,29 @@ function getData(){
})
}
function getDataByParams(){
getMoveListAlarmNewData(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 = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
getMoveListAlarmNewData(item).then(res => {
AlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......@@ -101,17 +112,52 @@ function getDataNew(item) {
defineExpose({
getData
});
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getMoveListAlarmNewData(item).then(res => {
AlarmData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -129,13 +175,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange"
>
<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">
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcName" align="center" label="设施名称" sortable/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable/>
<el-table-column prop="srcName" align="center" label="设施名称" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventType" align="center" label="报警类型">
<template #default="scope">
<span v-if="scope.row.eventType=== 0">最高温度</span>
......
src/views/AIStation/MoveMonitorPage/MoveMonitorHistoryPage.vue
View file @ 221a9c43
......@@ -79,7 +79,29 @@ function getData() {
})
}
function getDataByParams(){
getMoveListHistoryData(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,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
}
if (item.beginTime == null){
item.beginTime = ''
}
if (item.endTime == null){
item.endTime = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
getMoveListHistoryData(item).then(res => {
HistoryData.value = res.rows
historyPage.total = res.total
historyPage.rows = res.pageSize
......@@ -97,17 +119,52 @@ function getDataNew(item) {
defineExpose({
getData
});
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getMoveListHistoryData(item).then(res => {
HistoryData.value = res.rows
historyPage.rows = res.pageSize
historyPage.total = res.total
})
};
</script>
......@@ -125,13 +182,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange"
>
<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">
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable/>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable :sort-map="sortMapData"/>
<el-table-column prop="meterType" align="center" label="设备类型">
<template #default="scope">
<span v-if="scope.row.meterType=== '0'">电表</span>
......
src/views/AIStation/MoveMonitorPage/MoveMonitorNewDataPage.vue
View file @ 221a9c43
......@@ -5,7 +5,7 @@ import {getListNewData} from "../../../api/AIStation/Extinguisher.js";
import {getMoveListHistoryData, getMoveListNewData} from "../../../api/AIStation/MoveMonitor.js";
import store from "../../../store/index.js";
const data = ref([])
const MoveMonitorNewData = ref([])
const enterpriseId = ref();
const loading = ref(true);
// 分页
......@@ -41,8 +41,30 @@ function detail(row) {
detailOpen.value = true
}
function getDataByParams(){
getMoveListNewData(params.value).then(res => {
data.value = res.rows
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 = ''
}
if (item.alarmStatus === undefined){
item.alarmStatus = ''
}
getMoveListNewData(item).then(res => {
MoveMonitorNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
......@@ -83,7 +105,7 @@ function getData(){
endTime: ''
})
getMoveListNewData(item).then(res => {
data.value = res.rows
MoveMonitorNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
......@@ -91,7 +113,7 @@ function getData(){
function getDataNew(item) {
getMoveListNewData(item).then(res => {
data.value = res.rows
MoveMonitorNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
......@@ -100,17 +122,52 @@ function getDataNew(item) {
defineExpose({
getData
});
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getMoveListNewData(item).then(res => {
MoveMonitorNewData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -119,7 +176,7 @@ const handleSortChange = (column, prop, order) => {
<div class="MoveMonitorPage-container">
<div>
<el-table
:data="data"
:data="MoveMonitorNewData"
border
style="width: 98%;margin-left: 15px"
height="calc(90vh - 170px)"
......@@ -128,13 +185,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange"
>
<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">
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable/>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable :sort-map="sortMapData"/>
<el-table-column prop="meterType" align="center" label="设备类型">
<template #default="scope">
<span v-if="scope.row.meterType=== '0'">电表</span>
......
src/views/AIStation/PipelineTempPage/PipelineTempAlarmPage.vue
View file @ 221a9c43
......@@ -74,7 +74,26 @@ function getData(){
})
}
function getDataByParams(){
getPipListAlarmData(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 = ''
}
getPipListAlarmData(item).then(res => {
AlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......@@ -83,17 +102,52 @@ function getDataByParams(){
defineExpose({
getData
});
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getPipListAlarmData(item).then(res => {
AlarmData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -111,13 +165,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange"
>
<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">
<span>{{scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcName" align="center" label="设施名称" sortable/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable/>
<el-table-column prop="srcName" align="center" label="设施名称" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="thermalAlarmType" align="center" label="报警类型">
<template #default="scope">
<span v-if="scope.row.thermalAlarmType=== 'constantTemperature'">定温报警</span>
......
src/views/AIStation/PipelineTempPage/PipelineTempNewDataPage.vue
View file @ 221a9c43
......@@ -3,7 +3,7 @@ import { reactive, ref, watch} from "vue";
import {getPipListNewData} from "../../../api/AIStation/PipelineTemp.js";
import store from "../../../store/index.js";
const data = ref([])
const PipelineTempNewData = ref([])
const params = ref({})
const options = ref([])
console.log('params!!!!!!!!!!!!!!!', params.value)
......@@ -54,11 +54,11 @@ watch(
(newData) => {
params.value = newData
getPipListNewData(params.value).then(res => {
data.value = res.rows
PipelineTempNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
console.log('data值eeeee---------', data.value)
console.log('data值eeeee---------', PipelineTempNewData.value)
}
)
......@@ -74,8 +74,8 @@ function getData() {
endTime: ''
})
getPipListNewData(item).then(res => {
data.value = res.rows
console.log('data=============', data.value)
PipelineTempNewData.value = res.rows
console.log('data=============', PipelineTempNewData.value)
Page.total = res.total
Page.rows = res.pageSize
})
......@@ -102,7 +102,7 @@ function getDataByParams() {
item.endTime = ''
}
getPipListNewData(item).then(res => {
data.value = res.rows
PipelineTempNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
......@@ -163,7 +163,7 @@ const handleSortChange = (data) => {
console.log('item--------------',item)
//查询数据
getPipListNewData(item).then(res => {
data.value = res.rows
PipelineTempNewData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
......@@ -175,7 +175,7 @@ const handleSortChange = (data) => {
<div class="PipelineTempPage-container">
<div>
<el-table
:data="data"
:data="PipelineTempNewData"
border
style="width: 98%;margin-left: 15px"
height="calc(90vh - 170px)"
......
src/views/AIStation/RecyclePumpPage/RecyclePumpAlarmPage.vue
View file @ 221a9c43
......@@ -69,7 +69,26 @@ function getData(){
})
}
function getDataByParams(){
getRecycleListAlarmData(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 = ''
}
getRecycleListAlarmData(item).then(res => {
TransTempAlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......@@ -87,17 +106,52 @@ function getDataNew(item) {
defineExpose({
getData
});
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getRecycleListAlarmData(item).then(res => {
TransTempAlarmData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -115,13 +169,13 @@ const handleSortChange = (column, prop, order) => {
@sort-change="handleSortChange"
>
<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">
<span>{{scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcName" label="设备名称" align="center" sortable/>
<el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable/>
<el-table-column prop="srcName" label="设备名称" align="center" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable :sort-map="sortMapData"/>
<el-table-column prop="eventType" align="center" label="报警类型">
<template #default="scope">
<span v-if="scope.row.eventType=== 0">最高温度</span>
......
src/views/AIStation/RecyclePumpPage/RecyclePumpHistoryPage.vue
View file @ 221a9c43
......@@ -206,7 +206,26 @@ function getData() {
})
}
function getDataByParams(){
getRecycleListHistoryData(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 = ''
}
getRecycleListHistoryData(item).then(res => {
RecyclePumpData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......@@ -220,18 +239,53 @@ function getDataNew(item) {
Page.rows = res.pageSize
})
}
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getRecycleListHistoryData(item).then(res => {
RecyclePumpData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
defineExpose({
getData
});
......@@ -252,13 +306,13 @@ defineExpose({
@sort-change="handleSortChange"
>
<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">
<span>{{scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable/>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable :sort-map="sortMapData"/>
<el-table-column prop="alarmStatus" align="center" label="告警状态">
<template #default="scope">
<span v-if="scope.row.alarmStatus === '0'">正常</span>
......
src/views/AIStation/RecyclePumpPage/RecyclePumpNewDataPage.vue
View file @ 221a9c43
......@@ -24,13 +24,14 @@ const tableBodyClass = (row) => { // 表体样式
// 分页大小改变时触发
const handleSizeChange = (val) => {
Page.rows = val;
getRecycleListNewData()
getDataByParams()
};
// 当前页改变时触发
const handleCurrentChange = (val) => {
Page.page = val;
getRecycleListNewData()
console.log('Page.page:',Page.page)
getDataByParams()
};
const selectedRow = ref({});
......@@ -92,7 +93,26 @@ function getData(){
})
}
function getDataByParams(){
getRecycleListNewData(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 = ''
}
getRecycleListNewData(item).then(res => {
RecyclePumpData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......@@ -107,18 +127,53 @@ function getDataNew(item) {
})
}
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
params.value.sortBy = prop;
params.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
if((Object.keys(params.value).length === 2 && params.value.constructor === Object)){
getData()
console.log('空对象')
}else{
getDataByParams();
console.log('非空对象')
const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
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)
})
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)
//查询数据
getRecycleListNewData(item).then(res => {
RecyclePumpData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
defineExpose({
getData
});
......@@ -139,13 +194,13 @@ defineExpose({
@sort-change="handleSortChange"
>
<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">
<span>{{scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable/>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable :sort-map="sortMapData"/>
<el-table-column prop="alarmStatus" align="center" label="告警状态">
<template #default="scope">
<span v-if="scope.row.alarmStatus === '0'">正常</span>
......
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