From 98b8b0a8d7fa853d964c0b485af3d1fc3b4f7dbf Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 28 Mar 2024 14:32:30 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E5=88=86=E9=A1=B5=20?=
 =?UTF-8?q?=E9=A1=B5=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RoadAndEvents/utils/map.js     | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 64d6eb52..d00e4d0b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -112,39 +112,40 @@ export class MarkerCluster {
     window.pageSize = pageSize;
     window.page = page;
     window.totalPages = totalPages;
-
+    let num = (page - 1) * pageSize;
     function renderData(page) {
       if (page < 1 || page > totalPages) return;
       window.page = page;
       const pageSize = window.pageSize;
       const dataContainer = document.getElementById("dataContainer");
-
+      const dataPage = document.getElementById("dataPage");
       // 清空数据容器
       // dataContainer.innerHTML = "";
 
       // 计算当前页起始索引和结束索引
       const startIndex = (page - 1) * pageSize;
       const endIndex = startIndex + pageSize;
-
+      let num = (page - 1) * pageSize;
       // 截取当前页的数据
       const currentPageData = data.slice(startIndex, endIndex);
       window.currentPageData = currentPageData;
       const itemsTpl = currentPageData
-        .map(
-          (item) => `
+        .map((item) => {
+          return `
           <div style="cursor: pointer; padding: 3px 6px;display: flex;align-items: center; gap: 6px;" class="info-window-item">
-            <img  style="width: 18px;" src="${getIcon(item)}" />
-            <span>${
+            ${++num}<img  style="width: 18px;" src="${getIcon(item)}" />
+            <span>${(
               item.extData.deviceName ||
               item.extData.warningTitle ||
               item.config?.item.title
-            }</span>
+            ).replace("G35 ", "")}</span>
           </div>
-        `
-        )
+        `;
+        })
         .join("");
       // 渲染当前页数据
       dataContainer.innerHTML = itemsTpl;
+      dataPage.innerHTML = `第${page}页`;
       bindItemClick();
     }
 
@@ -170,12 +171,12 @@ export class MarkerCluster {
           .map(
             (item) => `
               <div style="cursor: pointer; padding: 3px 6px;display: flex;align-items: center; gap: 6px;" class="info-window-item">
-                <img  style="width: 18px;" src="${getIcon(item)}" />
-                <span>${
+               ${++num} <img  style="width: 18px;" src="${getIcon(item)}" />
+                <span>${(
                   item.extData.deviceName ||
                   item.extData.warningTitle ||
                   item.config?.item.title
-                }</span>
+                ).replace("G35 ", "")}</span>
               </div>
             `
           )
@@ -186,6 +187,7 @@ export class MarkerCluster {
           ? `
       <div id="paginationContainer" style="text-align:center;margin-bottom:5px;">
       <button style="padding: 0 15px;background: #00B3CC;border-radius: 48px;cursor: pointer;opacity: 1;gap: 6px;font-size: 14px;font-weight: 500;color: #FFFFFF;border: 1px solid rgba(42, 217, 253, 0.6);" onclick="renderData(window.page-1)">上一页</button>
+      <span id="dataPage" style="font-size: 14px;font-weight: 500;color: #FFFFFF;"> 第${page} 页</span>
       <button style="padding: 0 15px;background: #00B3CC;border-radius: 48px;cursor: pointer;opacity: 1;gap: 6px;font-size: 14px;font-weight: 500;color: #FFFFFF;border: 1px solid rgba(42, 217, 253, 0.6);" onclick="renderData(window.page+1)">下一页</button>
       </div>`
           : ""