fix

src/main/resources/static/goer/js/goer-ui.js

@@ -47,7 +47,7 @@ var table = {
                     paginationLoop: false,
                     pageSize: 10,
                     pageNumber: 1,
-                    pageList: [10, 25, 50],
+                    pageList: [10, 25, 50, '所有'],
                     toolbar: "toolbar",
                     loadingFontSize: 13,
                     striped: false,

src/main/resources/templates/index.html

@@ -57,8 +57,8 @@
                 	</a>
                     <ul class="nav nav-second-level collapse">
 						<li th:each="cmenu : ${menu.children}">
-							<a th:if="${#lists.isEmpty(cmenu.children)}" th:class="${#strings.isEmpty(cmenu.target)} ? |menuItem| : ${cmenu.target}" th:utext="${cmenu.menuName}" th:href="@{${cmenu.url}}" th:data-refresh="${cmenu.isRefresh == '0'}">二级菜单</a>
-							<a th:if="${not #lists.isEmpty(cmenu.children)}" href="#">[[${cmenu.menuName}]]<span class="fa arrow"></span></a>
+							<a th:if="${#lists.isEmpty(cmenu.children)}" th:class="${#strings.isEmpty(cmenu.target)} ? |menuItem| : ${cmenu.target}" th:href="@{${cmenu.url}}" th:data-refresh="${cmenu.isRefresh == '0'}"><i class="fa fa-bar-chart-o" th:class="${cmenu.icon}"></i> <span class="nav-label" th:text="${cmenu.menuName}">二级菜单</span></a>
+							<a th:if="${not #lists.isEmpty(cmenu.children)}" href="#"><i class="fa fa-bar-chart-o" th:class="${cmenu.icon}"></i>[[${cmenu.menuName}]]<span class="fa arrow"></span></a>
 							<ul th:if="${not #lists.isEmpty(cmenu.children)}" class="nav nav-third-level">
 								<li th:each="emenu : ${cmenu.children}">
 								    <a th:if="${#lists.isEmpty(emenu.children)}" th:class="${#strings.isEmpty(emenu.target)} ? |menuItem| : ${emenu.target}" th:text="${emenu.menuName}" th:href="@{${emenu.url}}" th:data-refresh="${emenu.isRefresh == '0'}">三级菜单</a>

src/main/resources/templates/main.html

@@ -4,7 +4,7 @@
     <th:block th:include="include :: header('首页')" />
     <style>
         .model-container {
-            min-width: 400px;
+            width: 400px;
             min-height: 250px;
             margin-bottom: 25px;
             background-color: #fff;
@@ -16,8 +16,8 @@
 
         }
         .model-container-title-gray {
-            height: 41px;
-            background-color: #f0f3f4;
+            height: 40px;
+            background-color: #d9edf7;
             color: #333;
             font-weight: 700;
             border-radius: 2px 2px 0 0;
@@ -26,7 +26,16 @@
             display: block;
             clear: both;
         }
-        .ibox-content:hover {
+        .model-container-add {
+            min-height: 210px;;
+        }
+        .model-container-content {
+            min-height: 170px;;
+        }
+        .model-container-content span {
+            margin:0 auto;
+        }
+        .model-container-add:hover {
             color: #fff;
             background-color: #1ab394;
         }
@@ -40,78 +49,24 @@
                 <li>
                     <div class="model-container">
                         <div class="model-container-title-gray">新建模型</div>
-                        <div class="ibox-content">
+                        <div class="model-container-add text-center">
                             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                         </div>
-                        <div class="row  m-t-sm">
-                            <div class="col-sm-4">
-                                <div class="font-bold">项目</div>
-                                12
-                            </div>
-                            <div class="col-sm-4">
-                                <div class="font-bold">周期</div>
-                                4个月
-                            </div>
-                            <div class="col-sm-4 text-right">
-                                <div class="font-bold">预算</div>
-                                &yen;200,913 <i class="fa fa-level-up text-navy"></i>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-                <li>
-                    <div class="model-container">
-                        <div class="card-header">扁担定制</div>
-                        <div class="card-body">
-                            <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
-                        </div>
-                    </div>
-                </li>
-                <li>
-                    <div class="model-container">
-                        <div class="card-header">扁担定制</div>
-                        <div class="card-body">
-                            <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
-                        </div>
-                    </div>
-                </li>
-                <li>
-                    <div class="model-container">
-                        <div class="card-header">扁担定制</div>
-                        <div class="card-body">
-                            <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
-                        </div>
-                    </div>
-                </li>
-                <li>
-                    <div class="model-container">
-                        <div class="card-header">扁担定制</div>
-                        <div class="card-body">
-                            <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
-                        </div>
                     </div>
                 </li>
                 <li>
                     <div class="model-container">
-                        <div class="card-header">扁担定制</div>
-                        <div class="card-body">
-                            <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
+                        <div class="model-container-title-gray">扁担定制</div>
+                        <div class="model-container-content">
+                            平面设计（graphic design），也称为视觉传达设计，是以“视觉”作为沟通和表现的方式，透过多种方式来创造和结合符号、图片和文字，借此作出用来传达想法或讯息的视觉表现。
                         </div>
-                    </div>
-                </li>
-                <li>
-                    <div class="model-container">
-                        <div class="card-header">扁担定制</div>
-                        <div class="card-body">
-                            <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
-                        </div>
-                    </div>
-                </li>
-                <li>
-                    <div class="model-container">
-                        <div class="card-header">扁担定制</div>
-                        <div class="card-body">
-                            <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
+                        <div class="row  m-t-sm model-container-footer">
+                            <div class="col-sm-6 text-center">
+                                <span class="fa fa-edit" aria-hidden="true"></span>
+                            </div>
+                            <div class="col-sm-6 text-center">
+                                <span class="fa fa-remove" aria-hidden="true"></span>
+                            </div>
                         </div>
                     </div>
                 </li>