Commit d9a6f818 authored by liwei's avatar liwei

修改了Ai工作站的管道温度bug

parent 1fbd431a
...@@ -16,7 +16,7 @@ const tableHeaderClass = data => { // 表头样式 ...@@ -16,7 +16,7 @@ const tableHeaderClass = data => { // 表头样式
const tableBodyClass = data => { // 表体样式 const tableBodyClass = data => { // 表体样式
return 'table-body-class' return 'table-body-class'
} }
const Page = reactive({total: 0, rows: 20, page: 1}); const Page = reactive({total: 0, rows: 30, page: 1});
// 打开摄像头 // 打开摄像头
function handleCamera() { function handleCamera() {
...@@ -183,6 +183,33 @@ const handleSortChange = (data) => { ...@@ -183,6 +183,33 @@ const handleSortChange = (data) => {
Page.total = res.total Page.total = res.total
}) })
}; };
/**序号自增*/
function Nindex(index) {
// 当前页数 - 1 * 每页数据条数 + 1
const page = Page.page // 当前页码
const pagesize = Page.rows // 每页条数
return index + 1 + (page - 1) * pagesize
}
/**设置表格行高*/
function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {};
css_color['padding-left'] = '0px';
css_color['padding-right'] = '0px';
css_color['padding'] = '0px';
// frozenList.forEach(element => {
// if (element.field === column.property) {
// css_color['background-color'] = '#' + element.color;
// }
// })
// otherList.forEach(element => {
// if (element.enName === column.property) {
// css_color['background-color'] = '#' + element.backColor;
// }
// })
return css_color;
}
</script> </script>
<template> <template>
...@@ -192,13 +219,14 @@ const handleSortChange = (data) => { ...@@ -192,13 +219,14 @@ const handleSortChange = (data) => {
<el-table <el-table
:data="AlarmData" :data="AlarmData"
border border
:cell-style="setCellStyle"
style="width: 98%;margin-left: 15px" style="width: 98%;margin-left: 15px"
height="calc(100vh - 330px)" height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass" :header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
@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" :index="Nindex"/>
<el-table-column prop="stationName" align="center" label="换热站" sortable :sort-map="sortMapData"> <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>
...@@ -238,7 +266,7 @@ const handleSortChange = (data) => { ...@@ -238,7 +266,7 @@ const handleSortChange = (data) => {
<el-footer style="height: 50px;"> <el-footer style="height: 50px;">
<el-config-provider :locale="zhCn"> <el-config-provider :locale="zhCn">
<el-pagination v-model:current-page="Page.page" v-model:page-size="Page.rows" <el-pagination v-model:current-page="Page.page" v-model:page-size="Page.rows"
:page-sizes="[20, 30, 50, 100, 200, 300, 400]" :small="small" :disabled="disabled" :page-sizes="[30, 40, 50, 100, 200, 300, 400]" :small="small" :disabled="disabled"
:background="background" layout="total, sizes, prev, pager, next, jumper" :total="Page.total" :background="background" layout="total, sizes, prev, pager, next, jumper" :total="Page.total"
@size-change="handleSizeChange" @current-change="handleCurrentChange" class="pagination"/> @size-change="handleSizeChange" @current-change="handleCurrentChange" class="pagination"/>
</el-config-provider> </el-config-provider>
......
...@@ -9,7 +9,7 @@ const params = ref({}) ...@@ -9,7 +9,7 @@ const params = ref({})
const options = ref([]) const options = ref([])
const enterpriseId = ref(); const enterpriseId = ref();
const loading = ref(true); const loading = ref(true);
const historyPage = reactive({total: 0, rows: 20, page: 1}); const historyPage = reactive({total: 0, rows: 30, page: 1});
// 供热站 // 供热站
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
...@@ -193,6 +193,33 @@ const handleSortChange = (data) => { ...@@ -193,6 +193,33 @@ const handleSortChange = (data) => {
historyPage.total = res.total historyPage.total = res.total
}) })
}; };
/**序号自增*/
function Nindex(index) {
// 当前页数 - 1 * 每页数据条数 + 1
const page = Page.page // 当前页码
const pagesize = Page.rows // 每页条数
return index + 1 + (page - 1) * pagesize
}
/**设置表格行高*/
function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {};
css_color['padding-left'] = '0px';
css_color['padding-right'] = '0px';
css_color['padding'] = '0px';
// frozenList.forEach(element => {
// if (element.field === column.property) {
// css_color['background-color'] = '#' + element.color;
// }
// })
// otherList.forEach(element => {
// if (element.enName === column.property) {
// css_color['background-color'] = '#' + element.backColor;
// }
// })
return css_color;
}
</script> </script>
<template> <template>
...@@ -202,13 +229,14 @@ const handleSortChange = (data) => { ...@@ -202,13 +229,14 @@ const handleSortChange = (data) => {
<el-table <el-table
:data="HistoryData" :data="HistoryData"
border border
:cell-style="setCellStyle"
style="width: 98%;margin-left: 15px" style="width: 98%;margin-left: 15px"
height="calc(100vh - 280px)" height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass" :header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
@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" :index="Nindex"/>
<el-table-column prop="stationName" align="center" label="换热站名称" sortable :sort-map="sortMapData"> <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>
...@@ -239,7 +267,7 @@ const handleSortChange = (data) => { ...@@ -239,7 +267,7 @@ const handleSortChange = (data) => {
<el-footer style="height: 50px;"> <el-footer style="height: 50px;">
<el-config-provider :locale="zhCn"> <el-config-provider :locale="zhCn">
<el-pagination v-model:current-page="historyPage.page" v-model:page-size="historyPage.rows" <el-pagination v-model:current-page="historyPage.page" v-model:page-size="historyPage.rows"
:page-sizes="[20, 30, 50, 100, 200, 300, 400]" :small="small" :disabled="disabled" :page-sizes="[30, 40, 50, 100, 200, 300, 400]" :small="small" :disabled="disabled"
:background="background" layout="total, sizes, prev, pager, next, jumper" :background="background" layout="total, sizes, prev, pager, next, jumper"
:total="historyPage.total" :total="historyPage.total"
@size-change="handleSizeChange" @current-change="handleCurrentChange" class="pagination"/> @size-change="handleSizeChange" @current-change="handleCurrentChange" class="pagination"/>
......
...@@ -9,7 +9,7 @@ const params = ref({}) ...@@ -9,7 +9,7 @@ const params = ref({})
const options = ref([]) const options = ref([])
console.log('params!!!!!!!!!!!!!!!', params.value) console.log('params!!!!!!!!!!!!!!!', params.value)
// 分页 // 分页
const Page = reactive({total: 0, rows: 20, page: 1}); const Page = reactive({total: 0, rows: 30, page: 1});
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
return 'table-header-class' return 'table-header-class'
} }
...@@ -202,22 +202,50 @@ const handleSortChange = (data) => { ...@@ -202,22 +202,50 @@ const handleSortChange = (data) => {
Page.total = res.total Page.total = res.total
}) })
}; };
/**序号自增*/
function Nindex(index) {
// 当前页数 - 1 * 每页数据条数 + 1
const page = Page.page // 当前页码
const pagesize = Page.rows // 每页条数
return index + 1 + (page - 1) * pagesize
}
/**设置表格行高*/
function setCellStyle({ row, column, rowIndex, columnIndex }) {
let css_color = {};
css_color['padding-left'] = '0px';
css_color['padding-right'] = '0px';
css_color['padding'] = '0px';
// frozenList.forEach(element => {
// if (element.field === column.property) {
// css_color['background-color'] = '#' + element.color;
// }
// })
// otherList.forEach(element => {
// if (element.enName === column.property) {
// css_color['background-color'] = '#' + element.backColor;
// }
// })
return css_color;
}
</script> </script>
<template> <template>
<div> <div>
<div class="PipelineTempPage-container"> <div class="PipelineTempPage-container">
<div> <div >
<el-table <el-table
:data="PipelineTempNewData" :data="PipelineTempNewData"
border border
:cell-style="setCellStyle"
style="width: 98%;margin-left: 15px" style="width: 98%;margin-left: 15px"
height="calc(100vh - 280px)" height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass" :header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
@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" :index="Nindex"/>
<el-table-column prop="stationName" align="center" label="换热站名称" sortable :sort-map="sortMapData"> <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>
...@@ -248,7 +276,7 @@ const handleSortChange = (data) => { ...@@ -248,7 +276,7 @@ const handleSortChange = (data) => {
<el-footer style="height: 50px;"> <el-footer style="height: 50px;">
<el-config-provider :locale="zhCn"> <el-config-provider :locale="zhCn">
<el-pagination v-model:current-page="Page.page" v-model:page-size="Page.rows" <el-pagination v-model:current-page="Page.page" v-model:page-size="Page.rows"
:page-sizes="[20, 30, 50, 100, 200, 300, 400]" :small="small" :disabled="disabled" :page-sizes="[30, 40, 50, 100, 200, 300, 400]" :small="small" :disabled="disabled"
:background="background" layout="total, sizes, prev, pager, next, jumper" :total="Page.total" :background="background" layout="total, sizes, prev, pager, next, jumper" :total="Page.total"
@size-change="handleSizeChange" @current-change="handleCurrentChange" class="pagination"/> @size-change="handleSizeChange" @current-change="handleCurrentChange" class="pagination"/>
</el-config-provider> </el-config-provider>
......
...@@ -52,6 +52,10 @@ const handleTabClick = (tab, event) => { ...@@ -52,6 +52,10 @@ const handleTabClick = (tab, event) => {
selectedComponent.value = selectedItem.component; selectedComponent.value = selectedItem.component;
selectedBtn.value = selectedItem.id; selectedBtn.value = selectedItem.id;
resetSearch(); resetSearch();
if (selectedBtn.value !== 1){
queryParams.beginTime = DeviceStartTime
queryParams.endTime = DeviceEndTime
}
getSupplys() getSupplys()
search() search()
} }
...@@ -74,6 +78,39 @@ const alarmStatusList = [ ...@@ -74,6 +78,39 @@ const alarmStatusList = [
value: 1 value: 1
} }
] ]
//给搜索框的开始时间和结束时间赋值
var date = new Date();
var year = date.getFullYear();
var day = 0;
var dateArr = [
date.getMonth() + 1, //月份从0~11,所以加一
date.getDate(),
date.getHours(),
date.getMinutes(),
date.getSeconds(),
];
for (var i = 0; i < dateArr.length; i++) {
if (dateArr[i] >= 1 && dateArr[i] <= 9) {
dateArr[i] = "0" + dateArr[i];
}
}
day = dateArr[1] - 1;
if (day >= 1 && day <= 9) {
day = "0" + day;
}
var DeviceStartTime = sessionStorage.getItem("DeviceQueryStart");
if(!DeviceStartTime){
DeviceStartTime = year + "-" + dateArr[0] + "-" + day + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
sessionStorage.setItem("DeviceQueryStart", DeviceStartTime);
}
var DeviceEndTime = sessionStorage.getItem("DeviceQueryEnd");
if(!DeviceEndTime){
DeviceEndTime = year + "-" + dateArr[0] + "-" + dateArr[1] + " " + dateArr[2] + ":" + dateArr[3] + ":" + dateArr[4];
sessionStorage.setItem("DeviceQueryEnd", DeviceEndTime);
}
const queryParams = reactive({ const queryParams = reactive({
stationId: '', stationId: '',
alarmStatus: '', alarmStatus: '',
...@@ -153,7 +190,6 @@ const search = () => { ...@@ -153,7 +190,6 @@ const search = () => {
function getNumber() { function getNumber() {
getPipAlarmNumber().then(res => { getPipAlarmNumber().then(res => {
console.log('123123123123-----------', res.data)
alarmNum.value = res.data ? res.data : 0 alarmNum.value = res.data ? res.data : 0
}) })
} }
......
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