From 04a62cbd682770e694f31e54df8999ffd22f6f19 Mon Sep 17 00:00:00 2001
From: SunTao <328867980@qq.com>
Date: Mon, 6 Jan 2025 15:26:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=BC=B9=E7=AA=97=E4=B8=AD=E6=94=BE=E5=A4=A7=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=97=85?=
 =?UTF-8?q?=E5=AE=B3=E7=A1=AE=E8=AE=A4=E4=B8=AD=E6=9F=A5=E7=9C=8B=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/img-dialog.vue                 | 17 ++++++----
 .../components/merge-dialog.vue               | 32 +++++++++++++++++--
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/views/xj/inspection/confirmation-management/components/img-dialog.vue b/src/views/xj/inspection/confirmation-management/components/img-dialog.vue
index 94be8c8..cf915f9 100644
--- a/src/views/xj/inspection/confirmation-management/components/img-dialog.vue
+++ b/src/views/xj/inspection/confirmation-management/components/img-dialog.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-22 15:30:25
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-27 17:11:58
+ * @LastEditTime: 2025-01-06 15:21:22
  * @FilePath: \znxjxt-ui\src\views\big-screen\components\img-dialog.vue
  * @Description: 大屏查看图片弹窗
 -->
@@ -346,9 +346,12 @@ export default {
      */
     initBodySize() {
       this.initWidth = this.$refs.imageView.clientWidth; // 拿到父元素宽
-      this.initHeight = this.initWidth * ((1080 * 0.31) / (1920 - 1080 * 0.02)); // 根据宽计算高实现自适应
-      this.elWidth = this.initWidth * (100 / (1920 / 1.2));
-      this.elHeight = this.initHeight * (100 / (1080 / 2.15));
+      this.initHeight =
+        this.initWidth *
+        ((window.screen.height * 0.31) /
+          (window.screen.width - window.screen.height * 0.02)); // 根据宽计算高实现自适应
+      this.elWidth = this.initWidth * (100 / (window.screen.width / 1.2));
+      this.elHeight = this.initHeight * (100 / (window.screen.height / 2.15));
     },
 
     /**
@@ -370,8 +373,10 @@ export default {
         this.scale = 1;
         return;
       }
-      this.elWidth = this.initWidth * (100 / (1920 / 1.2)) * this.zoom;
-      this.elHeight = this.initHeight * (100 / (1080 / 2)) * this.zoom;
+      this.elWidth =
+        this.initWidth * (100 / (window.screen.width / 1.2)) * this.zoom;
+      this.elHeight =
+        this.initHeight * (100 / (window.screen.height / 2)) * this.zoom;
       // 调整滚动容器的尺寸
       this.$nextTick(() => {
         const container = this.$refs.imageContainer;
diff --git a/src/views/xj/inspection/disease-management/components/merge-dialog.vue b/src/views/xj/inspection/disease-management/components/merge-dialog.vue
index c143274..42717c5 100644
--- a/src/views/xj/inspection/disease-management/components/merge-dialog.vue
+++ b/src/views/xj/inspection/disease-management/components/merge-dialog.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-04 10:54:59
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-11-04 17:25:42
+ * @LastEditTime: 2025-01-06 13:18:09
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management\components\merge-dialog.vue
  * @Description: 病害管理-合并病害弹窗
 -->
@@ -206,7 +206,7 @@
     <el-dialog
       title="查看图片"
       :visible.sync="showImageDialog"
-      width="75rem"
+      width="85rem"
       append-to-body
       destroy-on-close
       @close="imgCancel"
@@ -224,6 +224,21 @@
           class="rect-overlay"
           :style="getRectStyle(rect)"
         ></div>
+        <div class="rect-image">
+          采集时间:
+          {{
+            new Date(currentImageItem.createdTime).toLocaleString()
+          }}
+          起始桩号： {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号：
+          {{ currentImageItem.stakeEnd || "暂无数据" }}
+          病害类型：
+          {{ currentImageItem.defectTypeName || "暂无数据" }}
+          病害面积：{{ currentImageItem.targetArea }}平方米 病害长度：{{
+            currentImageItem.targetLen * 1 <= 0
+              ? "暂无数据"
+              : `${currentImageItem.targetLen}米`
+          }}
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -538,6 +553,7 @@ export default {
   width: 100%;
   height: 80%;
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
   overflow: hidden;
@@ -554,4 +570,14 @@ export default {
   pointer-events: none;
   border: 2px solid red;
 }
-</style>
\ No newline at end of file
+
+// 图片信息
+.rect-image {
+  width: 90%;
+  position: absolute;
+  top: 0;
+  font-size: 1.2rem;
+  color: #ffffff;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+</style>