微调

src/layouts/admin/components/globalPopUp.vue

@@ -8,9 +8,9 @@
                     v-loading="isLoading"
                     height="100%"
                     ref="xTable1Ref"
-                    :data="eventList"
+                    :data="eventList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
                 >
-                    <vxe-column type="seq" width="70px" title="序号"></vxe-column>
+                    <!-- <vxe-column type="seq" width="70px" title="序号"></vxe-column> -->
                     <vxe-column field="time" width="180px" sortable title="发生时刻"></vxe-column>
                     <vxe-column field="lineName" title="监测点"></vxe-column>
                     <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
@@ -31,6 +31,16 @@
                         </template>
                     </vxe-column>
                 </vxe-table>
+                <div class="table-pagination mt10">
+                    <el-pagination
+                        v-model:currentPage="pageNum"
+                        v-model:page-size="pageSize"
+                        :page-sizes="[10, 20, 50, 100, 200]"
+                        background
+                        layout="sizes,total, ->, prev, pager, next, jumper"
+                        :total="eventList.length"
+                    ></el-pagination>
+                </div>
             </div>
         </el-drawer>
     </div>
@@ -45,10 +55,12 @@ const dictData = useDictData()
 const event = dictData.getBasicData('Event_Statis')
 import { useAdminInfo } from '@/stores/adminInfo'
 const adminInfo = useAdminInfo()
-const height = mainHeight(-20)
+const height = mainHeight(20)
 const drawer = ref(false)
 const isLoading = ref(false)
 const eventList = ref([])
+const pageNum = ref(1)
+const pageSize = ref(20)
 const open = () => {
     drawer.value = true
 }
@@ -67,7 +79,7 @@ const init = async () => {
         // 设置消息接收回调
         mqttClient.onMessage((topic, message) => {
             const msg = JSON.parse(message.toString())
-            console.log("🚀 ~ init ~ msg:", msg)
+            console.log('🚀 ~ init ~ msg:', msg)
             if (msg.deptList.includes(adminInfo.$state.deptId)) {
                 drawer.value = true
                 isLoading.value = true

src/layouts/admin/components/navMenus.vue

@@ -9,7 +9,7 @@
                     size="18"
                 />
                 <span class="nav-menu-text" v-if="globalPopUpRef?.eventList.length != 0">
-                    {{ globalPopUpRef?.eventList.length || 0 }}
+                    {{ (globalPopUpRef?.eventList.length>99? '99+':globalPopUpRef?.eventList.length)    || 0 }}
                 </span>
             </div>
         </el-tooltip>
@@ -260,7 +260,7 @@ const temporaryLandingEvent = () => {
 .nav-menu-text {
     position: absolute;
     top: 13px;
-    right: 7px;
+    left:  20px;
     font-size: 12px;
     display: inline-block;
     background-color: #ff0000;

src/views/pqs/supervise/electricalEnergy/components1/online.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- <div>1 监测点信息  发起预告警单 </div> -->
 
-  <TableHeader datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
+  <TableHeader datePicker nextFlag theCurrentTime  ref="TableHeaderRef" showExport>
     <template v-slot:select>
       <el-form-item label="区域">
         <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea"/>