Skip to content

W
web-project
Commit e44ec2a3 authored by liwei's avatar liwei
Browse files
Options

修改了AI无人站代码，以及大屏摄像头

parent c4bc25d0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2094 additions and 105 deletions
src/api/AIStation/MoveMonitor.js
View file @ e44ec2a3
......@@ -27,3 +27,11 @@ export const exportMoveMonitorHistoryData = (item) => {
export const exportMoveMonitorAlarmData = (item) => {
return httpTwo.post('/busdynamicenvironmentalalarm/export',item,'','',{responseType:'blob'})
}
export const getBusMeterEquipment = (item) => {
return httpTwo.get(`busMeterEquipment/listAll?meterDescription=`+item.meterDescription + '&meterName=' + item.meterName + '&stationList=' + item.stationList)
}
export const updateBusMeterEquipmentList = (item) => {
return httpTwo.post('busMeterEquipment/updateList',item,'','',)
}
src/components/screenDisplay.vue
View file @ e44ec2a3
This diff is collapsed.
src/components/videoComponentsFour.vue 0 → 100644
View file @ e44ec2a3
This diff is collapsed.
src/components/videoComponentsThree.vue 0 → 100644
View file @ e44ec2a3
This diff is collapsed.
src/views/AIStation/ExtinguisherPage/ExtinguisherHistoryPage.vue
View file @ e44ec2a3
......@@ -162,7 +162,7 @@ function Nindex(index) {
:data="HistoryData"
border
style="width: 98%;margin-left: 15px"
height="calc(100vh - 330px)"
height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
@sort-change="handleSortChange"
......
src/views/AIStation/ExtinguisherPage/index.vue
View file @ e44ec2a3
......@@ -362,39 +362,39 @@ function getSupplys(){
<template>
<div class="app-content">
<div class="search-wrapper">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px">
<el-form-item label="换热站：">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;">
<el-form-item label="换热站:">
<el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="min-width: 210px;" :props="props" collapse-tags/>
placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-select placeholder="请选择" clearable style="width: 140px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="设备名称:" prop="srcName">
<el-input placeholder="请输入内容" style="width: 180px" v-model="queryParams.srcName" clearable></el-input>
<el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.srcName" clearable></el-input>
</el-form-item>
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerBeginConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 200px"
style="width: 175px"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
<el-form-item label="结束时间：" prop="endTime" v-if="selectedBtn !== 1">
<el-form-item label="结束时间:" prop="endTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerEndConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 200px"
style="width: 175px"
v-model="queryParams.endTime"
/>
</el-config-provider>
......@@ -442,5 +442,12 @@ function getSupplys(){
align-items: center;
margin: 5px 10px 5px 5px;
}
::v-deep(.el-form--inline .el-form-item){
display: inline-flex;
margin-right: 15px;
vertical-align: middle;
}
::v-deep(.el-form-item__label){
padding: 0 6px 0 0;
}
</style>
src/views/AIStation/MoveMonitorPage/MoveMonitorHistoryPage.vue
View file @ e44ec2a3
......@@ -172,7 +172,7 @@ function Nindex(index) {
:data="HistoryData"
border
style="width: 98%;margin-left: 15px"
height="calc(100vh - 330px)"
height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
@sort-change="handleSortChange"
......
src/views/AIStation/MoveMonitorPage/MoveMonitorNewDataPage.vue
View file @ e44ec2a3
......@@ -5,7 +5,8 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import {getMoveListNewData} from "../../../api/AIStation/MoveMonitor.js";
import {ElMessage} from "element-plus";
import {getImageUrl} from '../../../api/AIStation/common.js'
import { useRoute, useRouter, onBeforeRouteUpdate } from "vue-router";
const router = useRouter();
const sortNewData = ref(new Map())
let sortMapData = reactive(new Map())
let sortList = reactive([])
......@@ -163,6 +164,19 @@ function Nindex(index) {
const pagesize = Page.rows // 每页条数
return index + 1 + (page - 1) * pagesize
}
// 打开摄像头
function handleCamera(row) {
router.push({
path: "/AIStation/MoveMonitorPage/VideoViewPage",
query: {
videoId: row.relateCameraId,
stationName:row.stationName,
srcName: row.meterName
},
});
}
</script>
<template>
......@@ -179,15 +193,15 @@ function Nindex(index) {
@sort-change="handleSortChange"
v-loading="loading"
>
<el-table-column type="index" label="序号" align="center" width="100" :index="Nindex"/>
<el-table-column prop="stationName" align="center" label="所属换热站" width="200" sortable :sort-map="sortMapData">
<el-table-column type="index" label="序号" align="center" width="80" :index="Nindex"/>
<el-table-column prop="stationName" align="center" label="所属换热站" sortable :sort-map="sortMapData">
<template #default="scope">
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="meterName" align="center" label="设备" sortable width="220" :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" width="200" sortable :sort-map="sortMapData"/>
<el-table-column prop="meterType" align="center" label="设备类型" width="150">
<el-table-column prop="meterName" align="center" label="设备" sortable :sort-map="sortMapData"/>
<el-table-column prop="acquisitionTime" align="center" label="采集时间" sortable :sort-map="sortMapData"/>
<el-table-column prop="meterType" align="center" label="设备类型" width="130">
<template #default="scope">
<!-- <span v-if="scope.row.meterType === '0'">电表</span>-->
<!-- <span v-else-if="scope.row.meterType === '1'">水表</span>-->
......@@ -195,8 +209,8 @@ function Nindex(index) {
<span>{{scope.row.meterType !== '' ? scope.row.meterType : '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="result" align="center" label="采集数据" width="150"/>
<el-table-column prop="taskState" align="center" label="状态">
<el-table-column prop="result" align="center" label="采集数据" width="130"/>
<el-table-column prop="taskState" align="center" label="状态" width="130">
<template #default="scope">
<span v-if="scope.row.taskState=== 1">执行中</span>
<span v-else-if="scope.row.taskState=== 2">成功</span>
......@@ -204,7 +218,7 @@ function Nindex(index) {
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="picUrl" align="center" label="图片" width="200">
<el-table-column prop="picUrl" align="center" label="图片" width="180">
<template #default="scope">
<el-image
style="width:100%;height:100%;"
......@@ -216,7 +230,7 @@ function Nindex(index) {
</el-image>
</template>
</el-table-column>
<el-table-column prop="alarmStatus" align="center" label="告警状态" width="200">
<el-table-column prop="alarmStatus" align="center" label="告警状态" width="180">
<template #default="scope">
<span v-if="scope.row.alarmStatus=== '0'">正常</span>
<span v-else-if="scope.row.alarmStatus=== '1'" style="color: red">异常</span>
......@@ -224,10 +238,11 @@ function Nindex(index) {
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right">
<el-table-column label="操作" align="center" width="200" fixed="right">
<template #default="scope">
<div class="table-operate-column">
<el-button link @click="detail(scope.row)" type="primary">详情</el-button>
<el-button link @click="handleCamera(scope.row)" type="primary">打开摄像头</el-button>
</div>
</template>
</el-table-column>
......
src/views/AIStation/PipelineTempPage/PipelineTempAlarmPage.vue
View file @ e44ec2a3
......@@ -166,7 +166,7 @@ function Nindex(index) {
border
:cell-style="setCellStyle"
style="width: 98%;margin-left: 15px"
height="calc(100vh - 330px)"
height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
@sort-change="handleSortChange"
......
src/views/AIStation/PipelineTempPage/PipelineTempHistoryPage.vue
View file @ e44ec2a3
......@@ -194,7 +194,7 @@ function Nindex(index) {
border
:cell-style="setCellStyle"
style="width: 98%;margin-left: 15px"
height="calc(100vh - 330px)"
height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
@sort-change="handleSortChange"
......@@ -289,6 +289,7 @@ function Nindex(index) {
.ExtinguisherPage-container {
width: 100%;
background-color: white;
overflow:hidden;
}
.search-wrapper {
......
src/views/AIStation/PipelineTempPage/index.vue
View file @ e44ec2a3
......@@ -391,53 +391,53 @@ function datePickerEndConfirm(e){
<template>
<div class="app-content">
<div class="search-wrapper">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px">
<el-form-item label="换热站：">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;">
<el-form-item label="换热站:">
<el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="width: 180px;" :props="props" collapse-tags/>
placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 180px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
<el-select placeholder="请选择" style="width: 140px" clearable v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="光纤设备:" prop="deviceName" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-input placeholder="请输入内容" style="width: 180px" v-model="queryParams.deviceName" clearable></el-input>
<el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.deviceName" clearable></el-input>
</el-form-item>
<el-form-item label="报警类型:" prop="thermalAlarmType" v-show="selectedBtn === 3">
<el-select placeholder="请选择" clearable style="width: 180px" v-model="queryParams.thermalAlarmType">
<el-select placeholder="请选择" style="width: 140px" clearable v-model="queryParams.thermalAlarmType">
<el-option v-for="item in thermalAlarmTypeList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="设施名称:" prop="deviceName" v-show="selectedBtn === 3">
<el-input placeholder="请输入内容" style="width: 180px" v-model="queryParams.srcName" clearable></el-input>
<el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.srcName" clearable></el-input>
</el-form-item>
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerBeginConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 180px"
style="width: 175px"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
<el-form-item label="结束时间：" prop="endTime" v-if="selectedBtn !== 1">
<el-form-item label="结束时间:" prop="endTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerEndConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 180px"
style="width: 175px"
v-model="queryParams.endTime"
/>
</el-config-provider>
</el-form-item>
<el-form-item label="自动更新：">
<el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
<el-form-item label="自动更新:">
<el-switch v-model="refresh" style="width: 40px" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
......@@ -481,4 +481,13 @@ function datePickerEndConfirm(e){
align-items: center;
margin: 5px 10px 5px 5px;
}
::v-deep(.el-form--inline .el-form-item){
display: inline-flex;
margin-right: 15px;
vertical-align: middle;
}
::v-deep(.el-form-item__label){
padding: 0 6px 0 0;
}
</style>
src/views/AIStation/RecyclePumpPage/RecyclePumpHistoryPage.vue
View file @ e44ec2a3
......@@ -474,7 +474,7 @@ function Nindex(index) {
:data="RecyclePumpData"
border
style="width: 45%;margin-left: 15px"
height="calc(100vh - 330px)"
height="calc(100vh - 280px)"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
@row-click="selectRow"
......
src/views/AIStation/RecyclePumpPage/index.vue
View file @ e44ec2a3
......@@ -358,45 +358,45 @@ function getSupplys(){
<template>
<div class="app-content">
<div class="search-wrapper">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px">
<el-form-item label="换热站：">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;">
<el-form-item label="换热站:">
<el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="width: 180px;" :props="props" collapse-tags/>
placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-select placeholder="请选择" clearable style="width: 140px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="设备名称:" prop="deviceName">
<el-input placeholder="请输入内容" style="width: 180px" v-model="queryParams.deviceName" clearable></el-input>
<el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.deviceName" clearable></el-input>
</el-form-item>
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerBeginConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 200px"
style="width: 175px"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
<el-form-item label="结束时间：" prop="endTime" v-if="selectedBtn !== 1">
<el-form-item label="结束时间:" prop="endTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerEndConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 200px"
style="width: 175px"
v-model="queryParams.endTime"
/>
</el-config-provider>
</el-form-item>
<el-form-item label="自动更新：">
<el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
<el-form-item label="自动更新:">
<el-switch v-model="refresh" style="width: 40px" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
......@@ -440,4 +440,12 @@ function getSupplys(){
align-items: center;
margin: 5px 10px 5px 5px;
}
::v-deep(.el-form--inline .el-form-item){
display: inline-flex;
margin-right: 15px;
vertical-align: middle;
}
::v-deep(.el-form-item__label){
padding: 0 6px 0 0;
}
</style>
src/views/AIStation/TransTempPage/index.vue
View file @ e44ec2a3
......@@ -380,10 +380,10 @@ function getSupplys() {
<template>
<div class="app-content">
<div class="search-wrapper">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px">
<el-form-item label="换热站：">
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;" >
<el-form-item label="换热站:">
<el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="width: 180px;" :props="props" collapse-tags/>
placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
</el-form-item>
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
......@@ -393,7 +393,7 @@ function getSupplys() {
<el-form-item label="设备名称:" prop="deviceName">
<el-input placeholder="请输入内容" style="width: 180px" v-model="queryParams.deviceName" clearable></el-input>
</el-form-item>
<el-form-item label="处理状态:" prop="handleStatus" v-show=" selectedBtn === 3">
<el-form-item label="处理状态:" prop="handleStatus" v-show="selectedBtn === 3">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.handleStatus">
<el-option v-for="item in handleStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
......@@ -403,7 +403,7 @@ function getSupplys() {
<el-option v-for="item in alarmTypeList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerBeginConfirm"
......@@ -415,7 +415,7 @@ function getSupplys() {
/>
</el-config-provider>
</el-form-item>
<el-form-item label="结束时间：" prop="endTime" v-if="selectedBtn !== 1">
<el-form-item label="结束时间:" prop="endTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerEndConfirm"
......@@ -427,7 +427,7 @@ function getSupplys() {
/>
</el-config-provider>
</el-form-item>
<el-form-item label="自动更新：">
<el-form-item label="自动更新:">
<el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
<el-form-item>
......@@ -474,4 +474,12 @@ function getSupplys() {
align-items: center;
margin: 5px 10px 5px 5px;
}
::v-deep(.el-form--inline .el-form-item){
display: inline-flex;
margin-right: 30px;
vertical-align: middle;
}
::v-deep(.el-form-item__label){
padding: 0 12px 0 0;
}
</style>
src/views/AIStation/VoiceCommandPage.vue
View file @ e44ec2a3
......@@ -380,42 +380,42 @@ function Nindex(index) {
<div class="ExtinguisherPage-container">
<div class="search-wrapper">
<el-form style="padding: 10px 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="换热站：">
<el-form-item label="换热站:">
<el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="width: 180px;" :props="props" collapse-tags/>
placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
</el-form-item>
<el-form-item label="IP地址:" prop="ipAddress">
<el-input placeholder="请输入IP地址" style="width: 200px" v-model="queryParams.ipAddress"/>
<el-input placeholder="请输入IP地址" style="width: 130px" v-model="queryParams.ipAddress"/>
</el-form-item>
<el-form-item label="MAC地址:" prop="macAddress">
<el-input placeholder="请输入MAC地址" style="width: 200px" v-model="queryParams.macAddress"/>
<el-input placeholder="请输入MAC地址" style="width: 130px" v-model="queryParams.macAddress"/>
</el-form-item>
<el-form-item label="开始时间：" prop="beginTime">
<el-form-item label="开始时间:" prop="beginTime">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerBeginConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 200px"
style="width: 175px"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
<el-form-item label="结束时间：" prop="endTime">
<el-form-item label="结束时间:" prop="endTime">
<el-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerEndConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择结束时间"
style="width: 200px"
style="width: 175px"
v-model="queryParams.endTime"
/>
</el-config-provider>
</el-form-item>
<el-form-item label="自动更新：">
<el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
<el-form-item label="自动更新:">
<el-switch v-model="refresh" style="width: 40px" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadData()" class="add-search-btn">查询</el-button>
......@@ -429,7 +429,7 @@ function Nindex(index) {
:data="VoiceCommandData"
border
style="width: 98%;margin-left: 15px"
height="calc(100vh - 280px)"
height="calc(100vh - 230px)"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
@sort-change="handleSortChange"
......@@ -559,4 +559,12 @@ function Nindex(index) {
height: 40px;
vertical-align: middle;
}
::v-deep(.el-form--inline .el-form-item){
display: inline-flex;
margin-right: 15px;
vertical-align: middle;
}
::v-deep(.el-form-item__label){
padding: 0 12px 0 0;
}
</style>
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