From ad5c346c616cd872fd192c32b942ba90c6aba494 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Sun, 28 Sep 2025 15:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/drawMixin.js                        |  2 +-
 .../wsScreen/components/center/index.vue      | 14 ++++-
 .../wsScreen/components/left/AllEquip.vue     |  4 +-
 .../components/left/EquipStatusMore.vue       |  4 +-
 .../components/left/UnitEquipConfig.vue       |  3 +-
 .../components/left/UnitEquipmentConfig.vue   | 18 +++++-
 .../components/right/EquipUsageRateMore.vue   |  4 +-
 .../components/right/ProEquipMore.vue         |  4 +-
 .../right/ProEquipSituationList.vue           | 17 +++++-
 .../components/right/SegmentProgress.vue      | 60 +++++++++++++++++++
 .../components/right/UsageRateMore.vue        |  4 +-
 .../right/UsageRateSituationList.vue          | 17 +++++-
 .../wsScreen/components/right/index.vue       |  4 +-
 13 files changed, 138 insertions(+), 17 deletions(-)
 create mode 100644 src/views/screen/wsScreen/components/right/SegmentProgress.vue

diff --git a/src/utils/drawMixin.js b/src/utils/drawMixin.js
index 4804553b..ab1cd5fd 100644
--- a/src/utils/drawMixin.js
+++ b/src/utils/drawMixin.js
@@ -38,7 +38,7 @@ export default {
         // 调试模式，不缩放，居中显示
         // appRef.style.transform = `translate(-25%, -45%) scale(0.9, 0.9)`
         // appRef.style.overflow = 'visible'
-         return
+        // return
       }
       // 调试模式 - end
 
diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue
index 5863a9a7..0515da98 100644
--- a/src/views/screen/wsScreen/components/center/index.vue
+++ b/src/views/screen/wsScreen/components/center/index.vue
@@ -14,7 +14,11 @@
     </div>
 
     <!-- 点击城市显示详情 -->
-    <div v-if="selectedCity && btnIndex == 1" class="city-tooltip">
+    <div
+      v-if="selectedCity && btnIndex == 1"
+      class="city-tooltip"
+      :style="{ left: tooltipPos.x + 25 + 'px', top: tooltipPos.y + 25 + 'px' }"
+    >
       <div class="city-name">{{ selectedCity.cityName }}</div>
       <div
         >装备价值： <span class="num">{{ (selectedCity.totalValue / 100000000).toFixed(4) }}</span
