光纤测温详情界面数据显示异常调整-提交

src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -81,13 +81,17 @@ export function getMonitorComponent() {
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
       break;
     default:
-      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.zdrk.vue'));
-    //FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
-    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
-    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
-    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
-    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
-    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));
+      //FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.zdrk.vue'));
+      //FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
+      //FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.bd.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sjh.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.hlg.vue'));
+      //FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
+
   }
   const BundleModal = defineAsyncComponent(() => import('./modal/bundle.modal.vue'));
   const FiremonModal = defineAsyncComponent(() => import('./modal/firemon.modal.vue'));
@@ -601,26 +605,26 @@ export const noLocationArr = () => {
 export const noHistoryArr = () =>
   History_Type['type'] == 'remote'
     ? [
-        'surface_history',
-        'gasDayReport',
-        'dustDayReport',
-        'bundleDayReport',
-        'bundleSpyDayReport',
-        'gasDay',
-        'gate_linkdlfm',
-        'bundleReport',
-        'bundleSpyReport',
-        'dustReport',
-      ]
+      'surface_history',
+      'gasDayReport',
+      'dustDayReport',
+      'bundleDayReport',
+      'bundleSpyDayReport',
+      'gasDay',
+      'gate_linkdlfm',
+      'bundleReport',
+      'bundleSpyReport',
+      'dustReport',
+    ]
     : [
-        'gasDayReport',
-        'dustDayReport',
-        'bundleDayReport',
-        'bundleSpyDayReport',
-        'gate_linkdlfm',
-        'gasDay',
-        'substation_normal',
-        'bundleReport',
-        'bundleSpyReport',
-        'dustReport',
-      ];
+      'gasDayReport',
+      'dustDayReport',
+      'bundleDayReport',
+      'bundleSpyDayReport',
+      'gate_linkdlfm',
+      'gasDay',
+      'substation_normal',
+      'bundleReport',
+      'bundleSpyReport',
+      'dustReport',
+    ];

src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal.vue

@@ -53,13 +53,13 @@
         <div class="right-center">
           <div class="table-box">
             <span class="base-title">测点监测详情</span>
-            <a-table size="small" :columns="columns" :data-source="posList" :pagination="false" :scroll="{ y: 200 }" />
+            <a-table size="small" :columns="columns" :data-source="posList" :pagination="false" :scroll="{ y: 160 }" />
           </div>
           <div class="warning-box">
             <span class="base-title">预警历史详情</span>
             <div class="warning-container">
               <dv-scroll-board ref="scrollBoard" :config="warningConfig"
-                style="width: 100%; height: 240px; overflow-y: auto; border: 1px solid #39e8ff33" />
+                style="width: 100%; height: 200px; border: 1px solid #39e8ff33" />
             </div>
           </div>
         </div>
@@ -325,12 +325,16 @@ export default defineComponent({
 
   .modal-right {
     width: calc(100% - 220px);
-    overflow-y: auto;
+    height: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
 
     .base-title {
-      line-height: 32px;
+      line-height: 28px;
       position: relative;
       padding-left: 20px;
+      flex-shrink: 0;
 
       &::after {
         content: '';
@@ -349,18 +353,18 @@ export default defineComponent({
       display: flex;
       flex-direction: row;
       justify-content: space-between;
-      margin-bottom: 10px;
+      flex-shrink: 0;
 
       .top-item {
         width: 200px;
-        height: 80px;
+        height: 72px;
         display: flex;
         flex-direction: row;
         justify-content: center;
         border: 1px solid rgba(25, 237, 255, 0.4);
         box-shadow: inset 0 0 10px rgba(0, 197, 255, 0.6);
         background: rgba(0, 0, 0, 0.06666666666666667);
-        padding-top: 16px;
+        padding-top: 12px;
 
         .icon {
           margin-right: 10px;
@@ -388,16 +392,16 @@ export default defineComponent({
             font-style: normal;
             background-size: cover;
             font-family: electronicFont;
-            font-size: 30px;
+            font-size: 28px;
             -webkit-background-clip: text;
             background-clip: text;
             -webkit-text-fill-color: transparent;
             position: relative;
-            top: -8px;
+            top: -6px;
 
             span {
               font-family: Arial, Helvetica, sans-serif;
-              font-size: 18px;
+              font-size: 16px;
               color: aliceblue;
             }
           }
@@ -408,7 +412,7 @@ export default defineComponent({
         padding-top: 0px;
 
         .icon {
-          margin-top: 20px;
+          margin-top: 16px;
 
           .icon-style {
             color: #fdb146;
@@ -423,18 +427,19 @@ export default defineComponent({
     }
 
     .right-center {
-      margin-top: 20px;
+      margin-top: 12px;
       display: flex;
       flex-direction: row;
       justify-content: space-between;
+      flex-shrink: 0;
 
       .table-box {
         position: relative;
         width: 500px;
-        height: 250px;
+        height: 230px;
 
         :deep(.zxm-table-wrapper) {
-          height: 220px !important;
+          height: 200px !important;
           background: #ffffff05 !important;
           border-bottom: 1px solid #91e9fe80 !important;
         }
@@ -445,7 +450,6 @@ export default defineComponent({
 
         .warning-container {
           width: 100%;
-          height: convert;
           background: #009acd00;
 
           :deep(.dv-scroll-board) {
@@ -464,11 +468,16 @@ export default defineComponent({
     }
 
     .right-bottom {
-      margin-top: 20px;
+      margin-top: 12px;
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
 
       .echarts-box {
         width: 100%;
-        height: 230px;
+        flex: 1;
+        min-height: 180px;
       }
     }
   }