Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

协调调度记录,总条数统一放到左侧
解决bug:聚合数字，重叠时遮挡
2 changed files with 2 additions and 2 deletions
--- 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
@ -429,7 +429,7 @@ export function getContent(data) {
      align-items: center;
      padding-bottom: 9px;
      align-self: center;
-    ">
+    " onmouseover="this.parentNode.style.zIndex=13;" onmouseout="this.parentNode.style.zIndex=12;">
      ${data.length}
    </div>
 `;
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue
@ -19,7 +19,7 @@
    <!-- 分页 -->
    <div class="footer">
-      <Pagination :total="90" />
+      <Pagination :total="90"  layout="total, sizes, prev, pager, next"/>
    </div>
  </div>
 </template>
Author	SHA1	Message	Date
刘朋	b743124178	Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop	8 months ago
刘朋	4c1137e76b	协调调度记录,总条数统一放到左侧	8 months ago
刘朋	dd6467689e	解决bug:聚合数字，重叠时遮挡	8 months ago