浏览代码

[Mod 0000] 传感器新增单选按钮;新增曲线图

hongrunxia 1 天之前
父节点
当前提交
645d00a36d

+ 1 - 1
src/views/vent/monitorManager/comment/MonitorTable.vue

@@ -120,7 +120,7 @@
       pagination: props.isShowPagination
       pagination: props.isShowPagination
         ? {
         ? {
             current: 1,
             current: 1,
-            pageSize: 50,
+            pageSize: 30,
             pageSizeOptions: ['10', '30', '50', '100', '500'],
             pageSizeOptions: ['10', '30', '50', '100', '500'],
             showQuickJumper: false,
             showQuickJumper: false,
           }
           }

+ 13 - 8
src/views/vent/monitorManager/sensorMonitor/index.vue

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