Skip to content

W
web-project
Commit 8e60692e authored by hubaoshan's avatar hubaoshan
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c17236f7 1ca4b660
Hide whitespace changes
Inline Side-by-side
Showing with 476 additions and 115 deletions
src/api/AIStation/PipelineTemp.js
View file @ 8e60692e
import httpTwo from "../httpTwo.js";
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) =>{
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) =>{
......
src/api/AIStation/TransTemp.js
View file @ 8e60692e
import httpTwo from "../httpTwo.js";
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) =>{
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) =>{
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 = () => {
......
src/api/AIStation/VoiceCommand.js
View file @ 8e60692e
......@@ -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}&column=${item.column}&order=${item.order}`)
return httpTwo.post(`/busVoiceCommands/list?page=${item.page}&rows=${item.rows}`,item)
}
export const addVoiceCommands = (item) => {
......
src/api/AIStation/VoiceCommandLocation.js
View file @ 8e60692e
......@@ -3,7 +3,7 @@ import axios from "axios";
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) => {
......
src/components/DataForm.vue
View file @ 8e60692e
<template>
<template v-if="dataRows && dataTables">
<el-table
<template v-if="dataRows && dataTables">
<el-table
ref="tableRef"
show-header="true"
border
highlight-current-row
show-header="true"
border
highlight-current-row
:max-height="maxHeight?maxHeight:'-'"
:height="tableHeight"
virtual-scroll
:height="tableHeight"
virtual-scroll
style="border-color: #97d5fd;"
:header-cell-class-name="setHeaderClass"
:header-cell-class-name="setHeaderClass"
@sort-change="subSort"
:cell-style="setCellStyle"
:data="visibleData"
:cell-style="setCellStyle"
:data="visibleData"
:header-cell-style="setHeaderCellStyle"
v-loading="isLoading"
element-loading-text="数据加载中......"
row-class-name="fixed-row-height"
element-loading-background="rgba(0, 0, 0, 0.8)">
<template v-for="(item) in dataRows" :key="item.name">
<el-table-column v-if="item.isVisible" :class-name="[item.fixed ? classObject : '']" :fixed="item.fixed" :prop="item.name"
:label="item.showName" :width="item.width" :sortable="sortabletype" :color="item.color">
......@@ -40,7 +40,7 @@
</el-table-column>
</template>
</el-table>
</template>
</template>
......@@ -62,7 +62,7 @@
opacity: 1.0;
}
}
.blink-animation {
animation: blink 1s infinite;
}
......@@ -75,14 +75,14 @@
import { reactive, ref, watch, onMounted, onUnmounted } from 'vue'
const props = defineProps(['dataRows',
'dataTables',
'maxHeight',
'sortMap',
'dataTables',
'maxHeight',
'sortMap',
'sortabletype',
'width',
'tableHeight',
'width',
'tableHeight',
'alarm',
'isLoading',
'isLoading',
'parentMethod',
'offlineTime'
]);
......@@ -180,7 +180,7 @@ function setHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
css_color= {'background-color': '#'+backcolor, 'padding-left':'0px', 'padding-right':'0px', 'borderColor':'#97d5fd', 'color':'#000','text-align':'center','vertical-align':'top'};
}
})
return css_color;
}
......
src/views/AIStation/PipelineTempPage/PipelineTempHistoryPage.vue
View file @ 8e60692e
......@@ -49,7 +49,6 @@ watch(
(newData) => {
params.value = newData
getDataNew(params.value)
console.log('data值eeeee---------', data.value)
}
)
......@@ -84,7 +83,26 @@ function getData() {
}
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
historyPage.total = res.total
historyPage.rows = res.pageSize
......@@ -94,17 +112,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: 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>
......@@ -122,14 +175,14 @@ 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="deviceIndexCode" align="center" label="光纤设备" sortable/>
<el-table-column prop="sid" align="center" label="测温点" sortable/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable/>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="sid" 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="averageTemperature" align="center" label="平均温°C"/>
<el-table-column prop="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
src/views/AIStation/PipelineTempPage/PipelineTempNewDataPage.vue
View file @ 8e60692e
......@@ -82,7 +82,26 @@ function getData() {
}
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
Page.total = res.total
Page.rows = res.pageSize
......@@ -102,17 +121,52 @@ watch(
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)
//查询数据
getPipListNewData(item).then(res => {
data.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -130,14 +184,14 @@ 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="deviceIndexCode" align="center" label="光纤设备" sortable/>
<el-table-column prop="sid" align="center" label="测温点" sortable/>
<el-table-column prop="acquisitionTime" align="center" width="180px" label="采集时间" sortable/>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="sid" 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="averageTemperature" align="center" label="平均温°C"/>
<el-table-column prop="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
src/views/AIStation/TransTempPage/TransTempAlarmPage.vue
View file @ 8e60692e
......@@ -67,7 +67,6 @@ function getData() {
endTime: '',
});
getTransListAlarmData(item).then(res => {
console.log(res, 12)
TransTempAlarmData.value = res.rows;
Page.total = res.total
Page.rows = res.pageSize
......@@ -75,7 +74,26 @@ function getData() {
}
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
Page.total = res.total
Page.rows = res.pageSize
......@@ -92,17 +110,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)
//查询数据
getTransListAlarmData(item).then(res => {
TransTempAlarmData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -120,13 +173,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="alarmLevel" align="center" label="报警等级">
<template #default="scope">
<span v-if="scope.row.alarmLevel=== 0">预警</span>
......
src/views/AIStation/TransTempPage/TransTempHistoryPage.vue
View file @ 8e60692e
......@@ -78,7 +78,26 @@ function getData() {
}
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
Page.total = res.total
Page.rows = res.pageSize
......@@ -96,17 +115,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)
//查询数据
getTransListHistoryData(item).then(res => {
TransTempHistoryData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -124,13 +178,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="deviceName" align="center" label="设备名称" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180px" sortable/>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable :sort-map="sortMapData"/>
<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="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
src/views/AIStation/TransTempPage/TransTempNewDataPage.vue
View file @ 8e60692e
......@@ -84,7 +84,26 @@ function getData() {
}
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
Page.total = res.total
Page.rows = res.pageSize
......@@ -102,17 +121,53 @@ 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)
//查询数据
getTransListNewData(item).then(res => {
TransTempNewData.value = res.rows
Page.rows = res.pageSize
Page.total = res.total
})
};
</script>
......@@ -130,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="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="maxTemperature" align="center" label="最高温°C"/>
<el-table-column prop="minTemperature" align="center" label="最低温°C"/>
......
src/views/AIStation/VoiceCommandLocationPage.vue
View file @ 8e60692e
......@@ -44,6 +44,7 @@ const voiceCommandLocationData = ref([
}
])
const enterpriseId = ref();
const loading = ref(true);
const props = { multiple: true, emitPath: false }
......@@ -68,6 +69,7 @@ function loadData(){
stationId: queryParams.value.stationId,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
......@@ -378,12 +380,56 @@ watch(
{ immediate: true } // 只在路径变化时触发
)
getSupplys()
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
const handleSortChange = (column, prop, order) => {
queryParams.value.sortBy = prop;
queryParams.value.sortOrder = order === 'ascending' ? 'asc' : 'desc';
loadData();
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)
})
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>
<template>
......@@ -429,8 +475,8 @@ 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="code" 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 :sort-map="sortMapData"/>
<el-table-column prop="macAddress" align="center" label="MAC地址"/>
<el-table-column prop="ipAddress" align="center" label="IP 地址"/>
<el-table-column label="操作" align="center" width="190" fixed="right">
......
src/views/AIStation/VoiceCommandPage.vue
View file @ 8e60692e
......@@ -2,12 +2,17 @@
import {reactive, ref, watch} from "vue";
import zhCn from "element-plus/dist/locale/zh-cn.mjs"
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 {handleGetAIToken} from "./AItoken";
const options = ref([]);
const enterpriseId = ref();
const props = { multiple: true, emitPath: false }
......@@ -59,8 +64,7 @@ function loadData(){
endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
column: queryParams.value.column,
order: queryParams.value.order,
sortList: sortList,
}
if (item.stationId === undefined){
item.stationId = ''
......@@ -209,14 +213,57 @@ watch(
},
{ immediate: true } // 只在路径变化时触发
)
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
// 处理排序事件
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();
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)
})
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>
......@@ -283,13 +330,12 @@ 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>
<el-table-column prop="stationName" align="center" label="换热站" sortable :sort-map="sortMapData">
<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="createDate" align="center" width="180" label="触发时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="question" align="center" label="提问"/>
<el-table-column prop="answer" align="center" label="回答"/>
<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