From cc2f49cd2f4e8f5ddf7e2bc08978cbbd86af241a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 5 May 2020 09:10:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A1=E6=A3=80=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=9B=BE=E7=89=87=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/viewImage/viewImage.html           |  3 +++
 .../components/common/viewImage/viewImage.js  | 26 +++++++++++++++++++
 .../inspectionTaskDetail.html                 | 14 ++++++++--
 .../inspectionTaskDetail.js                   |  7 ++++-
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 public/components/common/viewImage/viewImage.html
 create mode 100644 public/components/common/viewImage/viewImage.js

diff --git a/public/components/common/viewImage/viewImage.html b/public/components/common/viewImage/viewImage.html
new file mode 100644
index 000000000..a4f8077ce
--- /dev/null
+++ b/public/components/common/viewImage/viewImage.html
@@ -0,0 +1,3 @@
+<div v-if="viewImageInfo.showImage" style="position:fixed;z-index:3000;left:50%;top:50%;transform:translate(-50%,-50%);">
+    <img v-on:click="_closeImage()" v-bind:src="viewImageInfo.url" style="width:1000px;height:500px;" />
+</div>
\ No newline at end of file
diff --git a/public/components/common/viewImage/viewImage.js b/public/components/common/viewImage/viewImage.js
new file mode 100644
index 000000000..b51ff59e8
--- /dev/null
+++ b/public/components/common/viewImage/viewImage.js
@@ -0,0 +1,26 @@
+
+(function (vc) {
+    vc.extends({
+        data: {
+            viewImageInfo: {
+                url: '',
+                showImage:false
+            }
+        },
+        _initMethod: function () {
+        },
+        _initEvent: function () {
+            vc.on('viewImage', 'showImage', function (_param) {
+                $that.viewImageInfo.url = _param.url;
+                $that.viewImageInfo.showImage = true;
+            });
+        },
+        methods: {
+            
+            _closeImage:function(){
+                $that.viewImageInfo.showImage = false;
+             }
+        }
+
+    });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/property/inspectionTaskDetail/inspectionTaskDetail.html b/public/components/property/inspectionTaskDetail/inspectionTaskDetail.html
index 680d1ac53..433196866 100644
--- a/public/components/property/inspectionTaskDetail/inspectionTaskDetail.html
+++ b/public/components/property/inspectionTaskDetail/inspectionTaskDetail.html
@@ -21,7 +21,9 @@
                                         <th class="text-center">巡检点ID</th>
                                         <th class="text-center">巡检点名称</th>
                                         <th class="text-center">巡检状态</th>
-                                        <th class="text-center">巡检照片</th>
+                                        <th class="text-center">巡检情况</th>
+                                        <th class="text-center">巡检说明</th>
+                                        <th class="text-right">巡检照片</th>
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -30,7 +32,13 @@
                                         <td class="text-center">{{taskDetail.inspectionId}}</td>
                                         <td class="text-center">{{taskDetail.inspectionName}}</td>
                                         <td class="text-center">{{taskDetail.stateName}}</td>
-                                        <td class="text-center">{{taskDetail.photo}}</td>
+                                        <td class="text-center">{{taskDetail.patrolTypeName}}</td>
+                                        <td class="text-center">{{taskDetail.description}}</td>
+                                        <td class="text-right ">
+                                            <span v-for="_photo in taskDetail.photos">
+                                                <img style="width: 60px; height: 60px;" v-bind:src="_photo.url"  v-on:click="openFile(_photo)"></img>
+                                            </span>
+                                        </td>
                                     </tr>
                                     </tbody>
                                 </table>
@@ -44,4 +52,6 @@
             </div>
         </div>
     </div>
+
+    <vc:create path="common/viewImage"></vc:create>
 </div>
diff --git a/public/components/property/inspectionTaskDetail/inspectionTaskDetail.js b/public/components/property/inspectionTaskDetail/inspectionTaskDetail.js
index 93974888f..5bc60c169 100644
--- a/public/components/property/inspectionTaskDetail/inspectionTaskDetail.js
+++ b/public/components/property/inspectionTaskDetail/inspectionTaskDetail.js
@@ -51,7 +51,12 @@
                     taskDetails: [],
                     taskId: '',
                 };
-            }
+            }, 
+            openFile:function(_photo){
+                vc.emit('viewImage','showImage',{
+                    url:_photo.url
+                });
+             }
         }
 
     });