From 4069923c830a8cc5326a7b9fcaf408351c1c90d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 31 May 2024 10:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=AE=89=E6=A3=80bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/InspectionReport/InspectionReport.js     |  1 +
 .../pages/safetyinspection/safetyinspection.js     | 14 ++++++++++++++
 .../pages/safetyinspection/safetyinspection.json   |  3 ++-
 .../pages/safetyinspection/safetyinspection.wxml   |  5 ++++-
 .../pages/safetyinspection/safetyinspection.wxss   |  4 ++++
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index e46df00..36361b8 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -202,6 +202,7 @@ Page({
       console.log(newArr)
       this.setData({
         addHiddenDangeList: newArr,
+        hazardDesc2:""
       });
     }
     let form={ 
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index ae6bdee..5a53f1e 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -11,6 +11,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    attachmentUrl:"",
+    imageshow:false,
     orgid:'',
     orgType:'',
     pageNo:'1',
@@ -105,6 +107,18 @@ Page({
    */
   onShareAppMessage() {
   },
+  onImage(e){
+    const attachmentUrls = e.currentTarget.dataset.item;
+    console.log(attachmentUrls.attachmentUrl);
+    this.setData({ 
+      imageshow: true,
+      attachmentUrl:attachmentUrls.attachmentUrl
+     });
+  }, 
+  onClose1() {
+    this.setData({ imageshow: false });
+  },
+
   securityCheckk(){
     securityCheckk({
       pageNo: this.data.pageNo,
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
index 1e8e5bc..4f599dc 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
@@ -8,7 +8,8 @@
      "van-popup": "@vant/weapp/popup/index",
     "van-picker": "@vant/weapp/picker/index",
     "wux-actionsheet": "../../../../components/dist/actionsheet/index",
-    "van-datetime-picker": "@vant/weapp/datetime-picker/index"
+    "van-datetime-picker": "@vant/weapp/datetime-picker/index",
+    "van-image": "@vant/weapp/image/index"
     
   },
   "permissions": {
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index dfd9237..524458f 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -146,7 +146,7 @@
           <view>
             <text class="logs-content-title" wx:if="{{item.attachmentUrls}}">附件：</text>
             <block  wx:if="{{item.attachmentUrls.length > 0}}" >
-              <text class="logs-content-txt"  wx:for="{{item.attachmentUrls}}">{{item.fileName}}</text>
+              <text class="logs-content-txt" data-item="{{item}}" wx:for="{{item.attachmentUrls}}" bindtap="onImage">{{item.fileName}}</text>
             </block>
 
           </view>
@@ -186,4 +186,7 @@
   bind:input="onInput"
   bind:cancel="onCancel"
 />
+</van-popup>
+<van-popup show="{{ imageshow }}" bind:close="onClose1" custom-style="imageup">
+  <van-image width="300" height="300" src="{{attachmentUrl}}" />
 </van-popup>
\ No newline at end of file
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
index 47725c2..9fbbb06 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
@@ -7,6 +7,10 @@ page {
   padding: 0 30rpx;
   box-sizing: border-box;
 }
+imageup{
+  height: 500rpx;
+  width: 500rpx;
+}
 .form_add{
   width: 100%;
   height: 100%;