Commit 3f620fc0 authored by liwei's avatar liwei

修改了Ai工作站的bug

parent 7de99d29
......@@ -114,8 +114,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -126,8 +126,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -107,6 +107,7 @@ function getDataByParams() {
watch(
() => props.queryParams,
(newData) => {
console.log('props.queryParams:',props.queryParams)
params.value = newData
getDataNew(params.value)
}
......@@ -128,8 +129,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -204,6 +204,16 @@ const resetSearch = () => {
queryParams.alarmType = ''
queryParams.stationId = ''
searchData.value = []
childParams.value = {
page: Page.page,
size: Page.rows,
stationId: '',
alarmStatus: '',
alarmType: '',
beginTime: '',
endTime: '',
}
console.log('queryParams:',queryParams)
getData()
}
......
......@@ -121,8 +121,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -128,8 +128,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......@@ -146,7 +149,7 @@ const handleSortChange = (data) => {
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
thermalAlarmType: props.queryParams.thermalAlarmType,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
......
......@@ -131,8 +131,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......@@ -149,7 +152,7 @@ const handleSortChange = (data) => {
beginTime: props.queryParams.beginTime,
endTime: props.queryParams.endTime,
alarmStatus: props.queryParams.alarmStatus,
thermalAlarmType: props.queryParams.thermalAlarmType,
alarmType: props.queryParams.alarmType,
sortList: sortList,
}
if (item.stationId === undefined){
......@@ -283,8 +286,8 @@ const handleSortChange = (data) => {
</el-col>
<el-col :span="12">
<el-form-item label="状态:" prop="taskState">
<span v-if="singleDetails.taskState=== 0">执行中</span>
<span v-else-if="singleDetails.taskState=== 1">成功</span>
<span v-if="singleDetails.taskState=== 1">执行中</span>
<span v-else-if="singleDetails.taskState=== 2">成功</span>
<span v-else-if="singleDetails.taskState=== 99">失败</span>
<span v-else>-</span>
</el-form-item>
......
......@@ -203,6 +203,15 @@ const resetSearch = () => {
queryParams.alarmType = ''
queryParams.stationId = ''
searchData.value = []
childParams.value = {
page: Page.page,
size: Page.rows,
stationId: '',
alarmStatus: '',
alarmType: '',
beginTime: '',
endTime: '',
}
getData()
}
......
......@@ -111,8 +111,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -121,8 +121,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -130,8 +130,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -227,6 +227,15 @@ const resetSearch = () => {
queryParams.thermalAlarmType = ''
queryParams.stationId = ''
searchData.value = []
childParams.value = {
page: Page.page,
size: Page.rows,
stationId: '',
alarmStatus: '',
thermalAlarmType: '',
beginTime: '',
endTime: '',
}
getData()
}
const options = ref([]);
......
......@@ -115,8 +115,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -250,8 +250,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -135,8 +135,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -181,6 +181,15 @@ const resetSearch = () => {
queryParams.endTime = ''
queryParams.stationId = ''
searchData.value = []
childParams.value = {
page: Page.page,
size: Page.rows,
stationId: '',
alarmStatus: '',
alarmType: '',
beginTime: '',
endTime: '',
}
getData()
};
const childComponentRef = ref(null);
......
......@@ -122,8 +122,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -124,8 +124,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -131,8 +131,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
......@@ -234,6 +234,15 @@ const resetSearch = () => {
queryParams.alarmType = ''
queryParams.stationId = ''
searchData.value = []
childParams.value = {
page: Page.page,
size: Page.rows,
stationId: '',
alarmStatus: '',
alarmType: '',
beginTime: '',
endTime: '',
}
getData()
};
const options = ref([]);
......
......@@ -389,8 +389,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......@@ -400,7 +403,6 @@ const handleSortChange = (data) => {
sortMap.forEach((value, key) => {
sortList.push(value)
})
console.log('sortList:',sortList)
const item = {
page: Page.page,
rows: Page.rows,
......
......@@ -231,8 +231,11 @@ const handleSortChange = (data) => {
sortList = []
// 添加新的排序属性
const sortMap = sortMapData;
if (sortMap.size > 0){
sortMap.clear()
}
//将被点击的排序字段信息data,注册到sortMap中,key为参数名,value为{prop,order}
if (sortMap.get(data.prop) && data.order === null) {
if (data.order === null){
sortMap.delete(data.prop);
} else {
sortMap.set(data.prop, { prop: data.prop, order: data.order });
......
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