Переглянути джерело

修复 前台展示窄屏问题

吴学文 6 роки тому
батько
коміт
4148cd485e

+ 29 - 21
WebService/src/main/resources/components/basePrivilegePackage/basePrivilege-manage/basePrivilegeManage.html

@@ -5,29 +5,35 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
+                        <div class="col-sm-4">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入权限名称" v-model="basePrivilegeManageInfo.conditions.name" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<div class="form-group">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入权限编码" v-model="basePrivilegeManageInfo.conditions.pId" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" >
-<select class="custom-select" v-model="basePrivilegeManageInfo.conditions.domain">
-         <option selected  value="">请选择商户类型</option>
-         <option  value="800900000001">运营团队</option>
-<option  value="800900000002">代理商</option>
-<option  value="800900000003">物业</option>
-<option  value="800900000000">开发团队</option>
-  </select>                        </div><div class="col-sm-1">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <select class="custom-select" v-model="basePrivilegeManageInfo.conditions.domain">
+                                <option selected value="">请选择商户类型</option>
+                                <option value="800900000001">运营团队</option>
+                                <option value="800900000002">代理商</option>
+                                <option value="800900000003">物业</option>
+                                <option value="800900000000">开发团队</option>
+                            </select></div>
+                        <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryBasePrivilegeMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -50,13 +56,13 @@
 
                     <table class="footable table table-stripped toggle-arrow-tiny"
                            data-page-size="15"
-                           style="table-layout: fixed;word-break:break-all;"
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">权限ID</th>
+                            <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>
 
 
@@ -64,15 +70,18 @@
                         </thead>
                         <tbody>
                         <tr v-for="basePrivilege in basePrivilegeManageInfo.basePrivileges">
-                                                        <td class="text-center">{{basePrivilege.pId}}</td>
+                            <td class="text-center">{{basePrivilege.pId}}</td>
                             <td class="text-center">{{basePrivilege.name}}</td>
                             <td class="text-center">{{basePrivilege.domain}}</td>
-                            <td class="text-center"><div class="btn-group">
+                            <td class="text-center">{{basePrivilege.createTime}}</td>
+                            <td class="text-center">
+                                <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditBasePrivilegeModel(basePrivilege)">修改</button>
                                 </div>
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openDeleteBasePrivilegeModel(basePrivilege)">删除</button>
-                                </div></td>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -91,7 +100,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addBasePrivilege"
                callBackListener=""

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/basePrivilege/BasePrivilegeDto.java

@@ -12,6 +12,8 @@ public class BasePrivilegeDto extends PageDto implements Serializable {
     private String description;
     private String statusCd;
 
+    private String createTime;
+
     public String getPId() {
         return pId;
     }
@@ -59,4 +61,12 @@ public class BasePrivilegeDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

+ 11 - 0
java110-bean/src/main/java/com/java110/vo/api/basePrivilege/ApiBasePrivilegeDataVo.java

@@ -10,6 +10,9 @@ public class ApiBasePrivilegeDataVo implements Serializable {
     private String domain;
     private String description;
 
+    private String createTime;
+
+
     public String getPId() {
         return pId;
     }
@@ -49,4 +52,12 @@ public class ApiBasePrivilegeDataVo implements Serializable {
     public void setpId(String pId) {
         this.pId = pId;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

+ 0 - 1
java110-code-generator/src/main/resources/web/manage/manage.html

@@ -31,7 +31,6 @@
 
                     <table class="footable table table-stripped toggle-arrow-tiny"
                            data-page-size="15"
-                           style="table-layout: fixed;word-break:break-all;"
                     >
                         <thead>
                         <tr>