@@ -57,6 +61,7 @@ export default {
       btnIndex: 1,
       myChart: null,
       selectedCity: null,
+      tooltipPos: { x: 0, y: 0 },
       cityData: [
         // 调试数据
         // {
@@ -202,6 +207,7 @@ export default {
               show: true,
               position: 'top', // 先指定一个基准位置（如 'top'）
               offset: [0, -10], // 向上偏移 10px（x 方向 0，y 方向 -10）
+              triggerEvent: true,
               formatter: (params) => {
                 const val = params.data.value || []
                 let unit = ''
@@ -273,6 +279,12 @@ export default {
         //   city = this.cityData.find((c) => c.cityName === params.name)
         // }
         this.selectedCity = city || null
+        if (params.event) {
+          this.tooltipPos = {
+            x: params.event.offsetX,
+            y: params.event.offsetY,
+          }
+        }
       })
 
       // 鼠标移出时隐藏
diff --git a/src/views/screen/wsScreen/components/left/AllEquip.vue b/src/views/screen/wsScreen/components/left/AllEquip.vue
index 99aff7b0..932a0e7d 100644
--- a/src/views/screen/wsScreen/components/left/AllEquip.vue
+++ b/src/views/screen/wsScreen/components/left/AllEquip.vue
@@ -157,7 +157,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="650"
+          :height="600"
           class="table-container"
         >
           <el-table-column
@@ -468,7 +468,7 @@ export default {
 
 ::v-deep .el-dialog .el-dialog__body {
   background-image: url('../../img/all-dialog.png');
-  background-size: 100% auto;
+  background-size: 100% 100%;
   color: #fff;
 }
 ::v-deep .el-dialog__header {
diff --git a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
index 9354fdbf..25518d07 100644
--- a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
@@ -43,7 +43,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="650"
+          :height="600"
           class="table-container"
         >
           <el-table-column
@@ -158,7 +158,7 @@ export default {
 
 ::v-deep .el-dialog .el-dialog__body {
   background-image: url('../../img/all-dialog.png');
-  background-size: 100% auto;
+  background-size: 100% 100%;
   color: #fff;
 }
 ::v-deep .el-dialog__header {
diff --git a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
index d9f6a532..7bd6407d 100644
--- a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="650"
+          :height="600"
           class="table-container"
         >
           <el-table-column
@@ -99,6 +99,7 @@ export default {
 
 ::v-deep .el-dialog .el-dialog__body {
   background-image: url('../../img/unit-config-dialog.png');
+  background-size: 100% 100%;
   // 以宽度为准
   background-size: 100% auto;
   color: #fff;
diff --git a/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue b/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
index 4cc9337d..2b778ed5 100644
--- a/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
+++ b/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="scroll-container">
     <table cellspacing="0" cellpadding="8" style="width: 100%; border-collapse: collapse; text-align: center">
       <!-- 双层表头 -->
       <thead>
@@ -113,4 +113,20 @@ tbody tr:hover {
   background-image: url('../../img/table-hover.png');
   cursor: pointer;
 }
+.scroll-container {
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+
+  /* 隐藏滚动条轨迹 */
+  -ms-overflow-style: none;  /* IE / Edge */
+  scrollbar-width: none;     /* Firefox */
+}
+
+/* Chrome / Safari */
+.scroll-container::-webkit-scrollbar {
+  width: 0;   /* 或者直接隐藏 */
+  height: 0;
+  background: transparent; /* 背景透明 */
+}
 </style>
diff --git a/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue b/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
index addd31ad..c116e33a 100644
--- a/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
+++ b/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="650"
+          :height="600"
           class="table-container"
         >
           <el-table-column
@@ -102,7 +102,7 @@ export default {
 
 ::v-deep .el-dialog .el-dialog__body {
   background-image: url('../../img/right-dialog.png');
-  background-size: 100% auto;
+  background-size: 100% 100%;
   color: #fff;
 }
 ::v-deep .el-dialog__header {
diff --git a/src/views/screen/wsScreen/components/right/ProEquipMore.vue b/src/views/screen/wsScreen/components/right/ProEquipMore.vue
index 27a2d4e9..da7cbca4 100644
--- a/src/views/screen/wsScreen/components/right/ProEquipMore.vue
+++ b/src/views/screen/wsScreen/components/right/ProEquipMore.vue
@@ -34,7 +34,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="650"
+          :height="600"
           class="table-container"
         >
           <el-table-column
@@ -124,7 +124,7 @@ export default {
 
 ::v-deep .el-dialog .el-dialog__body {
   background-image: url('../../img/right-dialog.png');
-  background-size: 100% auto;
+  background-size: 100% 100%;
   color: #fff;
 }
 ::v-deep .el-dialog__header {
diff --git a/src/views/screen/wsScreen/components/right/ProEquipSituationList.vue b/src/views/screen/wsScreen/components/right/ProEquipSituationList.vue
index 9eefd95e..9671cc14 100644
--- a/src/views/screen/wsScreen/components/right/ProEquipSituationList.vue
+++ b/src/views/screen/wsScreen/components/right/ProEquipSituationList.vue
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div class="table-list">
+    <div class="table-list scroll-container">
       <table cellspacing="0" cellpadding="8" style="width: 100%; border-collapse: collapse; text-align: center">
         <!-- 双层表头 -->
         <thead>
@@ -112,6 +112,21 @@ export default {
 .table-style {
   height: 350px;
 }
+.scroll-container {
+  width: 100%;
+  overflow: auto;
+
+  /* 隐藏滚动条轨迹 */
+  -ms-overflow-style: none;  /* IE / Edge */
+  scrollbar-width: none;     /* Firefox */
+}
+
+/* Chrome / Safari */
+.scroll-container::-webkit-scrollbar {
+  width: 0;   /* 或者直接隐藏 */
+  height: 0;
+  background: transparent; /* 背景透明 */
+}
 .title-tip {
   display: flex;
   justify-content: space-between;
diff --git a/src/views/screen/wsScreen/components/right/SegmentProgress.vue b/src/views/screen/wsScreen/components/right/SegmentProgress.vue
new file mode 100644
index 00000000..f8b36911
--- /dev/null
+++ b/src/views/screen/wsScreen/components/right/SegmentProgress.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="segment-progress">
+    <!-- <div class="label">
+      <slot name="label">进度</slot>
+    </div> -->
+    <div class="bars">
+      <div v-for="i in total" :key="i" class="bar" :class="{ active: i <= activeBars }"></div>
+    </div>
+    <div class="percent">{{ value }}%</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SegmentProgress',
+  props: {
+    value: { type: Number, default: 0 }, // 百分比
+    total: { type: Number, default: 20 }, // 分段数
+    color: { type: String, default: '#00cfff' }, // 激活颜色
+    bgColor: { type: String, default: '#444' }, // 背景颜色
+  },
+  computed: {
+    activeBars() {
+      return Math.round((this.value / 100) * this.total)
+    },
+  },
+}
+</script>
+
+<style scoped>
+.segment-progress {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  color: #9cf;
+}
+
+.bars {
+  display: flex;
+  gap: 5px;
+}
+
+.bar {
+  width: 6px;
+  height: 20px;
+  border-radius: 2px;
+  background: #294C68; /* 默认背景色，实际会用 style 动态覆盖 */
+}
+
+.bar.active {
+  background: #00cfff; /* 激活色，实际会用 style 动态覆盖 */
+  box-shadow: 0 0 4px #00cfff;
+}
+
+.percent {
+  font-weight: bold;
+  font-size: 16px;
+  color: #00cfff;
+}
+</style>
diff --git a/src/views/screen/wsScreen/components/right/UsageRateMore.vue b/src/views/screen/wsScreen/components/right/UsageRateMore.vue
index 87739633..dc23e763 100644
--- a/src/views/screen/wsScreen/components/right/UsageRateMore.vue
+++ b/src/views/screen/wsScreen/components/right/UsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="650"
+          :height="600"
           class="table-container"
         >
           <el-table-column
@@ -102,7 +102,7 @@ export default {
 
 ::v-deep .el-dialog .el-dialog__body {
   background-image: url('../../img/right-dialog.png');
-  background-size: 100% auto;
+  background-size: 100% 100%;
   color: #fff;
 }
 ::v-deep .el-dialog__header {
diff --git a/src/views/screen/wsScreen/components/right/UsageRateSituationList.vue b/src/views/screen/wsScreen/components/right/UsageRateSituationList.vue
index 3129b346..48879770 100644
--- a/src/views/screen/wsScreen/components/right/UsageRateSituationList.vue
+++ b/src/views/screen/wsScreen/components/right/UsageRateSituationList.vue
@@ -5,7 +5,7 @@
       <div class="more" @click="openDialog">更多 ></div>
     </div>
 
-    <div class="table-list">
+    <div class="table-list scroll-container">
       <table cellspacing="0" cellpadding="8" style="width: 100%; border-collapse: collapse; text-align: center">
         <!-- 双层表头 -->
         <thead>
@@ -125,4 +125,19 @@ tbody tr:hover {
   background-image: url('../../img/table-hover.png');
   cursor: pointer;
 }
+.scroll-container {
+  width: 100%;
+  overflow: auto;
+
+  /* 隐藏滚动条轨迹 */
+  -ms-overflow-style: none;  /* IE / Edge */
+  scrollbar-width: none;     /* Firefox */
+}
+
+/* Chrome / Safari */
+.scroll-container::-webkit-scrollbar {
+  width: 0;   /* 或者直接隐藏 */
+  height: 0;
+  background: transparent; /* 背景透明 */
+}
 </style>
diff --git a/src/views/screen/wsScreen/components/right/index.vue b/src/views/screen/wsScreen/components/right/index.vue
index bacc71c6..1a2b42d3 100644
--- a/src/views/screen/wsScreen/components/right/index.vue
+++ b/src/views/screen/wsScreen/components/right/index.vue
@@ -25,7 +25,7 @@
             <img src="../../img/usage-rate.png" alt="" />
             <div style="margin: 0 10px">在用率</div>
             <div style="width: 250px">
-              <el-progress :stroke-width="20" :percentage="proportion" color="#409EFF"></el-progress>
+              <SegmentProgress :value="proportion" :total="20" />
             </div>
           </div>
         </div>
@@ -72,6 +72,7 @@ import { getProjectEquipmentApi } from '@/api/wsScreen'
 import UsageRateMore from './UsageRateMore.vue'
 import ProEquipMore from './ProEquipMore'
 import EquipItemMore from './EquipItemMore.vue'
+import SegmentProgress from './SegmentProgress.vue'
 
 export default {
   components: {
@@ -81,6 +82,7 @@ export default {
     UsageRateMore,
     ProEquipMore,
     EquipItemMore,
+    SegmentProgress,
   },
   data() {
     return {