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 @@ 附件: - {{item.fileName}} + {{item.fileName}} @@ -186,4 +186,7 @@ bind:input="onInput" bind:cancel="onCancel" /> + + + \ 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%;