Merge branch 'master' of http://39.97.59.228:8013/hrx/goaf-monitoring-system

src/views/dashboard/Overhaul/components/RootPage.vue

@@ -25,10 +25,10 @@
             <div v-for="value in accessStatics" :key="value.id" class="card-item">
               <div class="item-cont"> 组织机构：{{ value.name }} </div>
               <div class="item-cont"> 应接入：{{ value.yjNum }} </div>
-              <div class="item-cont"> 在线：{{ value.yjNum }} </div>
-              <div class="item-cont"> 中断：{{ value.yjNum }} </div>
-              <div class="item-cont"> 未接入：{{ value.yjNum }} </div>
-              <div class="item-cont"> 接入密闭数：{{ value.yjNum }} </div>
+              <div class="item-cont"> 在线：{{ value.zxNum }} </div>
+              <div class="item-cont"> 中断：{{ value.zdNum }} </div>
+              <div class="item-cont"> 未接入：{{ value.wjNum }} </div>
+              <div class="item-cont"> 接入密闭数：{{ value.goafNum }} </div>
               <div class="bg-line"> </div>
               <div class="bg-icon"></div>
             </div>
@@ -89,7 +89,7 @@
           </div>
         </div>
         <div class="details-content">
-          <div v-for="(item, index) in mineData?.records" :key="index" class="warning-item">
+          <div v-for="(item, index) in mineData" :key="index" class="warning-item">
             <div class="item-header">
               <div class="header-left">
                 <div class="icon"></div>
@@ -197,8 +197,8 @@
   import { BasicModal } from '/@/components/Modal';
   import { Spin } from 'ant-design-vue';
   import { EChartsOption, graphic } from 'echarts';
-  import { computed } from 'vue';
-  import { get } from 'lodash-es';
+  import IMG1 from '/@/assets/images/overHaul/rootPage/pie-chart-center.png';
+  import IMG2 from '/@/assets/images/overHaul/rootPage/alarm-icon-9.svg';
 
   // 处理矿名选择器相关的逻辑
   const isDetailModalVisible = ref(false);
@@ -215,7 +215,7 @@
     return getGoafData(params);
   };
   // 注册实时数据表格
-  const { tableContext: ctxRealtime, onExportXls: onExportXlsTime } = useListPage({
+  const { tableContext: ctxRealtime } = useListPage({
     tableProps: {
       api: getDynamicTableData,
       columns,
@@ -273,20 +273,20 @@
     { label: '开始时间', key: 'earliestTime', type: 'text' },
     { label: '最新监测时间', key: 'latestReadTime', type: 'text' },
   ];
-  const alartTypeColumns = [
-    'fireAlarm',
-    'fireAlarmOut',
-    'explosionAlarm',
-    'sourcePressureAlarm',
-    'leakageAlarm',
-    'unsealAlarm',
-    // {key: 'fireAlarm', label: '闭内自燃发火'},
-    // {key: 'fireAlarmOut', label: '闭外自燃发火'},
-    // {key: 'explosionAlarm', label: '爆炸预警'},
-    // {key: 'sourcePressureAlarm', label: '压差隐患'},
-    // {key: 'leakageAlarm', label: '漏风'},
-    // {key: 'unsealAlarm', label: '密闭启封'},
-  ];
+  // const alartTypeColumns = [
+  //   'fireAlarm',
+  //   'fireAlarmOut',
+  //   'explosionAlarm',
+  //   'sourcePressureAlarm',
+  //   'leakageAlarm',
+  //   'unsealAlarm',
+  //   // {key: 'fireAlarm', label: '闭内自燃发火'},
+  //   // {key: 'fireAlarmOut', label: '闭外自燃发火'},
+  //   // {key: 'explosionAlarm', label: '爆炸预警'},
+  //   // {key: 'sourcePressureAlarm', label: '压差隐患'},
+  //   // {key: 'leakageAlarm', label: '漏风'},
+  //   // {key: 'unsealAlarm', label: '密闭启封'},
+  // ];
   async function fetchAccessStatics() {
     accessStatics.value = await getGoafAccessCount({ deptId: mineStore.getRootId });
   }
@@ -323,11 +323,12 @@
     }));
   }
 
-  const mineData = ref<any>();
+  const mineData = ref<any>([]);
   async function fetchMineData() {
-    mineData.value = await getMineData({
+    const { records } = await getMineData({
       deptId: mineStore.getRootId,
     });
+    mineData.value = records;
   }
 
   /**
@@ -498,7 +499,7 @@
           top: 'center',
           style: {
             // 图片路径或 base64
-            image: '/src/assets/images/overHaul/rootPage/pie-chart-center.png',
+            image: IMG1,
             width: 260, // 图片宽度，单位px
             height: 260, // 图片高度，单位px
           },
@@ -512,7 +513,7 @@
           top: 'center',
           style: {
             // 图片路径或 base64
-            image: '/src/assets/images/overHaul/rootPage/alarm-icon-9.svg',
+            image: IMG2,
             width: 80, // 图片宽度，单位px
             height: 80, // 图片高度，单位px
           },
@@ -591,6 +592,7 @@
       type: 'value',
       name: '报警数量',
     },
+    // @ts-ignore-next-line
     series: [
       {
         type: 'custom',