Commit bca3928a authored by hubaoshan's avatar hubaoshan

修改页面bug

parent 077ad2c7
<script setup> <script setup>
import {ref, defineProps, defineEmits, computed, isRef, onMounted, watchEffect, reactive, watch} from "vue"; import {ref, defineProps, defineEmits, computed, isRef, onMounted, watchEffect, reactive, watch} from "vue";
import {getAlarmListData} from "../../../api/AIStation/Extinguisher.js"; import {getAlarmListData, getListHistoryData} from "../../../api/AIStation/Extinguisher.js";
let AlarmData = ref([]) let AlarmData = ref([])
...@@ -20,17 +20,29 @@ function handleCamera() { ...@@ -20,17 +20,29 @@ function handleCamera() {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
const params = ref({})
const options = ref([])
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
const props = defineProps({ const props = defineProps({
searchData: Object searchData: {
type: Object,
required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
}
}); });
getData() getData()
function getData(){ function getData(){
...@@ -50,12 +62,38 @@ function getData(){ ...@@ -50,12 +62,38 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getAlarmListData(params.value).then(res => {
AlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
watch( watch(
() => props.searchData, () => props.searchData,
(newData) => { (newData) => {
AlarmData = props.searchData.rows; AlarmData = props.searchData.rows;
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值eeeerrrrr',options.value)
},
{ deep: true }
)
</script> </script>
<template> <template>
......
<script setup> <script setup>
import {reactive, ref, watch} from "vue"; import {reactive, ref, watch} from "vue";
import analysisImage from '@/assets/imgs/dengluanniu_wx.png' import analysisImage from '@/assets/imgs/dengluanniu_wx.png'
import {getListHistoryData} from "../../../api/AIStation/Extinguisher.js"; import {getListHistoryData, getListNewData} from "../../../api/AIStation/Extinguisher.js";
let HistoryData = ref([]) let HistoryData = ref([])
...@@ -12,7 +12,15 @@ const historyPage = reactive({total: 0, rows: 20, page: 1}); ...@@ -12,7 +12,15 @@ const historyPage = reactive({total: 0, rows: 20, page: 1});
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
...@@ -38,13 +46,14 @@ function detail(row) { ...@@ -38,13 +46,14 @@ function detail(row) {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
historyPage.rows = val; historyPage.rows = val;
getData() getDataByParams()
}; };
const params = ref({})
const options = ref([])
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
historyPage.page = val; historyPage.page = val;
getData() getDataByParams()
}; };
getData() getData()
function getData() { function getData() {
...@@ -66,6 +75,17 @@ function getData() { ...@@ -66,6 +75,17 @@ function getData() {
console.log('HistoryData.value',HistoryData.value) console.log('HistoryData.value',HistoryData.value)
}) })
} }
function getDataByParams(){
getListHistoryData(params.value).then(res => {
data.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
watch( watch(
() => props.searchData, () => props.searchData,
(newData) => { (newData) => {
...@@ -74,6 +94,22 @@ watch( ...@@ -74,6 +94,22 @@ watch(
historyPage.total = props.searchData.total historyPage.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
</script> </script>
<template> <template>
......
...@@ -10,7 +10,15 @@ const data = ref([]) ...@@ -10,7 +10,15 @@ const data = ref([])
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
// 分页 // 分页
...@@ -27,20 +35,25 @@ const singleDetails = ref({}) ...@@ -27,20 +35,25 @@ const singleDetails = ref({})
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
// 处理图片源 // 处理图片源
const getImageSrc = (row) => { const getImageSrc = (row) => {
return row.picUrl ? row.picUrl : analysisImage return row.picUrl ? row.picUrl : analysisImage
}; };
const options = reactive([]) const params = ref({})
const options = ref([])
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
function detail(row) { function detail(row) {
singleDetails.value = row singleDetails.value = row
detailOpen.value = true detailOpen.value = true
...@@ -66,6 +79,13 @@ function getData(){ ...@@ -66,6 +79,13 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getListNewData(params.value).then(res => {
data.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
watch( watch(
() => props.searchData, () => props.searchData,
...@@ -76,6 +96,22 @@ watch( ...@@ -76,6 +96,22 @@ watch(
Page.total = props.searchData.total Page.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
</script> </script>
<template> <template>
......
...@@ -6,7 +6,6 @@ import ExtinguisherAlarmPage from './ExtinguisherAlarmPage.vue' // 导入组件 ...@@ -6,7 +6,6 @@ import ExtinguisherAlarmPage from './ExtinguisherAlarmPage.vue' // 导入组件
import zhCn from "element-plus/dist/locale/zh-cn.mjs" import zhCn from "element-plus/dist/locale/zh-cn.mjs"
import store from "../../../store/index.js"; import store from "../../../store/index.js";
import {handleGetAIToken} from '../AItoken' import {handleGetAIToken} from '../AItoken'
import axios from 'axios'
import { import {
getAlarmListData, getAlarmListData,
getAlarmNumData, getAlarmNumData,
...@@ -14,11 +13,19 @@ import { ...@@ -14,11 +13,19 @@ import {
getListNewData getListNewData
} from "../../../api/AIStation/Extinguisher.js"; } from "../../../api/AIStation/Extinguisher.js";
import {getMoveAlarmNumber} from "../../../api/AIStation/MoveMonitor.js"; import {getMoveAlarmNumber} from "../../../api/AIStation/MoveMonitor.js";
import { provide } from 'vue';
provide('getAIToken', handleGetAIToken);
const options = ref([]); const options = ref([]);
const enterpriseId = ref(); const enterpriseId = ref();
const props = {multiple: true, emitPath: false} const props = {multiple: true, emitPath: false}
// 初始化选中的标签页
onMounted(() => {
activeName.value = topBtn.value[0].component;
selectedBtn.value = topBtn.value[0].id;
getSupplys()
});
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
// 列表 // 列表
const topBtn = ref([ const topBtn = ref([
...@@ -33,7 +40,7 @@ const selectedComponent = ref(ExtinguisherNewDataPage); ...@@ -33,7 +40,7 @@ const selectedComponent = ref(ExtinguisherNewDataPage);
// 当前选中的标签页名称 // 当前选中的标签页名称
const activeName = ref(ExtinguisherNewDataPage); const activeName = ref(ExtinguisherNewDataPage);
const optionsList = ref([])
// 报警数量 // 报警数量
const alarmNum = ref(0); const alarmNum = ref(0);
// 查询结果数据 // 查询结果数据
...@@ -46,6 +53,7 @@ const handleTabClick = (tab, event) => { ...@@ -46,6 +53,7 @@ const handleTabClick = (tab, event) => {
if (selectedItem) { if (selectedItem) {
selectedComponent.value = selectedItem.component; selectedComponent.value = selectedItem.component;
selectedBtn.value = selectedItem.id; selectedBtn.value = selectedItem.id;
getSupplys()
resetSearch(); resetSearch();
} }
}; };
...@@ -155,22 +163,22 @@ const resetSearch = () => { ...@@ -155,22 +163,22 @@ const resetSearch = () => {
beginTime: '', beginTime: '',
endTime: '' endTime: ''
}) })
if (selectedBtn.value === 1) { // if (selectedBtn.value === 1) {
getListNewData(item).then(res => { // getListNewData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 2) { // } else if (selectedBtn.value === 2) {
getListHistoryData(item).then(res => { // getListHistoryData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 3) { // } else if (selectedBtn.value === 3) {
getAlarmListData(item).then(res => { // getAlarmListData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
getAlarmNumData().then(res => { // getAlarmNumData().then(res => {
alarmNum.value = res.data // alarmNum.value = res.data
}) // })
} // }
} }
...@@ -221,7 +229,7 @@ function getEnterprise() { ...@@ -221,7 +229,7 @@ function getEnterprise() {
// } // }
// // stationId.value.push(options[0].children[0].children[0].value); // // stationId.value.push(options[0].children[0].children[0].value);
// } // }
getSupplys()
//获取换热机组列表 //获取换热机组列表
function getSupplys(){ function getSupplys(){
loading.value = true; loading.value = true;
...@@ -229,14 +237,12 @@ function getSupplys(){ ...@@ -229,14 +237,12 @@ function getSupplys(){
options.length = 0; options.length = 0;
const result = store.getters.getEnterprise(); const result = store.getters.getEnterprise();
if (result) { if (result) {
console.log('result:',result)
result.forEach(element=>{ result.forEach(element=>{
let allItems = [] let allItems = []
if(element.enterpriseId === enterpriseId.value){ if(element.enterpriseId === enterpriseId.value){
if(element.enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){ if(element.enterpriseId === "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()){
element.serviceCenterList.forEach(center=>{//遍历一级目录下的 element.serviceCenterList.forEach(center=>{//遍历一级目录下的
center.supplyList.forEach(supply => {//拿到一级目录下的然后遍历它二级目录下的 center.supplyList.forEach(supply => {//拿到一级目录下的然后遍历它二级目录下的
console.log('supply:',supply)
supply.stationList.forEach(station => {//拿到 supply.stationList.forEach(station => {//拿到
let unitIdList = [] let unitIdList = []
supply.transferList.forEach(unit => { supply.transferList.forEach(unit => {
...@@ -260,6 +266,8 @@ function getSupplys(){ ...@@ -260,6 +266,8 @@ function getSupplys(){
} }
} }
options.value = allItems; options.value = allItems;
optionsList.value = options.value
console.log('optionsList',optionsList.value)
}); });
} }
} }
...@@ -325,7 +333,7 @@ getSupplys() ...@@ -325,7 +333,7 @@ getSupplys()
> >
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<component :is="selectedComponent" :queryParams = 'JSON.stringify(queryParams)' :search-data="searchData"></component> <component :is="selectedComponent" :option="optionsList" :queryParams = 'queryParams' :search-data="searchData"></component>
</div> </div>
</div> </div>
......
...@@ -5,7 +5,8 @@ import {getMoveListAlarmNewData} from "../../../api/AIStation/MoveMonitor.js"; ...@@ -5,7 +5,8 @@ import {getMoveListAlarmNewData} from "../../../api/AIStation/MoveMonitor.js";
let AlarmData = ref([]) let AlarmData = ref([])
const params = ref({})
const options = ref([])
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
return 'table-header-class' return 'table-header-class'
} }
...@@ -21,20 +22,28 @@ function handleCamera() { ...@@ -21,20 +22,28 @@ function handleCamera() {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
//子组件接收父组件传递过来的值 //子组件接收父组件传递过来的值
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -44,6 +53,21 @@ watch( ...@@ -44,6 +53,21 @@ watch(
Page.total = props.searchData.total; Page.total = props.searchData.total;
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值eeeerrrrr',options.value)
},
{ deep: true }
)
getData() getData()
function getData(){ function getData(){
const item = reactive({ const item = reactive({
...@@ -62,6 +86,17 @@ function getData(){ ...@@ -62,6 +86,17 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getMoveListAlarmNewData(params.value).then(res => {
AlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -77,7 +112,11 @@ function getData(){ ...@@ -77,7 +112,11 @@ function getData(){
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站" sortable/> <el-table-column prop="stationId" align="center" label="换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcName" 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="eventTime" align="center" label="报警时间" sortable/>
<el-table-column prop="alarmType" align="center" label="报警类型"> <el-table-column prop="alarmType" align="center" label="报警类型">
......
...@@ -31,19 +31,28 @@ function detail(row) { ...@@ -31,19 +31,28 @@ function detail(row) {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
historyPage.rows = val; historyPage.rows = val;
getData() getDataByParams()
}; };
const params = ref({})
const options = ref({})
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
historyPage.page = val; historyPage.page = val;
getData() getDataByParams()
}; };
//子组件接收父组件传递过来的值 //子组件接收父组件传递过来的值
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -54,6 +63,22 @@ watch( ...@@ -54,6 +63,22 @@ watch(
historyPage.total = props.searchData.total historyPage.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = newVal
console.log('值ooo',options.value)
},
{ deep: true }
)
getData() getData()
function getData() { function getData() {
console.log(222222222) console.log(222222222)
...@@ -74,6 +99,17 @@ function getData() { ...@@ -74,6 +99,17 @@ function getData() {
console.log('HistoryData.value',HistoryData.value) console.log('HistoryData.value',HistoryData.value)
}) })
} }
function getDataByParams(){
getMoveListHistoryData(params.value).then(res => {
HistoryData.value = res.rows
historyPage.total = res.total
historyPage.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -89,7 +125,11 @@ function getData() { ...@@ -89,7 +125,11 @@ function getData() {
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="所属换热站" sortable/> <el-table-column prop="stationId" align="center" label="所属换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable/> <el-table-column prop="relateDeviceId" align="center" label="设备" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable/> <el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable/>
<el-table-column prop="meterType" align="center" label="设备类型"> <el-table-column prop="meterType" align="center" label="设备类型">
......
...@@ -20,13 +20,14 @@ const singleDetails = ref({}) ...@@ -20,13 +20,14 @@ const singleDetails = ref({})
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
const params = ref({})
const options = ref({})
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
// 处理图片源 // 处理图片源
const getImageSrc = (row) => { const getImageSrc = (row) => {
...@@ -37,11 +38,26 @@ function detail(row) { ...@@ -37,11 +38,26 @@ function detail(row) {
singleDetails.value = row singleDetails.value = row
detailOpen.value = true detailOpen.value = true
} }
function getDataByParams(){
getMoveListNewData(params.value).then(res => {
data.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
//子组件接收父组件传递过来的值 //子组件接收父组件传递过来的值
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -53,6 +69,22 @@ watch( ...@@ -53,6 +69,22 @@ watch(
Page.total = props.searchData.total Page.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = newVal
console.log('值ooo',options.value)
},
{ deep: true }
)
onMounted( onMounted(
()=>{ ()=>{
getData() getData()
...@@ -74,6 +106,10 @@ function getData(){ ...@@ -74,6 +106,10 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -89,7 +125,11 @@ function getData(){ ...@@ -89,7 +125,11 @@ function getData(){
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="所属换热站" sortable/> <el-table-column prop="stationId" align="center" label="所属换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable/> <el-table-column prop="relateDeviceId" align="center" label="设备" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable/> <el-table-column prop="acquisitionTime" align="center" label="采集时间" width="180" sortable/>
<el-table-column prop="meterType" align="center" label="设备类型"> <el-table-column prop="meterType" align="center" label="设备类型">
......
...@@ -26,8 +26,7 @@ const topBtn = ref([ ...@@ -26,8 +26,7 @@ const topBtn = ref([
{id: 3, name: '报警信息', component: MoveMonitorAlarmPage} {id: 3, name: '报警信息', component: MoveMonitorAlarmPage}
]); ]);
const selectedBtn = ref(null); const selectedBtn = ref(null);
const dateRange = ref([]) const optionsList = ref([])
// 默认显示的组件页面 // 默认显示的组件页面
const selectedComponent = ref(MoveMonitorNewDataPage); const selectedComponent = ref(MoveMonitorNewDataPage);
...@@ -131,22 +130,22 @@ const resetSearch = () => { ...@@ -131,22 +130,22 @@ const resetSearch = () => {
beginTime: '', beginTime: '',
endTime: '' endTime: ''
}) })
if (selectedBtn.value === 1) { // if (selectedBtn.value === 1) {
getMoveListNewData(item).then(res => { // getMoveListNewData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 2) { // } else if (selectedBtn.value === 2) {
getMoveListHistoryData(item).then(res => { // getMoveListHistoryData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 3) { // } else if (selectedBtn.value === 3) {
getMoveListAlarmNewData(item).then(res => { // getMoveListAlarmNewData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
getMoveAlarmNumber().then(res => { // getMoveAlarmNumber().then(res => {
alarmNum.value = res.data // alarmNum.value = res.data
}) // })
} // }
} }
const loading = ref(true); const loading = ref(true);
...@@ -231,6 +230,7 @@ function getSupplys(){ ...@@ -231,6 +230,7 @@ function getSupplys(){
} }
} }
options.value = allItems; options.value = allItems;
optionsList.value = options.value
}); });
} }
} }
...@@ -297,7 +297,7 @@ getSupplys(); ...@@ -297,7 +297,7 @@ getSupplys();
> >
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<component :is="selectedComponent" :search-data="searchData"></component> <component :is="selectedComponent" :option="optionsList" :queryParams = 'queryParams' :search-data="searchData"></component>
</div> </div>
</div> </div>
......
...@@ -2,20 +2,12 @@ ...@@ -2,20 +2,12 @@
import {ref, defineProps, defineEmits, computed, isRef, onMounted, watchEffect, reactive, watch} from "vue"; import {ref, defineProps, defineEmits, computed, isRef, onMounted, watchEffect, reactive, watch} from "vue";
import {getMoveListAlarmNewData} from "../../../api/AIStation/MoveMonitor.js"; import {getMoveListAlarmNewData} from "../../../api/AIStation/MoveMonitor.js";
import {getPipListAlarmData} from "../../../api/AIStation/PipelineTemp.js"; import {getPipListAlarmData} from "../../../api/AIStation/PipelineTemp.js";
import {getAlarmListData} from "../../../api/AIStation/Extinguisher.js";
let AlarmData = ref([ let AlarmData = ref([])
{ const params = ref({})
stationId: '1', const options = ref([])
srcParentIndex: '1',
alarmStatus: '1',
eventTime: '2023-02-01 12:00:00',
alarmType: '1',
handleStatus: '0',
temperature: '50'
}
])
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
return 'table-header-class' return 'table-header-class'
} }
...@@ -31,19 +23,27 @@ function handleCamera() { ...@@ -31,19 +23,27 @@ function handleCamera() {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
//子组件接收父组件传递过来的值 //子组件接收父组件传递过来的值
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -53,6 +53,21 @@ watch( ...@@ -53,6 +53,21 @@ watch(
Page.total = props.searchData.total; Page.total = props.searchData.total;
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值eeeerrrrr',options.value)
},
{ deep: true }
)
getData() getData()
function getData(){ function getData(){
const item = reactive({ const item = reactive({
...@@ -71,6 +86,17 @@ function getData(){ ...@@ -71,6 +86,17 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getPipListAlarmData(params.value).then(res => {
AlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -86,7 +112,11 @@ function getData(){ ...@@ -86,7 +112,11 @@ function getData(){
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站" sortable/> <el-table-column prop="stationId" align="center" label="换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcParentIndex" align="center" label="设施名称" sortable/> <el-table-column prop="srcParentIndex" align="center" label="设施名称" sortable/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable/> <el-table-column prop="eventTime" align="center" label="报警时间" sortable/>
<el-table-column prop="thermalAlarmType" align="center" label="报警类型"> <el-table-column prop="thermalAlarmType" align="center" label="报警类型">
......
...@@ -5,7 +5,8 @@ import {getMoveListHistoryData} from "../../../api/AIStation/MoveMonitor.js"; ...@@ -5,7 +5,8 @@ import {getMoveListHistoryData} from "../../../api/AIStation/MoveMonitor.js";
import {getPipListAlarmData, getPipListHistoryData} from "../../../api/AIStation/PipelineTemp.js"; import {getPipListAlarmData, getPipListHistoryData} from "../../../api/AIStation/PipelineTemp.js";
let HistoryData = ref([]) let HistoryData = ref([])
const params = ref({})
const options = ref([])
const historyPage = reactive({total: 0, rows: 20, page: 1}); const historyPage = reactive({total: 0, rows: 20, page: 1});
// 供热站 // 供热站
...@@ -27,19 +28,27 @@ function detail(row) { ...@@ -27,19 +28,27 @@ function detail(row) {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
historyPage.rows = val; historyPage.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
historyPage.page = val; historyPage.page = val;
getData() getDataByParams()
}; };
//子组件接收父组件传递过来的值 //子组件接收父组件传递过来的值
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -50,6 +59,22 @@ watch( ...@@ -50,6 +59,22 @@ watch(
historyPage.total = props.searchData.total historyPage.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
getData() getData()
function getData() { function getData() {
console.log(222222222) console.log(222222222)
...@@ -70,6 +95,17 @@ function getData() { ...@@ -70,6 +95,17 @@ function getData() {
console.log('HistoryData.value',HistoryData.value) console.log('HistoryData.value',HistoryData.value)
}) })
} }
function getDataByParams(){
getPipListHistoryData(params.value).then(res => {
HistoryData.value = res.rows
historyPage.total = res.total
historyPage.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -85,7 +121,11 @@ function getData() { ...@@ -85,7 +121,11 @@ function getData() {
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable/> <el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/> <el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/>
<el-table-column prop="sid" 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="acquisitionTime" align="center" width="180px" label="采集时间" sortable/>
......
...@@ -5,7 +5,8 @@ import {getMoveListNewData} from "../../../api/AIStation/MoveMonitor.js"; ...@@ -5,7 +5,8 @@ import {getMoveListNewData} from "../../../api/AIStation/MoveMonitor.js";
import {getPipListNewData} from "../../../api/AIStation/PipelineTemp.js"; import {getPipListNewData} from "../../../api/AIStation/PipelineTemp.js";
const data = ref([]) const data = ref([])
const params = ref({})
const options = ref([])
// 分页 // 分页
const Page = reactive({total: 0, rows: 20, page: 1}); const Page = reactive({total: 0, rows: 20, page: 1});
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
...@@ -20,13 +21,13 @@ const singleDetails = ref({}) ...@@ -20,13 +21,13 @@ const singleDetails = ref({})
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
function detail(row) { function detail(row) {
...@@ -37,7 +38,15 @@ function detail(row) { ...@@ -37,7 +38,15 @@ function detail(row) {
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -49,6 +58,22 @@ watch( ...@@ -49,6 +58,22 @@ watch(
Page.total = props.searchData.total Page.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
getData() getData()
function getData(){ function getData(){
const item = reactive({ const item = reactive({
...@@ -66,6 +91,17 @@ function getData(){ ...@@ -66,6 +91,17 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getPipListNewData(params.value).then(res => {
data.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -81,7 +117,11 @@ function getData(){ ...@@ -81,7 +117,11 @@ function getData(){
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable/> <el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/> <el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/>
<el-table-column prop="sid" 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="acquisitionTime" align="center" width="180px" label="采集时间" sortable/>
......
...@@ -27,6 +27,7 @@ const topBtn = ref([ ...@@ -27,6 +27,7 @@ const topBtn = ref([
]); ]);
const selectedBtn = ref(null); const selectedBtn = ref(null);
const dateRange = ref([]) const dateRange = ref([])
const optionsList = ref([])
// 默认显示的组件页面 // 默认显示的组件页面
const selectedComponent = ref(PipelineTempNewDataPage); const selectedComponent = ref(PipelineTempNewDataPage);
...@@ -45,6 +46,7 @@ const handleTabClick = (tab, event) => { ...@@ -45,6 +46,7 @@ const handleTabClick = (tab, event) => {
selectedComponent.value = selectedItem.component; selectedComponent.value = selectedItem.component;
selectedBtn.value = selectedItem.id; selectedBtn.value = selectedItem.id;
resetSearch(); resetSearch();
getSupplys()
} }
}; };
...@@ -154,22 +156,22 @@ const resetSearch = () => { ...@@ -154,22 +156,22 @@ const resetSearch = () => {
beginTime: '', beginTime: '',
endTime: '' endTime: ''
}) })
if (selectedBtn.value === 1) { // if (selectedBtn.value === 1) {
getPipListNewData(item).then(res => { // getPipListNewData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 2) { // } else if (selectedBtn.value === 2) {
getPipListHistoryData(item).then(res => { // getPipListHistoryData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 3) { // } else if (selectedBtn.value === 3) {
getPipListAlarmData(item).then(res => { // getPipListAlarmData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
getPipAlarmNumber().then(res => { // getPipAlarmNumber().then(res => {
alarmNum.value = res.data // alarmNum.value = res.data
}) // })
} // }
} }
const options = ref([]); const options = ref([]);
const enterpriseId = ref(); const enterpriseId = ref();
...@@ -257,6 +259,7 @@ function getSupplys(){ ...@@ -257,6 +259,7 @@ function getSupplys(){
} }
} }
options.value = allItems; options.value = allItems;
optionsList.value = allItems;
}); });
} }
} }
...@@ -328,7 +331,7 @@ getSupplys(); ...@@ -328,7 +331,7 @@ getSupplys();
> >
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<component :is="selectedComponent" :search-data="searchData"></component> <component :is="selectedComponent" :option="optionsList" :queryParams = 'queryParams' :search-data="searchData"></component>
</div> </div>
</div> </div>
</template> </template>
......
...@@ -4,7 +4,8 @@ import {getPipListAlarmData} from "../../../api/AIStation/PipelineTemp.js"; ...@@ -4,7 +4,8 @@ import {getPipListAlarmData} from "../../../api/AIStation/PipelineTemp.js";
import {getRecycleListAlarmData} from "../../../api/AIStation/RecyclePump.js"; import {getRecycleListAlarmData} from "../../../api/AIStation/RecyclePump.js";
const TransTempAlarmData = ref([]) const TransTempAlarmData = ref([])
const params = ref({})
const options = ref([])
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
return 'table-header-class' return 'table-header-class'
} }
...@@ -20,19 +21,27 @@ function handleCamera() { ...@@ -20,19 +21,27 @@ function handleCamera() {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
//子组件接收父组件传递过来的值 //子组件接收父组件传递过来的值
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -42,6 +51,21 @@ watch( ...@@ -42,6 +51,21 @@ watch(
Page.total = props.searchData.total; Page.total = props.searchData.total;
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值eeeerrrrr',options.value)
},
{ deep: true }
)
getData() getData()
function getData(){ function getData(){
const item = reactive({ const item = reactive({
...@@ -60,6 +84,17 @@ function getData(){ ...@@ -60,6 +84,17 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getRecycleListAlarmData(params.value).then(res => {
TransTempAlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -75,7 +110,11 @@ function getData(){ ...@@ -75,7 +110,11 @@ function getData(){
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" label="换热站" align="center" sortable/> <el-table-column prop="stationId" label="换热站" align="center" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" label="设备名称" align="center" sortable/> <el-table-column prop="relateDeviceId" label="设备名称" align="center" sortable/>
<el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable/> <el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable/>
<el-table-column prop="alarmType" align="center" label="报警类型"> <el-table-column prop="alarmType" align="center" label="报警类型">
......
...@@ -4,7 +4,8 @@ import {getPipListHistoryData} from "../../../api/AIStation/PipelineTemp.js"; ...@@ -4,7 +4,8 @@ import {getPipListHistoryData} from "../../../api/AIStation/PipelineTemp.js";
import {getRecycleListHistoryData} from "../../../api/AIStation/RecyclePump.js"; import {getRecycleListHistoryData} from "../../../api/AIStation/RecyclePump.js";
const RecyclePumpData = ref([]); const RecyclePumpData = ref([]);
const params = ref({})
const options = ref([])
// 分页 // 分页
const Page = reactive({ total: 0, rows: 20, page: 1 }); const Page = reactive({ total: 0, rows: 20, page: 1 });
...@@ -20,13 +21,13 @@ const tableBodyClass = (row) => { // 表体样式 ...@@ -20,13 +21,13 @@ const tableBodyClass = (row) => { // 表体样式
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
const selectedRow = ref({}); const selectedRow = ref({});
...@@ -48,7 +49,15 @@ onMounted(() => { ...@@ -48,7 +49,15 @@ onMounted(() => {
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -59,6 +68,22 @@ watch( ...@@ -59,6 +68,22 @@ watch(
Page.total = props.searchData.total Page.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
getData() getData()
function getData() { function getData() {
const item = reactive({ const item = reactive({
...@@ -76,6 +101,17 @@ function getData() { ...@@ -76,6 +101,17 @@ function getData() {
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getRecycleListHistoryData(params.value).then(res => {
RecyclePumpData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -92,7 +128,11 @@ function getData() { ...@@ -92,7 +128,11 @@ function getData() {
@row-click="selectRow" @row-click="selectRow"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站" sortable/> <el-table-column prop="stationId" align="center" label="换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId || '-' )}}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/> <el-table-column prop="deviceName" align="center" label="设备名称" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable/> <el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable/>
<el-table-column prop="alarmStatus" align="center" label="告警状态"> <el-table-column prop="alarmStatus" align="center" label="告警状态">
......
...@@ -4,7 +4,8 @@ import {getPipListNewData} from "../../../api/AIStation/PipelineTemp.js"; ...@@ -4,7 +4,8 @@ import {getPipListNewData} from "../../../api/AIStation/PipelineTemp.js";
import {getRecycleListNewData} from "../../../api/AIStation/RecyclePump.js"; import {getRecycleListNewData} from "../../../api/AIStation/RecyclePump.js";
const RecyclePumpData = ref([]); const RecyclePumpData = ref([]);
const params = ref({})
const options = ref([])
// 分页 // 分页
const Page = reactive({ total: 0, rows: 20, page: 1 }); const Page = reactive({ total: 0, rows: 20, page: 1 });
...@@ -20,13 +21,13 @@ const tableBodyClass = (row) => { // 表体样式 ...@@ -20,13 +21,13 @@ const tableBodyClass = (row) => { // 表体样式
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getRecycleListNewData()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getRecycleListNewData()
}; };
const selectedRow = ref({}); const selectedRow = ref({});
...@@ -48,7 +49,15 @@ onMounted(() => { ...@@ -48,7 +49,15 @@ onMounted(() => {
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -60,6 +69,22 @@ watch( ...@@ -60,6 +69,22 @@ watch(
Page.total = props.searchData.total Page.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
getData() getData()
function getData(){ function getData(){
const item = reactive({ const item = reactive({
...@@ -77,6 +102,17 @@ function getData(){ ...@@ -77,6 +102,17 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getRecycleListNewData(params.value).then(res => {
RecyclePumpData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -93,7 +129,11 @@ function getData(){ ...@@ -93,7 +129,11 @@ function getData(){
@row-click="selectRow" @row-click="selectRow"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站" sortable/> <el-table-column prop="stationId" align="center" label="换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/> <el-table-column prop="deviceName" align="center" label="设备名称" sortable/>
<el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable/> <el-table-column prop="acquisitionTime" align="center" label="事件发生时间" width="180" sortable/>
<el-table-column prop="alarmStatus" align="center" label="告警状态"> <el-table-column prop="alarmStatus" align="center" label="告警状态">
......
...@@ -156,24 +156,25 @@ const resetSearch = () => { ...@@ -156,24 +156,25 @@ const resetSearch = () => {
beginTime: '', beginTime: '',
endTime: '' endTime: ''
}) })
if (selectedBtn.value === 1) { // if (selectedBtn.value === 1) {
getRecycleListNewData(item).then(res => { // getRecycleListNewData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 2) { // } else if (selectedBtn.value === 2) {
getRecycleListHistoryData(item).then(res => { // getRecycleListHistoryData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 3) { // } else if (selectedBtn.value === 3) {
getRecycleListAlarmData(item).then(res => { // getRecycleListAlarmData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
getRecycleAlarmNumber().then(res => { // getRecycleAlarmNumber().then(res => {
alarmNum.value = res.data // alarmNum.value = res.data
}) // })
} // }
}; };
const options = ref([]); const options = ref([]);
const optionsList = ref([]);
const enterpriseId = ref(); const enterpriseId = ref();
const props = { multiple: true, emitPath: false } const props = { multiple: true, emitPath: false }
const stationId = ref(); const stationId = ref();
...@@ -259,6 +260,7 @@ function getSupplys(){ ...@@ -259,6 +260,7 @@ function getSupplys(){
} }
} }
options.value = allItems; options.value = allItems;
optionsList.value = allItems;
}); });
} }
} }
...@@ -325,7 +327,7 @@ getSupplys(); ...@@ -325,7 +327,7 @@ getSupplys();
> >
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<component :is="selectedComponent" :search-data="searchData"></component> <component :is="selectedComponent" :option="optionsList" :queryParams = 'queryParams' :search-data="searchData"></component>
</div> </div>
</div> </div>
......
...@@ -6,7 +6,8 @@ import {getTransListAlarmData} from "../../../api/AIStation/TransTemp.js"; ...@@ -6,7 +6,8 @@ import {getTransListAlarmData} from "../../../api/AIStation/TransTemp.js";
const TransTempAlarmData = ref([]) const TransTempAlarmData = ref([])
const params = ref({})
const options = ref([])
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
return 'table-header-class' return 'table-header-class'
} }
...@@ -26,19 +27,27 @@ const getImageSrc = (row) => { ...@@ -26,19 +27,27 @@ const getImageSrc = (row) => {
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
//子组件接收父组件传递过来的值 //子组件接收父组件传递过来的值
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -48,6 +57,21 @@ watch( ...@@ -48,6 +57,21 @@ watch(
Page.total = props.searchData.total; Page.total = props.searchData.total;
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值eeeerrrrr',options.value)
},
{ deep: true }
)
getData() getData()
function getData(){ function getData(){
const item = reactive({ const item = reactive({
...@@ -66,6 +90,17 @@ function getData(){ ...@@ -66,6 +90,17 @@ function getData(){
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getTransListAlarmData(params.value).then(res => {
TransTempAlarmData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -81,7 +116,11 @@ function getData(){ ...@@ -81,7 +116,11 @@ function getData(){
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" label="换热站" align="center" sortable/> <el-table-column prop="stationId" label="换热站" align="center" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" label="设备名称" align="center" sortable/> <el-table-column prop="relateDeviceId" label="设备名称" align="center" sortable/>
<el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable/> <el-table-column prop="eventTime" label="报警时间" align="center" width="180px" sortable/>
<el-table-column prop="alarmLevel" align="center" label="报警等级"> <el-table-column prop="alarmLevel" align="center" label="报警等级">
......
...@@ -5,7 +5,8 @@ import {getRecycleListHistoryData} from "../../../api/AIStation/RecyclePump.js"; ...@@ -5,7 +5,8 @@ import {getRecycleListHistoryData} from "../../../api/AIStation/RecyclePump.js";
import {getTransListHistoryData} from "../../../api/AIStation/TransTemp.js"; import {getTransListHistoryData} from "../../../api/AIStation/TransTemp.js";
const TransTempHistoryData = ref([]) const TransTempHistoryData = ref([])
const params = ref({})
const options = ref([])
// 分页 // 分页
const Page = reactive({total: 0, rows: 20, page: 1}); const Page = reactive({total: 0, rows: 20, page: 1});
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
...@@ -20,13 +21,13 @@ const singleDetails = ref({}) ...@@ -20,13 +21,13 @@ const singleDetails = ref({})
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
// 处理图片源 // 处理图片源
const getImageSrc = (row) => { const getImageSrc = (row) => {
...@@ -41,7 +42,15 @@ function detail(row) { ...@@ -41,7 +42,15 @@ function detail(row) {
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -52,6 +61,22 @@ watch( ...@@ -52,6 +61,22 @@ watch(
Page.total = props.searchData.total Page.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
getData() getData()
function getData() { function getData() {
const item = reactive({ const item = reactive({
...@@ -69,6 +94,17 @@ function getData() { ...@@ -69,6 +94,17 @@ function getData() {
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getTransListHistoryData(params.value).then(res => {
TransTempHistoryData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -84,7 +120,11 @@ function getData() { ...@@ -84,7 +120,11 @@ function getData() {
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable/> <el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/> <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/>
<el-table-column prop="averageTemperature" align="center" label="平均温°C"/> <el-table-column prop="averageTemperature" align="center" label="平均温°C"/>
......
...@@ -5,7 +5,8 @@ import {getRecycleListNewData} from "../../../api/AIStation/RecyclePump.js"; ...@@ -5,7 +5,8 @@ import {getRecycleListNewData} from "../../../api/AIStation/RecyclePump.js";
import {getTransListNewData} from "../../../api/AIStation/TransTemp.js"; import {getTransListNewData} from "../../../api/AIStation/TransTemp.js";
const TransTempNewData = ref([]) const TransTempNewData = ref([])
const params = ref({})
const options = ref([])
// 分页 // 分页
const Page = reactive({total: 0, rows: 20, page: 1}); const Page = reactive({total: 0, rows: 20, page: 1});
const tableHeaderClass = data => { // 表头样式 const tableHeaderClass = data => { // 表头样式
...@@ -20,13 +21,13 @@ const singleDetails = ref({}) ...@@ -20,13 +21,13 @@ const singleDetails = ref({})
// 分页大小改变时触发 // 分页大小改变时触发
const handleSizeChange = (val) => { const handleSizeChange = (val) => {
Page.rows = val; Page.rows = val;
getData() getDataByParams()
}; };
// 当前页改变时触发 // 当前页改变时触发
const handleCurrentChange = (val) => { const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getData() getDataByParams()
}; };
// 处理图片源 // 处理图片源
const getImageSrc = (row) => { const getImageSrc = (row) => {
...@@ -43,7 +44,15 @@ function detail(row) { ...@@ -43,7 +44,15 @@ function detail(row) {
const props = defineProps({ const props = defineProps({
searchData: { searchData: {
type: Object, type: Object,
default: () => ({}) required: true
},
option: {
type: Array,
required: true
},
queryParams: {
type: Object,
required: true
} }
}); });
watch( watch(
...@@ -55,6 +64,22 @@ watch( ...@@ -55,6 +64,22 @@ watch(
Page.total = props.searchData.total Page.total = props.searchData.total
} }
); );
watch(
() => props.queryParams,
(newData) => {
params.value = newData
console.log('值eeeee',params.value)
console.log('值ooo',props.queryParams)
}
)
watch(
() => props.option,
(newVal) => {
options.value = props.option
console.log('值ooo',options.value)
},
{ deep: true }
)
getData() getData()
function getData() { function getData() {
...@@ -73,6 +98,17 @@ function getData() { ...@@ -73,6 +98,17 @@ function getData() {
Page.rows = res.pageSize Page.rows = res.pageSize
}) })
} }
function getDataByParams(){
getTransListNewData(params.value).then(res => {
TransTempNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
}
function getName(name){
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
</script> </script>
<template> <template>
...@@ -88,7 +124,11 @@ function getData() { ...@@ -88,7 +124,11 @@ function getData() {
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
> >
<el-table-column type="index" label="序号" align="center" width="100"/> <el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable/> <el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/> <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/>
<el-table-column prop="averageTemperature" align="center" label="平均温°C"/> <el-table-column prop="averageTemperature" align="center" label="平均温°C"/>
......
...@@ -26,7 +26,7 @@ const topBtn = ref([ ...@@ -26,7 +26,7 @@ const topBtn = ref([
{id: 3, name: '报警信息', component: TransTempAlarmPage} {id: 3, name: '报警信息', component: TransTempAlarmPage}
]); ]);
const selectedBtn = ref(null); const selectedBtn = ref(null);
const dateRange = ref([]) const optionsList = ref([])
// 默认显示的组件页面 // 默认显示的组件页面
const selectedComponent = ref(TransTempNewDataPage); const selectedComponent = ref(TransTempNewDataPage);
...@@ -156,22 +156,22 @@ const resetSearch = () => { ...@@ -156,22 +156,22 @@ const resetSearch = () => {
beginTime: '', beginTime: '',
endTime: '' endTime: ''
}) })
if (selectedBtn.value === 1) { // if (selectedBtn.value === 1) {
getTransListNewData(item).then(res => { // getTransListNewData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 2) { // } else if (selectedBtn.value === 2) {
getTransListHistoryData(item).then(res => { // getTransListHistoryData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
} else if (selectedBtn.value === 3) { // } else if (selectedBtn.value === 3) {
getTransListAlarmData(item).then(res => { // getTransListAlarmData(item).then(res => {
searchData.value = res // searchData.value = res
}) // })
getTransAlarmNumber().then(res => { // getTransAlarmNumber().then(res => {
alarmNum.value = res.data // alarmNum.value = res.data
}) // })
} // }
}; };
const options = ref([]); const options = ref([]);
const enterpriseId = ref(); const enterpriseId = ref();
...@@ -259,6 +259,7 @@ function getSupplys(){ ...@@ -259,6 +259,7 @@ function getSupplys(){
} }
} }
options.value = allItems; options.value = allItems;
optionsList.value = allItems;
}); });
} }
} }
...@@ -330,7 +331,7 @@ getSupplys(); ...@@ -330,7 +331,7 @@ getSupplys();
> >
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<component :is="selectedComponent" :search-data="searchData"></component> <component :is="selectedComponent" :option="optionsList" :queryParams = 'queryParams' :search-data="searchData"></component>
</div> </div>
</div> </div>
......
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