Skip to content

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

修改了AI无人站bug

parent 90a3aa84
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 73 deletions
src/components/screenDisplay.vue
View file @ 5ece5e05
......@@ -461,7 +461,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
<div class="moreInfo" v-show="hasVideo2" @click="nextVideo2()">下一个</div>
<div class="moreInfo" v-show="hasVideo2" @click="moreVideo2()">更多》</div>
</div>
<div v-if="videoLoading2" class="videoLoading-overlay2">
<div v-if="true" class="videoLoading-overlay2">
<div class="videoLoading-spinner"></div>
<p> 视频加载中，请稍后......</p>
</div>
......@@ -605,7 +605,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
<div class="videoInfo" ref="myDialogContainer">
<div class="alarmInfo_header">
<div class="alarmInfo_title">{{stationName}}</div>
<div v-if="showVideoClose2 === true" class="alarmInfo_close" @click="handleVideoClose2">X</div>
<div class="alarmInfo_close" @click="handleVideoClose2">X</div>
</div>
<div v-if="videoAllLoading2" class="videoLoading-overlayAll2">
<div class="videoLoading-spinner"></div>
......@@ -724,9 +724,8 @@ export default defineComponent({
videoLoading: false,
videoLoading2: false,
videoAllLoading: false,
videoAllLoading2: false,
videoAllLoading2: true,
showVideoClose: false,
showVideoClose2: false,
videoNum: 0,
videoNum2: 0,
queryParams: '',
......@@ -1244,6 +1243,7 @@ export default defineComponent({
},
heatBtnClick: function (n) {
this.stopParams += 1
this.stopParams2 += 1
let map = null;
let _this = this;
switch (n) {
......@@ -3267,7 +3267,6 @@ export default defineComponent({
},
handleInitSuccessAll2() {
this.videoAllLoading2 = false
this.showVideoClose2 = true
},
getGYTransferVideo2() {
this.videoNum = 0
......@@ -3345,6 +3344,7 @@ export default defineComponent({
this.videoOpen2 = true
this.videoAllLoading2 = true
this.queryParams2 = ''
this.stopParams += 1
this.stopParams2 += 1
this.getDivDialogWidth2()
this.queryParamsAll2 = JSON.stringify(this.VideoInfo2.playVideoList)
......@@ -3363,7 +3363,6 @@ export default defineComponent({
},
// 关闭更多视频弹窗
handleVideoClose2() {
this.showVideoClose2 = false
this.queryParamsAll2 = ''
this.stopParamsAll2 += 1
this.videoOpen2 = false
......@@ -3478,7 +3477,7 @@ export default defineComponent({
// 我加了判断
if(res.data.length <= 0){
ElMessage({
message: res.data,
message: '未获取到电气柜监视数据',
type: 'warning'
});
this.hasVideo2 = false;
......@@ -4946,11 +4945,11 @@ export default defineComponent({
}
}
.videoLoading-overlay2 {
position: fixed;
top: 355px;
left: 5px;
width: 21%;
height: 32%;
position: absolute;
top: 0px;
left: 0px;
width: 100%;
height: 100%;
background-color: rgba(230, 253, 260, 0.3);//rgba(0, 0, 0, 0.6);
display: flex;
flex-direction: column;
......@@ -5167,6 +5166,17 @@ export default defineComponent({
left: 5px;
bottom: 5px;
}
.thirdLeftLayerDialog2{
z-index: 11;
position: relative;
width: 100%;
height: 100%;
/* background: linear-gradient(to bottom, rgba(29, 70, 128, 0.5), rgba(29, 70, 128, 0.9), rgba(29, 70, 128, 0.5)); */
/*background: linear-gradient(318deg,#1d4680 0%, #0d174c);*/
top: 5px;
left: 5px;
bottom: 5px;
}
.noVideoData{
color: white;
text-align: center;
......@@ -5202,6 +5212,7 @@ export default defineComponent({
}
}
.thirdLeftLayer_one{
position: relative;
width: 100%;
margin-bottom: 11px;
height: 32%;
......
src/views/AIStation/PipelineTempPage/PipelineTempNewDataPage.vue
View file @ 5ece5e05
......@@ -65,11 +65,7 @@ watch(
() => props.queryParams,
(newData) => {
params.value = newData
getPipListNewData(params.value).then(res => {
PipelineTempNewData.value = res.rows
Page.total = res.total
Page.rows = res.pageSize
})
getDataByParams()
console.log('data值eeeee---------', PipelineTempNewData.value)
}
)
......
src/views/AIStation/TransTempPage/TransTempNewDataPage.vue
View file @ 5ece5e05
......@@ -156,7 +156,7 @@ function Nindex(index) {
:data="TransTempNewData"
border
style="width: 98%;margin-left: 15px"
height="calc(100vh - 280px)"
height="calc(100vh - 330px)"
:header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass"
@sort-change="handleSortChange"
......
src/views/AIStation/TransTempPage/index.vue
View file @ 5ece5e05
......@@ -380,61 +380,73 @@ 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-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
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-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-form-item>
<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>
</el-form-item>
<el-form-item label="报警类型:" prop="alarmType" v-show="selectedBtn === 3">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmType">
<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-config-provider :locale="zhCn">
<el-date-picker
@change="datePickerBeginConfirm"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择开始时间"
style="width: 200px"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
<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"
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>
<el-form-item>
<el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
<el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
<el-button type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
</el-form-item>
<el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;display: flex;justify-content: center;align-items: center" >
<div style="width: 350px;">
<el-form-item label="换热站:">
<el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
</el-form-item>
</div>
<div style="width: 150px;">
<el-form-item label="自动更新:">
<el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
</div>
<div style="width: 300px;">
<el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="设备名称:" prop="deviceName">
<el-input placeholder="请输入内容" style="width: 200px" v-model="queryParams.deviceName" clearable></el-input>
</el-form-item>
</div>
<div style="width: 300px;" v-if="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>
</el-form-item>
<el-form-item label="报警类型:" prop="alarmType" v-show="selectedBtn === 3">
<el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmType">
<el-option v-for="item in alarmTypeList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
</div>
<div style="width: 300px;" 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"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
<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"
v-model="queryParams.endTime"
/>
</el-config-provider>
</el-form-item>
</div>
<div>
<el-form-item>
<el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
<el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
<el-button type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
</el-form-item>
</div>
</el-form>
</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