Commit 67e7d0aa authored by liwei's avatar liwei

修改了Ai工作站的下拉框bug,并添加了历史页面的告警状态排序

parent 5a6f3e47
......@@ -238,7 +238,7 @@ const handleSortChange = (data) => {
</template>
</el-table-column>
<el-table-column prop="result" align="center" label="读表结果"/>
<el-table-column prop="alarmStatus" align="center" label="告警状态">
<el-table-column prop="alarmStatus" align="center" label="告警状态" sortable :sort-map="sortMapData">
<template #default="scope">
<span v-if="scope.row.alarmStatus=== '0'">正常</span>
<span v-else-if="scope.row.alarmStatus=== '1'" style="color: red">异常</span>
......
......@@ -90,10 +90,16 @@ const queryParams = reactive({
const data = ref([])
// 查询
const search = () => {
let stationId = ''
if (queryParams.stationId === undefined){
stationId = queryParams.stationId = ''
} else {
stationId = queryParams.stationId[2]
}
const item = reactive({
page: Page.page,
size: Page.rows,
stationId: queryParams.stationId[2],
stationId: stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.beginTime,
......@@ -363,7 +369,7 @@ watch(
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1">
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
......
......@@ -251,7 +251,7 @@ const handleSortChange = (data) => {
</el-image>
</template>
</el-table-column>
<el-table-column prop="alarmStatus" align="center" label="告警状态">
<el-table-column prop="alarmStatus" align="center" label="告警状态" sortable :sort-map="sortMapData">
<template #default="scope">
<span v-if="scope.row.alarmStatus=== '0'">正常</span>
<span v-else-if="scope.row.alarmStatus=== '1'" style="color: red">异常</span>
......
......@@ -86,10 +86,16 @@ const queryParams = reactive({
});
const search = () => {
let stationId = ''
if (queryParams.stationId === undefined){
stationId = queryParams.stationId = ''
} else {
stationId = queryParams.stationId[2]
}
const item = {
page: Page.page,
size: Page.rows,
stationId: queryParams.stationId[2],
stationId: stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.beginTime,
......@@ -363,7 +369,7 @@ watch(
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1">
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
......
......@@ -220,7 +220,7 @@ const handleSortChange = (data) => {
<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"/>
<el-table-column prop="alarmStatus" align="center" label="告警状态">
<el-table-column prop="alarmStatus" align="center" label="告警状态" sortable :sort-map="sortMapData">
<template #default="scope">
<span v-if="scope.row.alarmStatus=== '0'">正常</span>
<span v-else-if="scope.row.alarmStatus=== '1'" style="color: red">异常</span>
......
......@@ -110,10 +110,16 @@ const thermalAlarmTypeList = [
]
const childParams = ref({})
const search = () => {
let stationId = ''
if (queryParams.stationId === undefined){
stationId = queryParams.stationId = ''
} else {
stationId = queryParams.stationId[2]
}
const item = {
page: Page.page,
size: Page.rows,
stationId: queryParams.stationId[2],
stationId: stationId,
alarmStatus: queryParams.alarmStatus,
thermalAlarmType: queryParams.thermalAlarmType,
beginTime: queryParams.beginTime,
......@@ -388,7 +394,7 @@ watch(
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1">
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
......
......@@ -460,7 +460,7 @@ defineExpose({
</el-table-column>
<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="告警状态">
<el-table-column prop="alarmStatus" align="center" label="告警状态" sortable :sort-map="sortMapData">
<template #default="scope">
<span v-if="scope.row.alarmStatus === '0'">正常</span>
<span v-else-if="scope.row.alarmStatus === '1'" style="color: red">异常</span>
......
......@@ -78,10 +78,16 @@ const queryParams = reactive({
const Page = reactive({total: 0, rows: 20, page: 1});
const searchData = ref({});
const search = () => {
let stationId = ''
if (queryParams.stationId === undefined){
stationId = queryParams.stationId = ''
} else {
stationId = queryParams.stationId[2]
}
const item = {
page: Page.page,
size: Page.rows,
unitId: queryParams.stationId[2],
unitId: stationId,
alarmStatus: queryParams.alarmStatus,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
......@@ -346,7 +352,7 @@ getSupplys();
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1">
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
......
......@@ -2,6 +2,7 @@
import {defineProps, reactive, ref, watch} from "vue";
import analysisImage from '/imgs/default.png'
import {getTransListAlarmData} from "../../../api/AIStation/TransTemp.js";
import {ElMessage} from "element-plus";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
......@@ -105,6 +106,16 @@ function getDataByParams() {
function getDataNew(item) {
getTransListAlarmData(item).then(res => {
if(res.total === 0){
ElMessage.success({
message: '数据为空!'
})
}
if(res.total === 500){
ElMessage.error({
message: '网络错误!'
})
}
TransTempAlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......
......@@ -2,6 +2,7 @@
import {reactive, ref, watch} from "vue";
import analysisImage from '/imgs/default.png'
import {getTransListHistoryData} from "../../../api/AIStation/TransTemp.js";
import {ElMessage} from "element-plus";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
const TransTempHistoryData = ref([])
......@@ -106,6 +107,16 @@ function getDataByParams() {
function getDataNew(item) {
getTransListHistoryData(item).then(res => {
if(res.total === 0){
ElMessage.success({
message: '数据为空!'
})
}
if(res.total === 500){
ElMessage.error({
message: '网络错误!'
})
}
TransTempHistoryData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......@@ -161,6 +172,16 @@ const handleSortChange = (data) => {
//查询数据
getTransListHistoryData(item).then(res => {
TransTempHistoryData.value = res.rows
if(res.total === 0){
ElMessage.success({
message: '数据为空!'
})
}
if(res.total === 500){
ElMessage.error({
message: '网络错误!'
})
}
Page.rows = res.pageSize
Page.total = res.total
})
......
......@@ -2,6 +2,7 @@
import {reactive, ref, watch} from "vue";
import analysisImage from '/imgs/default.png'
import {getTransListNewData} from "../../../api/AIStation/TransTemp.js";
import {ElMessage} from "element-plus";
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
const TransTempNewData = ref([])
......@@ -112,6 +113,16 @@ function getDataByParams() {
function getDataNew(item) {
getTransListNewData(item).then(res => {
if(res.total === 0){
ElMessage.success({
message: '数据为空!'
})
}
if(res.total === 500){
ElMessage.error({
message: '网络错误!'
})
}
TransTempNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
......
......@@ -117,10 +117,16 @@ const queryParams = reactive({
const Page = reactive({total: 0, rows: 20, page: 1});
const searchData = ref([]);
const search = () => {
let stationId = ''
if (queryParams.stationId === undefined){
stationId = queryParams.stationId = ''
} else {
stationId = queryParams.stationId[2]
}
const item = {
page: Page.page,
size: Page.rows,
stationId: queryParams.stationId[2],
stationId: stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.beginTime,
......@@ -397,7 +403,7 @@ watch(
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1">
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
......
......@@ -69,10 +69,16 @@ const formTitle = ref('')
// loadData()
function loadData() {
console.log('调用了LoadData')
let stationId = ''
if (queryParams.value.stationId === undefined){
stationId = queryParams.value.stationId = ''
} else {
stationId = queryParams.value.stationId[2]
}
const item = {
page: Page.page,
rows: Page.rows,
stationId: queryParams.value.stationId[2],
stationId: stationId,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
sortList: sortList,
......
......@@ -53,10 +53,16 @@ const queryParams = ref({
//加载列表数据
function loadData(){
console.log('调用了LoadData')
let stationId = ''
if (queryParams.value.stationId === undefined){
stationId = queryParams.value.stationId = ''
} else {
stationId = queryParams.value.stationId[2]
}
const item = {
page: Page.page,
rows: Page.rows,
stationId: queryParams.value.stationId[2],
stationId: stationId,
beginTime: queryParams.value.beginTime,
endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress,
......
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