From 6bf5f469a233dc8d798851f94e153349aa7ac62f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 3 Apr 2024 15:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=B5=81=E7=A8=8B=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=8A=A8=E7=81=AB=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=BA=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-accept/hotwork-accept-detail.vue  | 20 +++++++++++++++++++
 .../hotwork-approve-detail.vue                | 19 ++++++++++++++++++
 .../hotwork-audit/hotwork-audit-detail.vue    | 20 +++++++++++++++++++
 .../hotwork-confess-detail.vue                | 20 +++++++++++++++++++
 .../hotwork-confirm-detail.vue                | 20 +++++++++++++++++++
 .../hotwork-guardian-detail.vue               | 20 +++++++++++++++++++
 .../hotwork-leader/hotwork-leader-detail.vue  | 20 +++++++++++++++++++
 .../hotwork-monitor-detail.vue                | 20 +++++++++++++++++++
 .../hotwork-safety/hotwork-safety-detail.vue  | 19 ++++++++++++++++++
 .../hotwork-safety/hotwork-safety-list.vue    |  8 ++++----
 .../hotwork-xiang-mu/hotwork-xiang-detail.vue | 20 +++++++++++++++++++
 11 files changed, 202 insertions(+), 4 deletions(-)

diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
index e1f5222..0de85ec 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -502,6 +514,14 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
index e35e1a7..bfc9459 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -434,6 +446,13 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
index 5bfdeaa..142f69b 100644
--- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -452,6 +464,14 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
index c0a3fa4..46463c5 100644
--- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
@@ -27,6 +27,18 @@
 						<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 					</view>
 
+          <view class="cu-form-textarea ">
+            <view class="cu-form-title">动火操作人图片：</view>
+            <view class="cu-form-group" style="padding-top:20upx">
+              <view class="grid col-4 grid-square flex-sub">
+                <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                      :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                  <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+                </view>
+              </view>
+            </view>
+          </view>
+
 					<view class="cu-form-group">
 						<view class="title">动火地点及动火部位：</view>
 						<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -503,6 +515,14 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
index e3cae44..397e295 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -368,6 +380,14 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
index af35e24..3da0123 100644
--- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -453,6 +465,14 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
index 1972f51..f859464 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -417,6 +429,14 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
index 651c861..7b9298b 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -481,6 +493,14 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
index c053cd7..248050e 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
@@ -27,6 +27,18 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
 				</view>
 
+        <view class="cu-form-textarea ">
+          <view class="cu-form-title">动火操作人图片：</view>
+          <view class="cu-form-group" style="padding-top:20upx">
+            <view class="grid col-4 grid-square flex-sub">
+              <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                    :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+              </view>
+            </view>
+          </view>
+        </view>
+
 				<view class="cu-form-group">
 					<view class="title">动火地点及动火部位：</view>
 					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -356,6 +368,13 @@
 							if(_this.pd.APPLY_STATUS < 1){
 								_this.forbidEdit = false;
 							}
+              let dongHuoCaoZuoRenPic = res.data.imgList2
+              if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+                _this.pd.dongHuoCaoZuoRenPic = []
+                for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                  _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+                }
+              }
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
index d491a68..ef59041 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
@@ -38,10 +38,10 @@
               <text>安全管理部门负责人：{{item.AUDIT_USER_NAME}}</text>
               <text>审批部门负责人：{{item.APPROVE_USER_NAME}}</text>
             </view>
-			<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
-				<text>监护人：{{item.GUARDIAN_USER_NAME}}</text>
-				<text>安全交底人：{{item.confessUserNames}}</text>
-			</view>
+            <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+              <text>监护人：{{item.GUARDIAN_USER_NAME}}</text>
+              <text>安全交底人：{{item.confessUserNames}}</text>
+            </view>
 
 			<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
 				<text>接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}</text>
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
index 07b8118..a080123 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
@@ -28,6 +28,18 @@
                       placeholder="请输入作业内容"></textarea>
           </view>
 
+          <view class="cu-form-textarea ">
+            <view class="cu-form-title">动火操作人图片：</view>
+            <view class="cu-form-group" style="padding-top:20upx">
+              <view class="grid col-4 grid-square flex-sub">
+                <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
+                      :data-url="pd.dongHuoCaoZuoRenPic[index]">
+                  <image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
+                </view>
+              </view>
+            </view>
+          </view>
+
           <view class="cu-form-group">
             <view class="title">动火地点及动火部位：</view>
             <input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
@@ -417,6 +429,14 @@ export default {
             if (_this.pd.APPLY_STATUS < 1) {
               _this.forbidEdit = false;
             }
+
+            let dongHuoCaoZuoRenPic = res.data.imgList2
+            if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
+              _this.pd.dongHuoCaoZuoRenPic = []
+              for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
+                _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
+              }
+            }
           } else if ("exception" == data.result) {
             uni.showToast({
               title: '错误',