|
|
@@ -4,7 +4,7 @@
|
|
|
<a-tabs class="tabs-box" type="card" v-model:activeKey="activeKey" @change="tabChange">
|
|
|
<a-tab-pane key="1" tab="实时监测">
|
|
|
<div class="box-bg table-box" style="margin-bottom: 10px">
|
|
|
- <div>
|
|
|
+ <div class="table-box-content">
|
|
|
<label style="color: var(--vent-font-color)">设备类型：</label>
|
|
|
<Select
|
|
|
@change="handleSensorChange"
|
|
|
@@ -21,13 +21,13 @@
|
|
|
</template>
|
|
|
<MonitorTable
|
|
|
ref="SensorMonitorRef"
|
|
|
- :is-show-select="false"
|
|
|
+ :is-show-select="true"
|
|
|
:columnsType="deviceKind + '_monitor'"
|
|
|
:dataSource="dataSource"
|
|
|
design-scope="modelsensor_monitor"
|
|
|
@select-row="getSelectRow"
|
|
|
:deviceType="deviceKind"
|
|
|
- :scroll="{ y: chartsColumns.length > 0 ? 600 : 600 }"
|
|
|
+ :scroll="{ y: chartsColumns.length > 0 ? 310 : 310 }"
|
|
|
size="''"
|
|
|
title="传感器监测"
|
|
|
>
|
|
|
@@ -42,7 +42,7 @@
|
|
|
</MonitorTable>
|
|
|
</div>
|
|
|
<!-- v-if="chartsColumns.length > 0" -->
|
|
|
- <div class="charts-box" v-if="false">
|
|
|
+ <div class="charts-box">
|
|
|
<BarAndLine
|
|
|
:chartsColumnsType="selectData.deviceType"
|
|
|
xAxisPropType="readTime"
|
|
|
@@ -87,7 +87,7 @@
|
|
|
</a-tab-pane>
|
|
|
<a-tab-pane key="4" tab="报警分析">
|
|
|
<div class="tab-item box-bg" v-if="activeKey == '4'">
|
|
|
- <warnAnalysis device-type="modelsensor"></warnAnalysis>
|
|
|
+ <warnAnalysis device-type="modelsensor" />
|
|
|
</div>
|
|
|
</a-tab-pane>
|
|
|
<!-- <a-tab-pane key="4" tab="操作历史">
|
|
|
@@ -110,7 +110,7 @@
|
|
|
import MonitorTable from '../comment/MonitorTable.vue';
|
|
|
import HistoryTable from '../comment/HistoryTable.vue';
|
|
|
import AlarmHistoryTable from '../comment/AlarmHistoryTable.vue';
|
|
|
- import warnAnalysis from '../comment/warnAnalysis.vue'
|
|
|
+ import warnAnalysis from '../comment/warnAnalysis.vue';
|
|
|
import { list, getTableList } from './sensor.api';
|
|
|
import { deviceList } from '../../deviceManager/comment/pointTabel/point.api';
|
|
|
import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
|
|
|
@@ -371,8 +371,13 @@
|
|
|
background-color: #ffffff11;
|
|
|
overflow-y: auto;
|
|
|
}
|
|
|
+ .table-box-content {
|
|
|
+ height: 430px;
|
|
|
+ background-color: #ffffff03;
|
|
|
+ border-bottom: 1px solid #44d3ff70;
|
|
|
+ }
|
|
|
.charts-box {
|
|
|
- height: calc(40% - 80px);
|
|
|
+ height: 300px;
|
|
|
padding: 5px 10px;
|
|
|
margin-top: 10px;
|
|
|
}
|
|
|
@@ -397,7 +402,7 @@
|
|
|
}
|
|
|
.@{ventSpace}-picker,
|
|
|
.@{ventSpace}-select-selector {
|
|
|
- width: 100% ;
|
|
|
+ width: 100%;
|
|
|
background: #00000017 !important;
|
|
|
border: 1px solid @vent-form-item-border !important;
|
|
|
input,
|
hongrunxia