From bdfb519e59d7119dcf5835a4b6ebd6c4d2006470 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 16 十二月 2019 18:33:13 +0800
Subject: [PATCH] 合并代码

---
 WebService/src/main/resources/components/basePrivilegePackage/edit-basePrivilege/editBasePrivilege.html |   62 +++++++++++++++++++------------
 1 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/WebService/src/main/resources/components/basePrivilegePackage/edit-basePrivilege/editBasePrivilege.html b/WebService/src/main/resources/components/basePrivilegePackage/edit-basePrivilege/editBasePrivilege.html
index 0b75eee..5768954 100644
--- a/WebService/src/main/resources/components/basePrivilegePackage/edit-basePrivilege/editBasePrivilege.html
+++ b/WebService/src/main/resources/components/basePrivilegePackage/edit-basePrivilege/editBasePrivilege.html
@@ -1,4 +1,5 @@
-<div id = "editBasePrivilegeModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editBasePrivilegeModel" 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">
@@ -7,31 +8,44 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">鏉冮檺鍚嶇О</label>
-         <div class="col-sm-10">
-           <input v-model="editBasePrivilegeInfo.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="editBasePrivilegeInfo.domain">
-         <option selected  disabled value="">蹇呭~锛岃閫夋嫨鍟嗘埛绫诲瀷</option>
-         <option  value="800900000001">杩愯惀鍥㈤槦</option>
-<option  value="800900000002">浠g悊鍟�</option>
-<option  value="800900000003">鐗╀笟</option>
-<option  value="800900000000">寮�鍙戝洟闃�</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">鎻忚堪</label>
-         <div class="col-sm-10">
-<textarea  placeholder="閫夊~锛岃濉啓鎻忚堪" class="form-control" v-model="editBasePrivilegeInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">鏉冮檺鍚嶇О</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editBasePrivilegeInfo.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">
+                                    <input v-model="editBasePrivilegeInfo.resource" 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="editBasePrivilegeInfo.domain">
+                                        <option selected disabled value="">蹇呭~锛岃閫夋嫨鍟嗘埛绫诲瀷</option>
+                                        <option value="800900000001">杩愯惀鍥㈤槦</option>
+                                        <option value="800900000002">浠g悊鍟�</option>
+                                        <option value="800900000003">鐗╀笟</option>
+                                        <option value="800900000000">寮�鍙戝洟闃�</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">鎻忚堪</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="閫夊~锛岃濉啓鎻忚堪" class="form-control"
+                                              v-model="editBasePrivilegeInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editBasePrivilege()" ><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>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editBasePrivilege()"><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