From 620d850d08121f3ca8a2e3e921e94eeff4d85595 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 十一月 2019 16:35:32 +0800
Subject: [PATCH] 优化设备未包含小区ID查询bug

---
 WebService/src/main/resources/components/ownerPackage/edit-owner/editOwner.html |   48 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/WebService/src/main/resources/components/ownerPackage/edit-owner/editOwner.html b/WebService/src/main/resources/components/ownerPackage/edit-owner/editOwner.html
index a872c89..a93c7d7 100644
--- a/WebService/src/main/resources/components/ownerPackage/edit-owner/editOwner.html
+++ b/WebService/src/main/resources/components/ownerPackage/edit-owner/editOwner.html
@@ -1,20 +1,31 @@
-<div id = "editOwnerModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editOwnerModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">淇敼灏忓尯妤�</h3>
+                <h3 class="m-t-none m-b ">淇敼淇℃伅</h3>
                 <div class="ibox-content">
-                    <div>
-                        <div>
+                    <div class="row">
+                        <div class="col-sm-6" style="text-align:center">
+                            <video id="ownerPhotoForEdit" style="width: 100%;height: 100%;"></video>
+                            <canvas id="canvasForEdit" style="display:none;"></canvas>
+                            <div style="margin-top:20px">
+                                <button class="btn btn-primary" type="button" v-on:click="_takePhotoForEdit()"><span
+                                        class="glyphicon glyphicon-camera"></span> 鎷嶇収
+                                </button>
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">鍚嶇О</label>
-                                <div class="col-sm-10"><input v-model="editOwnerInfo.name" type="text" placeholder="蹇呭~锛岃濉啓鍚嶇О" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editOwnerInfo.name" type="text"
+                                                              placeholder="蹇呭~锛岃濉啓鍚嶇О" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">鎬у埆</label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="editOwnerInfo.sex">
-                                        <option selected  disabled value="">蹇呭~锛岃閫夋嫨鎬у埆</option>
+                                        <option selected disabled value="">蹇呭~锛岃閫夋嫨鎬у埆</option>
                                         <option value="0">鐢�</option>
                                         <option value="1">濂�</option>
                                     </select>
@@ -22,21 +33,34 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">骞撮緞</label>
-                                <div class="col-sm-10"><input v-model="editOwnerInfo.age" type="number" placeholder="蹇呭~锛岃濉啓骞撮緞" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editOwnerInfo.age" type="number"
+                                                              placeholder="蹇呭~锛岃濉啓骞撮緞" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">鎵嬫満</label>
-                                <div class="col-sm-10"><input v-model="editOwnerInfo.link" type="number" placeholder="蹇呭~锛岃濉啓鑱旂郴鏂瑰紡" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editOwnerInfo.link" type="number"
+                                                              placeholder="蹇呭~锛岃濉啓鑱旂郴鏂瑰紡" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">澶囨敞</label>
-                                <div class="col-sm-10"><input v-model="editOwnerInfo.remark" type="tel" placeholder="鍙~锛岃濉啓澶囨敞" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editOwnerInfo.remark" type="tel"
+                                                              placeholder="鍙~锛岃濉啓澶囨敞" class="form-control"></div>
                             </div>
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editOwnerMethod()" ><i class="fa fa-check"></i>&nbsp;淇濆瓨</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">鍙栨秷</button>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">鐓х墖</label>
+                                <div class="col-sm-10"><img width="100%" height="100%"
+                                                            v-bind:src="editOwnerInfo.ownerPhoto" alt="涓氫富鐓х墖"></div>
                             </div>
                         </div>
+
+                    </div>
+                    <div class="ibox-content">
+                        <button class="btn btn-primary float-right" type="button" v-on:click="editOwnerMethod()"><i
+                                class="fa fa-check"></i>&nbsp;淇濆瓨
+                        </button>
+                        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                data-dismiss="modal">鍙栨秷
+                        </button>
                     </div>
                 </div>
             </div>

--
Gitblit v1.8.0