From e2cf605510d82008f71363111963e1704be68428 Mon Sep 17 00:00:00 2001
From: "suhang_max@163.com" <suhang_max@163.com>
Date: Fri, 28 Oct 2022 17:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=90=86?=
 =?UTF-8?q?=E6=83=B3=E6=A6=82=E7=AE=97=E7=AE=A1=E7=90=86=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_list.ftl          | 157 ++++++++++--------
 1 file changed, 89 insertions(+), 68 deletions(-)

diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 0fc0977..5d53f28 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -89,7 +89,7 @@
                         .search-table {
                             position: relative;
                             width: 100%;
-                            padding: 12px 0 0;
+                            padding: 6px 0 0;
                             border: 1px solid #d8d8d8;
                             border-radius: 4px;
                         }
@@ -99,25 +99,45 @@
                         .search-table .st-row {
                             position: relative;
                             width: 100%;
-                            justify-content: space-between;
+                            justify-content: flex-start;
                             /*align-items: center;*/
-                            padding: 0 12px 12px;
-                            margin-bottom: 12px;
+                            padding: 0 6px 6px;
+                            margin-bottom: 6px;
                             border-bottom: 1px solid #d8d8d8;
                         }
                         .search-table .tools-row {
                             position: relative;
                             width: 100%;
                             justify-content: flex-end;
-                            padding-right: 12px;
-                            margin-bottom: 12px;
+                            padding-right: 6px;
+                            margin-bottom: 6px;
                         }
                         .tools-row button {
                             margin-left: 12px;
                         }
+                        /* 默认5等分，一行5个 */
                         .st-row .st-col {
                             position: relative;
+                            flex: 0 0 18%;
+                            margin-right: 2%;
+                        }
+                        /* 4等分，一行4个 */
+                        .st-col.st-col-4 {
                             flex: 0 0 22%;
+                            margin-right: 3%;
+                        }
+                        /* 3等分，一行3个 */
+                        .st-col.st-col-3 {
+                            flex: 0 0 31%;
+                            margin-right: 2.3%;
+                        }
+                        /* 2等分，一行2个 */
+                        .st-col.st-col-2 {
+                            flex: 0 0 48%;
+                            margin-right: 2%;
+                        }
+                        .st-col.hidden {
+                            display: none;
                         }
                         .st-col .st-col-title {
                             font-size: 14px;
@@ -126,6 +146,12 @@
                             white-space: nowrap;
                             font-weight: bold;
                         }
+                        .st-col .st-col-field {
+                            align-items: center;
+                        }
+                        .st-col .mid-connect {
+                            margin: 0 4px;
+                        }
                         .expand-section {
                             display: block;
                         }
@@ -165,9 +191,6 @@
                                     <input type="text" id="creatorName" class="am-form-field am-input-sm" value="${creatorName!}"/>
                                 </div>
                             </div>
-                        </div>
-                        <!-- 第二行 -->
-                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">部门名称</div>
                                 <div class="st-col-field">
@@ -181,6 +204,9 @@
                                     </select>
                                 </div>
                             </div>
+                        </div>
+                        <!-- 第二行 -->
+                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">项目类型</div>
                                 <div class="st-col-field">
@@ -214,9 +240,6 @@
                                     </select>
                                 </div>
                             </div>
-                        </div>
-                        <!-- 第三行 -->
-                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">客户名称</div>
                                 <div class="st-col-field">
@@ -229,6 +252,9 @@
                                     <input type="text" id="terminalCustomer" class="am-form-field am-input-sm" value="${terminalCustomer!}"/>
                                 </div>
                             </div>
+                        </div>
+                        <!-- 第三行 -->
+                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">项目负责人</div>
                                 <div class="st-col-field">
@@ -247,53 +273,53 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                <div class="st-col-title">是否二次合作</div>
+                                <div class="st-col-field">
+                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
+                                        <option value="-1">全部</option>
+                                        <option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
+                                        <option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                <div class="st-col-title">直签</div>
+                                <div class="st-col-field">
+                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
+                                        <option value="-1">全部</option>
+                                        <option value="1" <#if signType?? && signType='1'>selected</#if>>是</option>
+                                        <option value="2" <#if signType?? && signType='2'>selected</#if>>否</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                <div class="st-col-title">行业场景</div>
+                                <div class="st-col-field">
+                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="industryScene" name="industryScene">
+                                        <option value="-1">全部</option>
+                                        <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
+                                        <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
+                                        <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
+                                        <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
+                                        <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
+                                        <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
+                                        <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
+                                        <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
+                                        <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
+                                        <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
+                                        <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
+                                        <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
+                                        <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
+                                        <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
+                                    </select>
+                                </div>
+                            </div>
                         </div>
                         <!-- 扩展区域 -->
                         <div class="expand-section <#if extend='1'> fold</#if>">
                             <!-- 第四行 -->
                             <div class="flex-row st-row">
-                                <div class="st-col">
-                                    <div class="st-col-title">是否二次合作</div>
-                                    <div class="st-col-field">
-                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
-                                            <option value="-1">全部</option>
-                                            <option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
-                                            <option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="st-col">
-                                    <div class="st-col-title">直签</div>
-                                    <div class="st-col-field">
-                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
-                                            <option value="-1">全部</option>
-                                            <option value="1" <#if signType?? && signType='1'>selected</#if>>是</option>
-                                            <option value="2" <#if signType?? && signType='2'>selected</#if>>否</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="st-col">
-                                    <div class="st-col-title">行业场景</div>
-                                    <div class="st-col-field">
-                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="industryScene" name="industryScene">
-                                            <option value="-1">全部</option>
-                                            <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
-                                            <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
-                                            <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
-                                            <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
-                                            <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
-                                            <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
-                                            <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
-                                            <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
-                                            <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
-                                            <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
-                                            <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
-                                            <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
-                                            <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
-                                            <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
-                                        </select>
-                                    </div>
-                                </div>
                                 <div class="st-col">
                                     <div class="st-col-title">项目解决方案</div>
                                     <div class="st-col-field">
@@ -305,18 +331,15 @@
                                         </select>
                                     </div>
                                 </div>
-                            </div>
-                            <!-- 第五行 -->
-                            <div class="flex-row st-row">
-                                <div class="st-col">
+                                <div class="st-col st-col-4">
                                     <div class="st-col-title">最后更新时间</div>
-                                    <div class="st-col-field">
+                                    <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="startUpdateDate"
                                                    value="${startUpdateDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
                                         </div>
-                                        <div>至</div>
+                                        <div class="mid-connect">至</div>
                                         <div class="am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="endUpdateDate"
@@ -324,15 +347,15 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="st-col">
+                                <div class="st-col st-col-4">
                                     <div class="st-col-title">项目周期</div>
-                                    <div class="st-col-field">
+                                    <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="startDate"
                                                    value="${startDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
                                         </div>
-                                        <div>至</div>
+                                        <div class="mid-connect">至</div>
                                         <div class="am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="endDate"
@@ -340,15 +363,15 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="st-col">
+                                <div class="st-col st-col-4">
                                     <div class="st-col-title">预计合同签订时间</div>
-                                    <div class="st-col-field">
+                                    <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="contractStartTime"
                                                    value="${contractStartTime!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
                                         </div>
-                                        <div>至</div>
+                                        <div class="mid-connect">至</div>
                                         <div class="am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="contractEndTime"
@@ -356,8 +379,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="st-col">
-                                </div>
                             </div>
                         </div>
                         <div class="flex-row tools-row">