Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -864,7 +864,7 @@
                  SELECT COUNT(*) AS counts
                  FROM sub_info
                  WHERE rt_date  <  NOW()
-                   AND is_rg = 0
+                   AND `is_rg` = 0
                    AND `status` = 9
              ) AS combined_counts;
     </select>

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -439,4 +439,14 @@ public interface SubInfoService {
 	List<WorkBenchVO> queryExceedMonthlySize(String lastMonth);
 
 	Map<String, Object> queryExceedMonthly(LoginUserVO loginUser, PreWarnDataQueryVO queryVO);
+
+	Long queryExceed();
+
+	Long queryWarning();
+
+	Long queryNotExceed();
+
+	Long queryExceedWithin();
+
+	Long queryExceedOutside();
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -5348,6 +5348,36 @@ public class SubInfoServiceImpl implements SubInfoService {
         }
     }
 
+    @Override
+    @TargetDataSource("primary")
+    public Long queryExceed() {
+        return subInfoMapper.queryExceed();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryWarning() {
+        return subInfoMapper.queryWarning();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryNotExceed() {
+        return subInfoMapper.queryNotExceed();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryExceedWithin() {
+        return subInfoMapper.queryExceedWithin();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryExceedOutside() {
+        return subInfoMapper.queryExceedOutside();
+    }
+
     private Map<String, Object> getStringObjectMap(List<WorkBenchVO> list) {
         Map<String, Object> resultMap = new HashMap<>();
         if (CollectionUtil.isNotEmpty(list)){

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/WorkBenchServiceImpl.java

@@ -9,9 +9,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.date.DateUtil;
 import com.rtrh.projects.modules.projects.enums.SubInfoStatusEnum;
 import com.rtrh.projects.modules.projects.mapper.SubInfoMapper;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
+import com.rtrh.projects.modules.projects.service.SubInfoService;
 import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +33,8 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 	@Autowired
 	private SubInfoMapper subInfoMapper;
 
+	@Autowired
+	private SubInfoService subInfoService;
 
 	@Override
 	public Map<String, Object> getDaiBanData(String kind, String loginName) {
@@ -105,16 +109,28 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 	@Override
 	public Map<String, Object> statisticData() {
 		Map<String, Object> map = new HashMap<>();
-		// 预警 提前3天内
-		Long warningNum = subInfoMapper.queryWarning();
+		// // 	 进度红灯-前期手续红灯
+		// int preNum = subInfoService.preProcedureExceedSize().size();
+		// String lastMonth = DateUtil.format(DateUtil.offsetMonth(DateUtil.date(), -1), "yyyyMM");
+		// int dayOfMonth = DateUtil.dayOfMonth(DateUtil.date());
+		// // 	 进度红灯-月报超期红灯
+		// int monthlyNum = dayOfMonth <= 5 ? 0 : subInfoService.queryExceedMonthlySize(lastMonth).size();
 		// 超期 进度红灯
-		Long exceedNum = subInfoMapper.queryExceed();
+		Long exceedNum = subInfoService.queryExceed();
+		// Long exceedNum = subInfoMapper.queryExceed();
+		// exceedNum = exceedNum + preNum + monthlyNum;
+		// 预警 提前3天内
+		Long warningNum = subInfoService.queryWarning();
+		// Long warningNum = subInfoMapper.queryWarning();
 		// 未超期绿灯
-		Long notExceedNum = subInfoMapper.queryNotExceed();
+		Long notExceedNum = subInfoService.queryNotExceed();
+		// Long notExceedNum = subInfoMapper.queryNotExceed();
 		// 黄灯超期3天内
-		Long withinNum = subInfoMapper.queryExceedWithin();
+		Long withinNum = subInfoService.queryExceedWithin();
+		// Long withinNum = subInfoMapper.queryExceedWithin();
 		// 红灯超期超过3天
-		Long outsideNum = subInfoMapper.queryExceedOutside();
+		Long outsideNum = subInfoService.queryExceedOutside();
+		// Long outsideNum = subInfoMapper.queryExceedOutside();
 		map.put("warningNum", warningNum);
 		map.put("exceedNum", exceedNum);
 		map.put("notExceedNum", notExceedNum);

projects/src/main/webapp/asset/css/indexScreen.css

@@ -90,6 +90,29 @@ body {
   height: calc(50 / 1080 * calc(100vh));
   bottom: 0;
 }
+.border-contaier .img4 {
+  width: calc(580 / 1920 * calc(100vw));
+  height: calc(208 / 1080 * calc(100vh));
+  bottom: calc(22 / 1080 * calc(100vh));
+  left: calc(30 / 1920 * calc(100vw));
+}
+.border-contaier .img5 {
+  width: calc(580 / 1920 * calc(100vw));
+  height: calc(208 / 1080 * calc(100vh));
+  bottom: calc(22 / 1080 * calc(100vh));
+  right: calc(30 / 1920 * calc(100vw));
+}
+.border-contaier .bgc-center {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: calc(1650 / 1920 * calc(100vw));
+  height: calc(980 / 1080 * calc(100vh));
+  background-color: #0055de;
+  transform: translate(-50%, -50%);
+  border-radius: 8px;
+  filter: blur(200px);
+}
 .main {
   height: calc(763 / 1080 * calc(100vh));
   display: flex;
@@ -758,6 +781,8 @@ body {
   width: calc(170 / 1920 * calc(100vw));
   height: calc(135 / 1080 * calc(100vh));
   text-align: center;
+  position: relative;
+  z-index: 2;
 }
 .flooter .flooter-bottom .flooter-bottom-item .title {
   color: white;

projects/src/main/webapp/vmodules/annualPlan/list.jsp

@@ -21,13 +21,13 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title" style="ma">
-            <span class="txt">年度计划</span>
+            <div class="txt">年度计划<div class="top-breadcrumb"></div></div>
             <%--            <button class="btn btn_add" @click="add"><i class="layui-icon layui-icon-add-circle"></i> 问题填报</button>--%>
 
-            <div class="layui-collapse">
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -262,6 +262,8 @@
                 <%--}--%>
                 this.getData();
                 window.showImage = this.showImage;
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
             },
             getData : function(){
                 //获取年   月
@@ -627,6 +629,12 @@
             closeWin : function(){
                 window.history.back(-1);
 
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
 
         }

projects/src/main/webapp/vmodules/auditLog/index.jsp

@@ -15,12 +15,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-	<div class="layui-layout layui-layout-admin">
+	<div class="layui-layout layui-layout-admin pd0">
 		<!-- 内容区域 -->
 		<div class="right_title">
-			<span class="txt">审计日志查询</span>
+			<div class="txt">审计日志查询<div class="top-breadcrumb"></div></div>
 			<%--            <button class="btn btn_add" @click="add"><i class="layui-icon layui-icon-add-circle"></i> 新增</button>--%>
-			<div class="layui-collapse">
+			<div class="layui-collapse search_form">
 				<div class="layui-colla-item">
 					<%--                    <h2 class="layui-colla-title">筛选</h2>--%>
 					<div class="layui-colla-content layui-show">
@@ -141,6 +141,8 @@
 					max: defaultEndDate,
 					value: defaultEndDate
 				});
+				window.addEventListener('message', this.receiveMessage, false);
+				window.parent.postMessage('init loaded')
 			},
 			getData : function(){
 				var self = this;
@@ -215,6 +217,12 @@
 				this.pageNo = 1;
 				this.getData();
 			},
+			receiveMessage (e) {
+				console.log('cb receiveMessage: ', e.data)
+				if (e.data.topBreadcrumb) {
+					$(".top-breadcrumb").html(e.data.topBreadcrumb)
+				}
+			}
 		}
 	});
 </script>

projects/src/main/webapp/vmodules/dicsysTable/list.jsp

@@ -7,6 +7,8 @@
     <meta charset="UTF-8">
     <title>系统参数</title>
     <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-css-include.jsp"></jsp:include>
     <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
           media="all"/>
@@ -14,14 +16,14 @@
           media="all"/>
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
           media="all"/>
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all"/>
+    <%--    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all"/>--%>
 </head>
 
 <body>
-<div class="layui-layout layui-layout-admin">
+<div class="layui-layout layui-layout-admin pd0">
     <div class="right_title">
-        <span class="txt">字典管理</span>
-        <div class="layui-collapse">
+        <span class="txt">字典管理<div class="top-breadcrumb"></div></span>
+        <div class="layui-collapse search_form">
             <div class="layui-colla-item">
                 <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                 <div class="layui-colla-content layui-show">
@@ -58,13 +60,21 @@
                                     <div class="layui-input-block">
                                         <input type="text" name="title" autocomplete="off" class="layui-input">
                                     </div>
-                                    <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 10px"
-                                            lay-submit lay-filter="search">查询
-                                    </button>
-
                                 </div>
                             </div>
 
+                            <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label"></label>
+                                    <div class="layui-input-block">
+                                        <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">查询
+                                        </button>
+                                        <%--<span class="morePan" @click="showMore"><a v-if="!showMoreFlag">更多  <ion-icon
+                                                name="chevron-forward-outline"></ion-icon></a><a
+                                                v-if="showMoreFlag">收起 V</a></span>--%>
+                                    </div>
+                                </div>
+                            </div>
 
                         </div>
                     </form>
@@ -157,6 +167,13 @@
                     methods.search();
                 });
                 methods.getData();
+                window.addEventListener('message',methods.receiveMessage,false);
+                window.parent.postMessage('init loaded');
+            },
+            receiveMessage(e){
+                if(e.data.topBreadcrumb){
+                    $('.top-breadcrumb').html(e.data.topBreadcrumb);
+                }
             },
             add: function (obj) {
                 App.openLayer({

projects/src/main/webapp/vmodules/graphic/list.jsp

@@ -29,10 +29,10 @@
 <body>
 <div id="app"></div>
 <template id="template">
-	<div class="layui-layout layui-layout-admin">
+	<div class="layui-layout layui-layout-admin pd0">
 		<!-- 内容区域 -->
 			<div class="right_title">
-				<span class="txt">周调度图片</span>
+				<span class="txt">周调度图片<div class="top-breadcrumb"></div></span>
 				<div class="layui-collapse">
 					<div class="layui-colla-item">
 						<%--                    <h2 class="layui-colla-title">筛选</h2>--%>

projects/src/main/webapp/vmodules/junit/list.jsp

@@ -1,300 +1,348 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-  <!DOCTYPE html>
-  <html>
+<!DOCTYPE html>
+<html>
 
-  <head>
-    <meta charset="UTF-8">
-    <title>项目文档的单位设置</title>
-    <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
-    <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
-      <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
+<head>
+  <meta charset="UTF-8">
+  <title>项目文档的单位设置</title>
+  <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-css-include.jsp"></jsp:include>
+  <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
         media="all" />
-      <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}"
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}"
         media="all" />
-      <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
         media="all" />
-      <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />
-      <style type="text/css">
-        .layui-form-pane .layui-form-label {
-          width: 160px;
-        }
-        .layui-form-label,
-        .layui-input-block {
-          width: fit-content;
-        }
+  <%--      <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />--%>
+  <style type="text/css">
+    .layui-form-pane .layui-form-label {
+      width: 160px;
+    }
+    .layui-form-label,
+    .layui-input-block {
+      width: fit-content;
+    }
 
-        .layui-form-radio{
-        	margin:0px 10px 0 0;
-        }
-      </style>
-  </head>
+    .layui-form-radio{
+      margin:0px 10px 0 0;
+    }
+    .hiddenParam,
+    .hiddenParams {
+      display: none;
+    }
+  </style>
+</head>
 
-  <body>
-    <div class="layui-layout layui-layout-admin">
-      <div class="right_title">
-        <span class="txt">行业部门信息</span>
-        <div class="layui-collapse">
-          <div class="layui-colla-item">
-            <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
-            <div class="layui-colla-content layui-show">
-              <form class="layui-form" lay-filter="searchForm">
-                <div class="layui-row">
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label">部门名称</label>
-                      <div class="layui-input-block">
-                        <input type="text" name="unitName" autocomplete="off" class="layui-input">
-                      </div>
-                    </div>
+<body>
+<div class="layui-layout layui-layout-admin pd0">
+  <div class="right_title">
+    <span class="txt">行业部门信息<div class="top-breadcrumb"></div></span>
+    <div class="layui-collapse search_form">
+      <div class="layui-colla-item">
+        <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
+        <div class="layui-colla-content layui-show">
+          <form class="layui-form" lay-filter="searchForm">
+            <div class="layui-row">
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">部门名称</label>
+                  <div class="layui-input-block">
+                    <input type="text" name="unitName" autocomplete="off" class="layui-input">
                   </div>
+                </div>
+              </div>
 
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label">联系人</label>
-                      <div class="layui-input-block">
-                        <input type="text" name="userName" autocomplete="off" class="layui-input">
-                      </div>
-                    </div>
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">联系人</label>
+                  <div class="layui-input-block">
+                    <input type="text" name="userName" autocomplete="off" class="layui-input">
                   </div>
+                </div>
+              </div>
 
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label">联系电话</label>
-                      <div class="layui-input-block">
-                        <input type="text" name="tel" autocomplete="off" class="layui-input">
-                      </div>
-                    </div>
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">联系电话</label>
+                  <div class="layui-input-block">
+                    <input type="text" name="tel" autocomplete="off" class="layui-input">
                   </div>
+                </div>
+              </div>
 
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label">项目负责人</label>
-                      <div class="layui-input-block">
-                        <input type="radio" name="hasZrr" title="所有" value="" checked="checked">
-                        <input type="radio" name="hasZrr" title="未设置" value="false">
-                        <input type="radio" name="hasZrr" title="已设置" value="true">
-                      </div>
-                    </div>
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 hiddenParam">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">项目负责人</label>
+                  <div class="layui-input-block">
+                    <input type="radio" name="hasZrr" title="所有" value="" checked="checked">
+                    <input type="radio" name="hasZrr" title="未设置" value="false">
+                    <input type="radio" name="hasZrr" title="已设置" value="true">
                   </div>
+                </div>
+              </div>
 
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label">项目分管领导</label>
-                      <div class="layui-input-block">
-                        <input type="radio" name="hasLead" title="所有" value="" checked="checked">
-                        <input type="radio" name="hasLead" title="未设置" value="false">
-                        <input type="radio" name="hasLead" title="已设置" value="true">
-                      </div>
-                    </div>
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 hiddenParam">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">项目分管领导</label>
+                  <div class="layui-input-block">
+                    <input type="radio" name="hasLead" title="所有" value="" checked="checked">
+                    <input type="radio" name="hasLead" title="未设置" value="false">
+                    <input type="radio" name="hasLead" title="已设置" value="true">
                   </div>
+                </div>
+              </div>
 
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label" style="text-align:center !important;">项目管理平台<br>联系人</label>
-                      <div class="layui-input-block">
-                        <input type="radio" name="hasManage" title="所有" value="" checked="checked">
-                        <input type="radio" name="hasManage" title="未设置" value="false">
-                        <input type="radio" name="hasManage" title="已设置" value="true">
-                      </div>
-                    </div>
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 hiddenParam">
+                <div class="layui-form-item">
+                  <label class="layui-form-label" style="text-align:center !important;">项目管理平台<br>联系人</label>
+                  <div class="layui-input-block">
+                    <input type="radio" name="hasManage" title="所有" value="" checked="checked">
+                    <input type="radio" name="hasManage" title="未设置" value="false">
+                    <input type="radio" name="hasManage" title="已设置" value="true">
                   </div>
+                </div>
+              </div>
 
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                    <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">查询</button>
-                    <span class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-submit lay-filter="add"> 添加 </span>
+              <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
+                <div class="layui-form-item">
+                  <label class="layui-form-label"></label>
+                  <div class="layui-input-block">
+                    <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">查询
+                    </button>
+                    <span class="morePan" id="toggleMore">
+                              <a id="moreText">更多 <ion-icon name="chevron-forward-outline"></ion-icon></a>
+                              <a id="lessText">收起</a>
+                          </span>
                   </div>
                 </div>
-              </form>
+              </div>
+
+              <%--<div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                <span class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-submit lay-filter="add"> 添加 </span>
+              </div>--%>
             </div>
-          </div>
+          </form>
         </div>
       </div>
+    </div>
+  </div>
 
-<%--      <script type="text/html" id="toolbarDemo">--%>
-<%--            <div class="layui-btn-container">--%>
-<%--                <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add"> 添加 </button>--%>
-<%--            </div>--%>
-<%--        	</script>--%>
+  <script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+      <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add"> 添加 </button>
+    </div>
+  </script>
 
-      <div class="table_box" style="padding-top: 0;">
-        <div class="table_process">
-          <table id="junit" lay-filter="junit"></table>
-          <div class="pagination-box" id="pagination"></div>
-        </div>
-      </div>
-      <div style="height: 20px;"></div>
-      <script type="text/html" id="kind">
-				{{# if(d.kind == '1'){}}
-					责任单位
-				{{# } else if(d.kind == '2'){ }}
-					监管单位
-				{{# } }}
-			</script>
+  <div class="table_box" style="padding-top: 0;">
+    <div class="table_process">
+      <table id="junit" lay-filter="junit"></table>
+      <div class="pagination-box" id="pagination"></div>
+    </div>
+  </div>
+  <div style="height: 20px;"></div>
+  <script type="text/html" id="kind">
+    {{# if(d.kind == '1'){}}
+    责任单位
+    {{# } else if(d.kind == '2'){ }}
+    监管单位
+    {{# } }}
+  </script>
 
-      <script type="text/html" id="currentTableBar">
-				<div class="toolBar">
-            		<span lay-event="edit">编辑</span>
-					<span lay-event="del">删除</span>
-				</div>
-       		</script>
+  <script type="text/html" id="currentTableBar">
+    <div class="toolBar">
+      <span lay-event="edit">编辑</span>
+      <span lay-event="del">删除</span>
+    </div>
+  </script>
 
 
-    </div>
+</div>
 
-    <jsp:include page="../common/common-js-include.jsp"></jsp:include>
-    <script type="text/javascript">
-      App.namespace("App.projects.junit");
-      (function ($, mod) {
-        mod = mod || {}; //对象声明
-        // ---------------变量声明--------------
-        var _table = layui.table,
-          _form = layui.form,
-          _toolbar = layui.toolbar,
-          pageNo = 1,
-          pageSize = 10,
-          _tableName = "junit";
+<jsp:include page="../common/common-js-include.jsp"></jsp:include>
+<script type="text/javascript">
+  App.namespace("App.projects.junit");
+  (function ($, mod) {
+    mod = mod || {}; //对象声明
+    // ---------------变量声明--------------
+    var _table = layui.table,
+            _form = layui.form,
+            _toolbar = layui.toolbar,
+            pageNo = 1,
+            pageSize = 10,
+            _tableName = "junit";
 
-        mod.options = mod.options || {}; // 成员变量
+    mod.options = mod.options || {}; // 成员变量
 
-        // ---------------私有方法定义---------------
-        var methods = {
-          init: function () {
-            //单行监听
-            _table.on("tool(" + _tableName + ")", function (obj) {
-              methods[obj.event].call(this, obj);
-            });
+    // ---------------私有方法定义---------------
+    var methods = {
+      init: function () {
+        //单行监听
+        _table.on("tool(" + _tableName + ")", function (obj) {
+          methods[obj.event].call(this, obj);
+        });
 
-            // 工具栏监听
-            _table.on("toolbar(" + _tableName + ")", function (obj) {
-              methods[obj.event].call(this, obj);
-            });
-            _form.on("submit(search)", function () {
-              methods.search();
-            });
+        // 工具栏监听
+        _table.on("toolbar(" + _tableName + ")", function (obj) {
+          methods[obj.event].call(this, obj);
+        });
+        _form.on("submit(search)", function () {
+          methods.search();
+        });
 
-            _form.on("submit(add)", function () {
-              console.log("-------");
-              methods.add();
-            });
-            methods.getData();
-          },
-          add: function (obj) {
-            App.openLayer({
-              title: "新增单位",
-              content: App.getUrl("/junit/add"),
-              height: "600",
-              width: "800"
-            });
-          },
-          edit: function (obj) {
-            App.openLayer({
-              title: "编辑单位",
-              content: App.getUrl("/junit/add?id=" + obj.data.id),
-              height: "450",
-              width: "800"
-            });
-          },
-          del: function (obj) {
-            App.msg.confirm("确定删除该单位吗？", function () {
-              App.postJson("/api/junit/del", { id: obj.data.id }, function (res) {
-                if (res.success) methods.reload();
-              });
-            });
-          },
-          getData: function () {
-            var searchForm = _form.val("searchForm");
-            searchForm.pageNo = pageNo;
-            searchForm.pageSize = pageSize;
-            App.postJson("/api/junit/list", searchForm, function (res) {
-              methods.initTable(res.rows);
-              methods.loadPage(res.total);
-            });
-          },
-          initTable: function (data) {
-            layui.table.render({
-              elem: "#" + _tableName, // 指定原始表格元素选择器（推荐id选择器）
-              even: true,
-              // toolbar: '#toolbarDemo',
-              // defaultToolbar: [],
-              cols: [[ // 设置表头
-                { type: 'numbers', title: '序号', fixed: 'left', align: 'center',width:50 },
-                {
-                  field: 'title', title: '单位名称', fixed: 'left', width: 200, width: '12%', templet: function (row) {
-                    if (row.title != null) {
-                      return '<span title="' + row.title + '">' + row.title + '</span>';
-                    }
-                    return "";
-                  }
-                },
-                { field: 'nameZrr', title: '项目负责人', width: 138},
-                { field: 'tel', title: '项目负责人电话', width: 130},
-                { field: 'nameLead', title: '项目分管领导', width: 113 },
-                { field: 'simCode', title: '项目分管领导电话', width: 130},
-                { field: 'namePt', title: '项目管理平台联系人', width: 158},
-                { field: 'telPt', title: '项目管理平台联系人电话', width: 175},
-                {
-                  field: 'addre', title: '地址', width: 300, templet: function (row) {
-                    if (row.addre != null) {
-                      return '<span title="' + row.addre + '">' + row.addre + '</span>';
-                    }
-                    return "";
-                  }
-                },
-                {
-                  field: 'remark', title: '备注', width: 200, templet: function (row) {
-                    if (row.remark != null) {
-                      return '<span title="' + row.remark + '">' + row.remark + '</span>';
-                    }
-                    return "";
-                  }
-                },
-                { title: '操作', width: 120, align: 'center', toolbar: '#currentTableBar', fixed: 'right' }
-              ]],
-              fixed:true,
-              height:window.screen.availHeight-400,
-              limit: pageSize,
-              data: data
-            });
-            layui.table.on('tool(' + _tableName + ')', function (obj) {
-              var event = obj.event;
-              methods[event].call(this, obj);
-            });
-          },
-          loadPage: function (totalCount) {
-            var self = this;
-            layui.laypage.render({
-              elem: 'pagination',
-              count: totalCount,
-              curr: pageNo,
-              limit: pageSize,
-              layout: ['count', 'prev', 'page', 'next', 'skip'],
-              jump: function (obj, first) {
-                //首次不执行
-                if (!first) {
-                  pageNo = obj.curr;
-                  methods.getData();
+        _form.on("submit(add)", function () {
+          console.log("-------");
+          methods.add();
+        });
+        methods.getData();
+        window.addEventListener('message',this.receiveMessage,false);
+        window.parent.postMessage('init loaded');
+        $('.hiddenParams').show();
+        $('#lessText').hide();
+      },
+      receiveMessage(e){
+        if(e.data.topBreadcrumb){
+          $('.top-breadcrumb').html(e.data.topBreadcrumb);
+        }
+      },
+      add: function (obj) {
+        App.openLayer({
+          title: "新增单位",
+          content: App.getUrl("/junit/add"),
+          height: "600",
+          width: "800"
+        });
+      },
+      edit: function (obj) {
+        App.openLayer({
+          title: "编辑单位",
+          content: App.getUrl("/junit/add?id=" + obj.data.id),
+          height: "450",
+          width: "800"
+        });
+      },
+      del: function (obj) {
+        App.msg.confirm("确定删除该单位吗？", function () {
+          App.postJson("/api/junit/del", { id: obj.data.id }, function (res) {
+            if (res.success) methods.reload();
+          });
+        });
+      },
+      getData: function () {
+        var searchForm = _form.val("searchForm");
+        searchForm.pageNo = pageNo;
+        searchForm.pageSize = pageSize;
+        App.postJson("/api/junit/list", searchForm, function (res) {
+          methods.initTable(res.rows);
+          methods.loadPage(res.total);
+        });
+      },
+      initTable: function (data) {
+        layui.table.render({
+          elem: "#" + _tableName, // 指定原始表格元素选择器（推荐id选择器）
+          even: true,
+          toolbar: '#toolbarDemo',
+          defaultToolbar: [],
+          cols: [[ // 设置表头
+            { type: 'numbers', title: '序号', fixed: 'left', align: 'center',width:50 },
+            {
+              field: 'title', title: '单位名称', fixed: 'left', width: 200, width: '12%', templet: function (row) {
+                if (row.title != null) {
+                  return '<span title="' + row.title + '">' + row.title + '</span>';
                 }
+                return "";
               }
-            });
-          },
-          search: function () {
-            pageNo = 1;
-            methods.getData();
-          },
-        };
-        // ---------------成员方法定义---------------
-        mod.list = methods;
-
-        // ---------------初始化---------------
-        $(function () {
-          methods.init();
+            },
+            { field: 'nameZrr', title: '项目负责人', width: 138},
+            { field: 'tel', title: '项目负责人电话', width: 130},
+            { field: 'nameLead', title: '项目分管领导', width: 113 },
+            { field: 'simCode', title: '项目分管领导电话', width: 130},
+            { field: 'namePt', title: '项目管理平台联系人', width: 158},
+            { field: 'telPt', title: '项目管理平台联系人电话', width: 175},
+            {
+              field: 'addre', title: '地址', width: 300, templet: function (row) {
+                if (row.addre != null) {
+                  return '<span title="' + row.addre + '">' + row.addre + '</span>';
+                }
+                return "";
+              }
+            },
+            {
+              field: 'remark', title: '备注', width: 200, templet: function (row) {
+                if (row.remark != null) {
+                  return '<span title="' + row.remark + '">' + row.remark + '</span>';
+                }
+                return "";
+              }
+            },
+            { title: '操作', width: 120, align: 'center', toolbar: '#currentTableBar', fixed: 'right' }
+          ]],
+          fixed:true,
+          height:window.screen.availHeight-400,
+          limit: pageSize,
+          data: data
+        });
+        layui.table.on('tool(' + _tableName + ')', function (obj) {
+          var event = obj.event;
+          methods[event].call(this, obj);
+        });
+      },
+      loadPage: function (totalCount) {
+        var self = this;
+        layui.laypage.render({
+          elem: 'pagination',
+          count: totalCount,
+          curr: pageNo,
+          limit: pageSize,
+          layout: ['count', 'prev', 'page', 'next', 'skip'],
+          jump: function (obj, first) {
+            //首次不执行
+            if (!first) {
+              pageNo = obj.curr;
+              methods.getData();
+            }
+          }
         });
+      },
+      search: function () {
+        pageNo = 1;
+        methods.getData();
+      },
+    };
+    // ---------------成员方法定义---------------
+    mod.list = methods;
+
+    // ---------------初始化---------------
+    $(function () {
+      methods.init();
+    });
+
+    // 开放公共方法给子页面自动调用，由App.js来完成调用，子页面无需特殊处理
+    App.addReloadEvent(methods.getData);
+
+  })(jQuery, App.projects.junit)
+
+  $(document).ready(function() {
+    var showMoreFlag = false; // 定义一个变量来控制显示/隐藏状态
 
-        // 开放公共方法给子页面自动调用，由App.js来完成调用，子页面无需特殊处理
-        App.addReloadEvent(methods.getData);
+    $('#toggleMore').click(function() {
+      // 切换显示/隐藏状态
+      showMoreFlag = !showMoreFlag;
 
-      })(jQuery, App.projects.junit)
-    </script>
-  </body>
+      // 根据状态更新文本和图标
+      if (showMoreFlag) {
+        $('#moreText').hide();
+        $('.hiddenParam').show();
+        $('#lessText').show();
+      } else {
+        $('#lessText').hide();
+        $('.hiddenParam').hide();
+        $('#moreText').show();
+      }
+    });
+  });
+</script>
+</body>
 
-  </html>
+</html>

projects/src/main/webapp/vmodules/msgLog/index.jsp

@@ -31,11 +31,10 @@
     </head>
 
     <body>
-      <div class="layuimini-container">
-        <div class="layuimini-main" style="padding:0 17px;">
+    <div class="layui-layout layui-layout-admin pd0">
           <div class="right_title">
-            <span class="txt">短信日志查询</span>
-            <div class="layui-collapse">
+            <div class="txt">短信日志查询<div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
               <div class="layui-colla-item">
                 <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                 <div class="layui-colla-content layui-show">
@@ -92,7 +91,7 @@
           </script>
 
         </div>
-      </div>
+
       <jsp:include page="../common/common-js-include.jsp"></jsp:include>
       <script type="text/javascript">
         App.namespace("App.projects.msgLog");
@@ -119,6 +118,8 @@
                 methods.search();
               });
               methods.getData();
+              window.addEventListener('message', this.receiveMessage, false);
+              window.parent.postMessage('init loaded')
             },
             toDetail : function(obj){
               //详情
@@ -234,6 +235,12 @@
             search: function () {
               pageNo = 1;
               methods.getData();
+            },
+            receiveMessage (e) {
+              console.log('cb receiveMessage: ', e.data)
+              if (e.data.topBreadcrumb) {
+                $(".top-breadcrumb").html(e.data.topBreadcrumb)
+              }
             }
           };
           mod.list = methods;

projects/src/main/webapp/vmodules/notice/list.jsp

@@ -1,225 +1,233 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-  <!DOCTYPE html>
-  <html>
-
-  <head>
-    <meta charset="UTF-8">
-    <title>公告</title>
-    <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
-    <jsp:include page="../common/common-css-include.jsp"></jsp:include>
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
-      media="all" />
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}"
-      media="all" />
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
-      media="all" />
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />
-  </head>
-
-  <body>
-    <div class="layuimini-container">
-      <div class="right_title">
-        <span class="txt">公告管理</span>
-        <div class="layui-collapse">
-          <div class="layui-colla-item">
-            <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
-            <div class="layui-colla-content layui-show">
-              <form class="layui-form" lay-filter="searchForm">
-                <div class="layui-row">
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label">标题</label>
-                      <div class="layui-input-block">
-                        <input type="text" name="title" autocomplete="off" class="layui-input">
-                      </div>
-                    </div>
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="UTF-8">
+  <title>公告</title>
+  <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-css-include.jsp"></jsp:include>
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
+        media="all" />
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}"
+        media="all" />
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
+        media="all" />
+  <%--    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />--%>
+</head>
+
+<body>
+<div class="layui-layout layui-layout-admin pd0">
+  <div class="right_title">
+    <span class="txt">公告管理<div class="top-breadcrumb"></div></span>
+    <div class="layui-collapse search_form">
+      <div class="layui-colla-item">
+        <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
+        <div class="layui-colla-content layui-show">
+          <form class="layui-form" lay-filter="searchForm">
+            <div class="layui-row class_ls">
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">标题</label>
+                  <div class="layui-input-block">
+                    <input type="text" name="title" autocomplete="off" class="layui-input">
                   </div>
-
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                    <div class="layui-form-item">
-                      <label class="layui-form-label">是否发布</label>
-                      <div class="layui-input-block">
-                        <select name="publish">
-                          <option value="">--请选择--</option>
-                          <option value="true">已发布</option>
-                          <option value="false">未发布</option>
-                        </select>
-                      </div>
-                    </div>
-                  </div>
-
-                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                    <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">查询</button>
+                </div>
+              </div>
+
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">是否发布</label>
+                  <div class="layui-input-block">
+                    <select name="publish">
+                      <option value="">--请选择--</option>
+                      <option value="true">已发布</option>
+                      <option value="false">未发布</option>
+                    </select>
                   </div>
                 </div>
-              </form>
-            </div>
-          </div>
-        </div>
-      </div>
+              </div>
 
-      <script type="text/html" id="toolbarDemo">
-            <div class="layui-btn-container">
-                <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add">新增</button>
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">查询</button>
+              </div>
             </div>
-        </script>
-      <div class="table_box" style="padding-top: 0;border-radius:0;">
-        <div class="table_process">
-          <table id="notice" lay-filter="notice"></table>
-          <div class="pagination-box" id="pagination"></div>
+          </form>
         </div>
       </div>
-      <script type="text/html" id="publish">
-            {{# if(d.publish){}}
-            是
-            {{# } else { }}
-           否
-            {{# } }}
-        </script>
-
-
-      <script type="text/html" id="currentTableBar">
-            <div class="toolBar">
-                <span lay-event="edit">编辑</span>
-                <span lay-event="del">删除</span>
-                <input type="checkbox" name="changePublish" value="{{d.id}}" lay-skin="switch" lay-text="发布" lay-filter="switchTest" {{ d.publish ? 'checked' : '' }}>
-            </div>
-        </script>
-
+    </div>
+  </div>
 
+  <script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+      <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add">新增</button>
+    </div>
+  </script>
+  <div class="table_box" style="padding-top: 0;border-radius:0;">
+    <div class="table_process">
+      <table id="notice" lay-filter="notice"></table>
+      <div class="pagination-box" id="pagination"></div>
+    </div>
+  </div>
+  <script type="text/html" id="publish">
+    {{# if(d.publish){}}
+    是
+    {{# } else { }}
+    否
+    {{# } }}
+  </script>
+
+
+  <script type="text/html" id="currentTableBar">
+    <div class="toolBar">
+      <span lay-event="edit">编辑</span>
+      <span lay-event="del">删除</span>
+      <input type="checkbox" name="changePublish" value="{{d.id}}" lay-skin="switch" lay-text="发布" lay-filter="switchTest" {{ d.publish ? 'checked' : '' }}>
     </div>
+  </script>
+
+
+</div>
+
+<jsp:include page="../common/common-js-include.jsp"></jsp:include>
+<script type="text/javascript">
+  App.namespace("App.projects.notice");
+  (function ($, mod) {
+    mod = mod || {};
+    var _table = layui.table,
+            _form = layui.form,
+            pageNo = 1,
+            pageSize = 10,
+            _toolbar = layui.toolbar,
+            _tableName = "notice";
 
-    <jsp:include page="../common/common-js-include.jsp"></jsp:include>
-    <script type="text/javascript">
-      App.namespace("App.projects.notice");
-      (function ($, mod) {
-        mod = mod || {};
-        var _table = layui.table,
-          _form = layui.form,
-          pageNo = 1,
-          pageSize = 10,
-          _toolbar = layui.toolbar,
-          _tableName = "notice";
-
-        mod.options = mod.options || {};
-
-        var methods = {
-          init: function () {
-            _table.on("tool(" + _tableName + ")", function (obj) {
-              methods[obj.event].call(this, obj);
-            });
-            _table.on("toolbar(" + _tableName + ")", function (obj) {
-              methods[obj.event].call(this, obj);
-            });
-            _form.on('switch(switchTest)', function (data) {
-              methods.publish(data.value);
-            });
-            _form.on("submit(search)", function () {
-              methods.search();
-            });
+    mod.options = mod.options || {};
+
+    var methods = {
+      init: function () {
+        _table.on("tool(" + _tableName + ")", function (obj) {
+          methods[obj.event].call(this, obj);
+        });
+        _table.on("toolbar(" + _tableName + ")", function (obj) {
+          methods[obj.event].call(this, obj);
+        });
+        _form.on('switch(switchTest)', function (data) {
+          methods.publish(data.value);
+        });
+        _form.on("submit(search)", function () {
+          methods.search();
+        });
+        methods.getData();
+        window.addEventListener('message',methods.receiveMessage,false);
+        window.parent.postMessage('init loaded');
+      },
+      receiveMessage(e){
+        if(e.data.topBreadcrumb){
+          $('.top-breadcrumb').html(e.data.topBreadcrumb);
+        }
+      },
+      add: function () {
+        App.openLayer({
+          title: "新增",
+          content: App.getUrl("notice/edit"),
+          height: "700",
+          width: "900"
+        })
+      },
+      edit: function (obj) {
+        App.openLayer({
+          title: "编辑",
+          content: App.getUrl("/notice/edit?id=" + obj.data.id),
+          height: "700",
+          width: "900"
+        });
+      },
+      publish: function (id) {
+        App.postJson("/api/notice/changePublish", { id: id }, function (res) {
+          if (res.success) {
             methods.getData();
-          },
-          add: function () {
-            App.openLayer({
-              title: "新增",
-              content: App.getUrl("notice/edit"),
-              height: "700",
-              width: "900"
-            })
-          },
-          edit: function (obj) {
-            App.openLayer({
-              title: "编辑",
-              content: App.getUrl("/notice/edit?id=" + obj.data.id),
-              height: "700",
-              width: "900"
-            });
-          },
-          publish: function (id) {
-            App.postJson("/api/notice/changePublish", { id: id }, function (res) {
-              if (res.success) {
-                methods.getData();
-              }
-            })
-          },
-          del: function (obj) {
-            App.msg.confirm("确认删除该公告吗?", function () {
-              App.postJson("/api/notice/del", { id: obj.data.id }, function (res) {
-                if (res.success) methods.getData();
-              });
-            });
-          },
-          getData: function () {
-            var searchForm = _form.val("searchForm");
-            searchForm.pageNo = pageNo;
-            searchForm.pageSize = pageSize;
-            App.postJson("/api/notice/list", searchForm, function (res) {
-              methods.initTable(res.rows);
-              methods.loadPage(res.total);
-            });
-          },
-          initTable: function (data) {
-            layui.table.render({
-              elem: "#" + _tableName, // 指定原始表格元素选择器（推荐id选择器）
-              even: true,
-              toolbar: '#toolbarDemo',
-              defaultToolbar: [],
-              cols: [[ // 设置表头
-                { type: 'numbers', title: '序号', align: 'center' ,width:50},
-                {
-                  field: 'title', title: '标题', width: '40%', align: 'center', templet: function (row) {
-                    if (row.title != null) {
-                      return '<span title="' + row.title + '">' + row.title + '</span>';
-                    }
-                    return "";
-                  }
-                },
-                { field: 'publish', title: '是否发布', minWidth: 80, width: '100', align: 'center', templet: '#publish' },
-                { field: 'beginDate', title: '开始日期', minWidth: 80, width: '10%', align: 'center' },
-                { field: 'endDate', title: '结束日期', minWidth: 80, width: '10%', align: 'center' },
-                { field: 'publishDate', title: '发布日期', minWidth: 80, width: '15%', align: 'center' },
-                { title: '操作', minWidth: 270, width:183, align: 'center', toolbar: '#currentTableBar'}
-              ]],
-              limit: pageSize,
-              data: data
-            });
-            layui.table.on('tool(' + _tableName + ')', function (obj) {
-              var event = obj.event;
-              methods[event].call(this, obj);
-            });
-          },
-          loadPage: function (totalCount) {
-            var self = this;
-            layui.laypage.render({
-              elem: 'pagination',
-              count: totalCount,
-              curr: pageNo,
-              limit: pageSize,
-              layout: ['count', 'prev', 'page', 'next', 'skip'],
-              jump: function (obj, first) {
-                //首次不执行
-                if (!first) {
-                  pageNo = obj.curr;
-                  methods.getData();
+          }
+        })
+      },
+      del: function (obj) {
+        App.msg.confirm("确认删除该公告吗?", function () {
+          App.postJson("/api/notice/del", { id: obj.data.id }, function (res) {
+            if (res.success) methods.getData();
+          });
+        });
+      },
+      getData: function () {
+        var searchForm = _form.val("searchForm");
+        searchForm.pageNo = pageNo;
+        searchForm.pageSize = pageSize;
+        App.postJson("/api/notice/list", searchForm, function (res) {
+          methods.initTable(res.rows);
+          methods.loadPage(res.total);
+        });
+      },
+      initTable: function (data) {
+        layui.table.render({
+          elem: "#" + _tableName, // 指定原始表格元素选择器（推荐id选择器）
+          even: true,
+          toolbar: '#toolbarDemo',
+          defaultToolbar: [],
+          cols: [[ // 设置表头
+            { type: 'numbers', title: '序号', align: 'center' ,width:50},
+            {
+              field: 'title', title: '标题', width: '40%', align: 'center', templet: function (row) {
+                if (row.title != null) {
+                  return '<span title="' + row.title + '">' + row.title + '</span>';
                 }
+                return "";
               }
-            });
-          },
-          search: function () {
-            pageNo = 1;
-            methods.getData();
+            },
+            { field: 'publish', title: '是否发布', minWidth: 80, width: '100', align: 'center', templet: '#publish' },
+            { field: 'beginDate', title: '开始日期', minWidth: 80, width: '10%', align: 'center' },
+            { field: 'endDate', title: '结束日期', minWidth: 80, width: '10%', align: 'center' },
+            { field: 'publishDate', title: '发布日期', minWidth: 80, width: '15%', align: 'center' },
+            { title: '操作', minWidth: 270, width:183, align: 'center', toolbar: '#currentTableBar'}
+          ]],
+          limit: pageSize,
+          data: data
+        });
+        layui.table.on('tool(' + _tableName + ')', function (obj) {
+          var event = obj.event;
+          methods[event].call(this, obj);
+        });
+      },
+      loadPage: function (totalCount) {
+        var self = this;
+        layui.laypage.render({
+          elem: 'pagination',
+          count: totalCount,
+          curr: pageNo,
+          limit: pageSize,
+          layout: ['count', 'prev', 'page', 'next', 'skip'],
+          jump: function (obj, first) {
+            //首次不执行
+            if (!first) {
+              pageNo = obj.curr;
+              methods.getData();
+            }
           }
-        };
-        mod.list = methods;
-
-        $(function () {
-          methods.init();
         });
+      },
+      search: function () {
+        pageNo = 1;
+        methods.getData();
+      }
+    };
+    mod.list = methods;
+
+    $(function () {
+      methods.init();
+    });
 
-        App.addReloadEvent(methods.getData);
+    App.addReloadEvent(methods.getData);
 
-      })(jQuery, App.projects.notice);
-    </script>
-  </body>
+  })(jQuery, App.projects.notice);
+</script>
+</body>
 
-  </html>
+</html>

projects/src/main/webapp/vmodules/passport/registerCheck.jsp

@@ -1,137 +1,151 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-  <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-    <!DOCTYPE html>
-    <html>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html>
 
-    <head>
-      <meta charset="UTF-8">
-      <title>注册单位信息</title>
-      <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
-      <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
-        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
-          media="all" />
-        <link rel="stylesheet" type="text/css"
-          href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}" media="all" />
-        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
-          media="all" />
-        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />
-      <style>
+<head>
+  <meta charset="UTF-8">
+  <title>注册单位信息</title>
+  <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-css-include.jsp"></jsp:include>
+  <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
+        media="all" />
+  <link rel="stylesheet" type="text/css"
+        href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}" media="all" />
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
+        media="all" />
+  <%--<link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />--%>
+  <style>
 
-        .layui-table-view .layui-table td >div{
-          min-height: 42px !important;
-          line-height: 20px !important;
-          white-space: normal;
-        }
-      </style>
-    </head>
+    .layui-table-view .layui-table td >div{
+      min-height: 42px !important;
+      line-height: 20px !important;
+      white-space: normal;
+    }
+    .hiddenParam,
+    .hiddenParams {
+      display: none;
+    }
+  </style>
+</head>
 
-    <body>
-      <div id="app">
-        <template id="template">
-          <div class="layui-layout layui-layout-admin">
-            <div class="right_title">
-              <span class="txt">审核项目单位信息</span>
-              <div class="layui-collapse">
-                <div class="layui-colla-item">
-                  <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
-                  <div class="layui-colla-content layui-show">
-                    <form class="layui-form" lay-filter="searchForm">
-                      <div class="layui-row">                  
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">单位性质</label>
-                            <div class="layui-input-block">
-                              <select lay-verify="required" id="unitPropId" name="unitPropId" lay-filter="unitPropId"
+<body>
+<div id="app">
+  <template id="template">
+    <div class="layui-layout layui-layout-admin pd0">
+      <div class="right_title">
+        <span class="txt">审核项目单位信息<div class="top-breadcrumb"></div></span>
+        <div class="layui-collapse search_form">
+          <div class="layui-colla-item">
+            <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
+            <div class="layui-colla-content layui-show">
+              <form class="layui-form" lay-filter="searchForm">
+                <div class="layui-row">
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">单位性质</label>
+                      <div class="layui-input-block">
+                        <select lay-verify="required" id="unitPropId" name="unitPropId" lay-filter="unitPropId"
                                 v-model="junit.unitPropId">
-                                <option value="">请选择</option>
-                                <c:forEach items="${DWXZ }" var="hy">
-                                  <option value="${hy.id }">${hy.title}</option>
-                                </c:forEach>
-                              </select>
-                            </div>
-                          </div>
-                        </div>
+                          <option value="">请选择</option>
+                          <c:forEach items="${DWXZ }" var="hy">
+                            <option value="${hy.id }">${hy.title}</option>
+                          </c:forEach>
+                        </select>
+                      </div>
+                    </div>
+                  </div>
 
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">单位类型</label>
-                            <div class="layui-input-block">
-                              <select lay-verify="required" id="DWLX" name="unitKindId" lay-filter="unitKindId"
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">单位类型</label>
+                      <div class="layui-input-block">
+                        <select lay-verify="required" id="DWLX" name="unitKindId" lay-filter="unitKindId"
                                 v-model="junit.unitKindId">
-                                <option value="">请选择</option>
-                                <c:forEach items="${DWLX }" var="hy">
-                                  <option value="${hy.id }">${hy.title}</option>
-                                </c:forEach>
-                              </select>
-                            </div>
-                          </div>
-                        </div>
+                          <option value="">请选择</option>
+                          <c:forEach items="${DWLX }" var="hy">
+                            <option value="${hy.id }">${hy.title}</option>
+                          </c:forEach>
+                        </select>
+                      </div>
+                    </div>
+                  </div>
 
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">单位名称</label>
-                            <div class="layui-input-block">
-                              <input type="text" name="title" autocomplete="off" id="title" v-model="junit.title"
-                                class="layui-input">
-                            </div>
-                          </div>
-                        </div>
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">单位名称</label>
+                      <div class="layui-input-block">
+                        <input type="text" name="title" autocomplete="off" id="title" v-model="junit.title"
+                               class="layui-input">
+                      </div>
+                    </div>
+                  </div>
 
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">状态</label>
-                            <div class="layui-input-block">
-                              <select lay-verify="required" name="status" lay-filter="status" id="status"
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3 hiddenParam">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">状态</label>
+                      <div class="layui-input-block">
+                        <select lay-verify="required" name="status" lay-filter="status" id="status"
                                 v-model="junit.status">
-                                <option value="">所有</option>
-                                <option value="2">已审核</option>
-                                <option value="1">待审核</option>
-                              </select>
-                            </div>
-                          </div>
-                        </div>
-
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">申报日期</label>
-                            <div class="layui-input-block" style="width: fit-content;">
-                              <input type="text" id="startDate" name="startDate" style="float: left;width: 120px"
-                                placeholder="请选择开始时间" autocomplete="off" class="layui-input" value="${startDate}"> -
-                              <input type="text" id="endDate" name="endDate" style="float: right;width: 120px"
-                                placeholder="请选择结束时间" autocomplete="off" class="layui-input" value="${endDate}">
-                            </div>
-                          </div>
-                        </div>
+                          <option value="">所有</option>
+                          <option value="2">已审核</option>
+                          <option value="1">待审核</option>
+                        </select>
+                      </div>
+                    </div>
+                  </div>
 
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <button type="button" class="layui-btn layui-btn-normal" @click="search()">查询</button>
-                        </div>
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 hiddenParam">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">申报日期</label>
+                      <div class="layui-input-block" style="width: fit-content;">
+                        <input type="text" id="startDate" name="startDate" style="float: left;width: 120px"
+                               placeholder="请选择开始时间" autocomplete="off" class="layui-input" value="${startDate}"> -
+                        <input type="text" id="endDate" name="endDate" style="float: right;width: 120px"
+                               placeholder="请选择结束时间" autocomplete="off" class="layui-input" value="${endDate}">
+                      </div>
+                    </div>
+                  </div>
+                  <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label"></label>
+                      <div class="layui-input-block">
+                        <button type="button" class="layui-btn layui-btn-normal" @click="search()">查询
+                        </button>
+                        <span class="morePan" @click="showMore"><a v-if="!showMoreFlag">更多  <ion-icon
+                                name="chevron-forward-outline"></ion-icon></a><a
+                                v-if="showMoreFlag">收起 V</a></span>
                       </div>
-                    </form>
+                    </div>
                   </div>
                 </div>
-              </div>
+              </form>
             </div>
+          </div>
+        </div>
+      </div>
 
 
-            <div class="table_box" style="padding-top: 0;">
-              <div class="table_process">
-                <table id="table1" lay-filter="test"></table>
-                <div class="pagination-box" id="pagination"></div>
-              </div>
-            </div>
-
-          </div>
-        </template>
+      <div class="table_box" style="padding-top: 0;">
+        <div class="table_process">
+          <table id="table1" lay-filter="test"></table>
+          <div class="pagination-box" id="pagination"></div>
+        </div>
       </div>
-      <script type="text/html" id="currentTableBar">
-<div class="toolBar">
+
+    </div>
+  </template>
+</div>
+<script type="text/html" id="currentTableBar">
+  <div class="toolBar">
     <span lay-event="edit2">查看</span>
 
     {{# if("${currUser.edit}" == 'true') { }}
     <span  lay-event="edit">编辑</span>
     {{#} }}
-</div>
+  </div>
 
 </script>
       <jsp:include page="../common/common-js-include.jsp"></jsp:include>
@@ -155,7 +169,8 @@
             xmselect2: {},
             startDate: "${startDate}",
             endDate: "${endDate}",
-            pageSize: 10
+            pageSize: 10,
+            showMoreFlag: false
           },
           mounted: function () {
             this.init();
@@ -171,6 +186,22 @@
                 theme: layDateTheme,
               });
               this.getData();
+              window.addEventListener('message',this.receiveMessage,false);
+              window.parent.postMessage('init loaded');
+              $(".hiddenParams").show();
+            },
+            receiveMessage(e){
+              if(e.data.topBreadcrumb){
+                $('.top-breadcrumb').html(e.data.topBreadcrumb);
+              }
+            },
+            showMore: function () {
+              this.showMoreFlag = !this.showMoreFlag;
+              if (this.showMoreFlag) {
+                $(".hiddenParam").show();
+              } else {
+                $(".hiddenParam").hide();
+              }
             },
             add: function (obj) {
               App.openLayer({

projects/src/main/webapp/vmodules/passport/registerCk.jsp

@@ -3,6 +3,9 @@
 <html>
 <head>
     <title>Title</title>
+    <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-css-include.jsp"></jsp:include>
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
           media="all"/>
     <link rel="stylesheet" href="${WebSite.asset}/lib/vuejs/myvue.css"/>

projects/src/main/webapp/vmodules/passport/registerCksbdw.jsp

@@ -3,6 +3,9 @@
 <html>
 <head>
   <title>Title</title>
+  <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-css-include.jsp"></jsp:include>
   <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}" media="all"/>
   <link rel="stylesheet" href="${WebSite.asset}/lib/vuejs/myvue.css" />
   <link rel="stylesheet" href="${WebSite.asset}/css/style.css" />

projects/src/main/webapp/vmodules/passport/registerEdit.jsp

@@ -3,6 +3,9 @@
 <html>
 <head>
     <title>Title</title>
+    <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-css-include.jsp"></jsp:include>
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
           media="all"/>
     <link rel="stylesheet" href="${WebSite.asset}/lib/vuejs/myvue.css"/>

projects/src/main/webapp/vmodules/passport/registerEditsbdw.jsp

@@ -3,6 +3,9 @@
 <html>
 <head>
   <title>Title</title>
+  <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-css-include.jsp"></jsp:include>
   <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}" media="all"/>
   <link rel="stylesheet" href="${WebSite.asset}/lib/vuejs/myvue.css" />
   <link rel="stylesheet" href="${WebSite.asset}/css/style.css" />

projects/src/main/webapp/vmodules/passport/registerList.jsp

@@ -1,155 +1,169 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-  <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-    <!DOCTYPE html>
-    <html>
-
-    <head>
-      <meta charset="UTF-8">
-      <title>注册单位信息</title>
-      <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
-      <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
-        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
-          media="all" />
-        <link rel="stylesheet" type="text/css"
-          href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}" media="all" />
-        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
-          media="all" />
-        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />
-        <style>
-          .table_box .pagination-box {
-            display: flex;
-            justify-content: center;
-            width: 100%;
-          }
-          .layui-table-view .layui-table td >div{
-            line-height: 20px !important;
-            white-space: normal;
-          }
-        </style>
-    </head>
-
-    <body>
-      <div id="app">
-        <template id="template">
-          <div class="layui-layout layui-layout-admin">
-            <div class="right_title">
-              <span class="txt">项目单位信息</span>
-              <div class="layui-collapse">
-                <div class="layui-colla-item">
-                  <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
-                  <div class="layui-colla-content layui-show">
-                    <form class="layui-form" lay-filter="searchForm">
-                      <div class="layui-row">
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">单位性质</label>
-                            <div class="layui-input-block">
-                              <select lay-verify="required" id="unitPropId" name="unitPropId" lay-filter="unitPropId"
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="UTF-8">
+  <title>注册单位信息</title>
+  <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-css-include.jsp"></jsp:include>
+  <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
+        media="all" />
+  <link rel="stylesheet" type="text/css"
+        href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}" media="all" />
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
+        media="all" />
+  <%--        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />--%>
+  <style>
+    .table_box .pagination-box {
+      display: flex;
+      justify-content: center;
+      width: 100%;
+    }
+    .layui-table-view .layui-table td >div{
+      line-height: 20px !important;
+      white-space: normal;
+    }
+    .hiddenParam,
+    .hiddenParams {
+      display: none;
+    }
+  </style>
+</head>
+
+<body>
+<div id="app">
+  <template id="template">
+    <div class="layui-layout layui-layout-admin pd0">
+      <div class="right_title">
+        <span class="txt">项目单位信息<div class="top-breadcrumb"></div></span>
+        <div class="layui-collapse search_form">
+          <div class="layui-colla-item">
+            <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
+            <div class="layui-colla-content layui-show">
+              <form class="layui-form" lay-filter="searchForm">
+                <div class="layui-row">
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">单位性质</label>
+                      <div class="layui-input-block">
+                        <select lay-verify="required" id="unitPropId" name="unitPropId" lay-filter="unitPropId"
                                 v-model="junit.unitPropId">
-                                <option value="">请选择</option>
-                                <c:forEach items="${DWXZ }" var="hy">
-                                  <option value="${hy.id }">${hy.title}</option>
-                                </c:forEach>
-                              </select>
-                            </div>
-                          </div>
-                        </div>
-
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">单位类型</label>
-                            <div class="layui-input-block">
-                              <select lay-verify="required" id="DWLX" name="unitKindId" lay-filter="unitKindId"
+                          <option value="">请选择</option>
+                          <c:forEach items="${DWXZ }" var="hy">
+                            <option value="${hy.id }">${hy.title}</option>
+                          </c:forEach>
+                        </select>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">单位类型</label>
+                      <div class="layui-input-block">
+                        <select lay-verify="required" id="DWLX" name="unitKindId" lay-filter="unitKindId"
                                 v-model="junit.unitKindId">
-                                <option value="">请选择</option>
-                                <c:forEach items="${DWLX }" var="hy">
-                                  <option value="${hy.id }">${hy.title}</option>
-                                </c:forEach>
-                              </select>
-                            </div>
-                          </div>
-                        </div>
-
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">单位名称</label>
-                            <div class="layui-input-block">
-                              <input type="text" name="title" autocomplete="off" id="title" v-model="junit.title"
-                                class="layui-input">
-                            </div>
-                          </div>
-                        </div>
-
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">状态</label>
-                            <div class="layui-input-block">
-                              <select lay-verify="required" name="status" lay-filter="status" id="status"
+                          <option value="">请选择</option>
+                          <c:forEach items="${DWLX }" var="hy">
+                            <option value="${hy.id }">${hy.title}</option>
+                          </c:forEach>
+                        </select>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">单位名称</label>
+                      <div class="layui-input-block">
+                        <input type="text" name="title" autocomplete="off" id="title" v-model="junit.title"
+                               class="layui-input">
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md3 hiddenParam">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">状态</label>
+                      <div class="layui-input-block">
+                        <select lay-verify="required" name="status" lay-filter="status" id="status"
                                 v-model="junit.status">
-                                <option value="">所有</option>
-                                <option value="2">已审核</option>
-                                <option value="1">待审核</option>
-                                <option value="0">暂存</option>
-                              </select>
-                            </div>
-                          </div>
-                        </div>
-
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                          <div class="layui-form-item">
-                            <label class="layui-form-label">申报日期</label>
-                            <div class="layui-input-block" style="width: fit-content;">
-                              <input type="text" id="startDate" name="startDate" style="float: left;width: 120px"
-                                placeholder="请选择开始时间" autocomplete="off" class="layui-input" value="${startDate}"> -
-                              <input type="text" id="endDate" name="endDate" style="float: right;width: 120px"
-                                placeholder="请选择结束时间" autocomplete="off" class="layui-input" value="${endDate}">
-                            </div>
-                          </div>
-                        </div>
-
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                          <button type="button" class="layui-btn layui-btn-normal" @click="search()">查询</button>
-                        </div>
+                          <option value="">所有</option>
+                          <option value="2">已审核</option>
+                          <option value="1">待审核</option>
+                          <option value="0">暂存</option>
+                        </select>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 hiddenParam">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label">申报日期</label>
+                      <div class="layui-input-block" style="width: fit-content;">
+                        <input type="text" id="startDate" name="startDate" style="float: left;width: 120px"
+                               placeholder="请选择开始时间" autocomplete="off" class="layui-input" value="${startDate}"> -
+                        <input type="text" id="endDate" name="endDate" style="float: right;width: 120px"
+                               placeholder="请选择结束时间" autocomplete="off" class="layui-input" value="${endDate}">
+                      </div>
+                    </div>
+                  </div>
+                  <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
+                    <div class="layui-form-item">
+                      <label class="layui-form-label"></label>
+                      <div class="layui-input-block">
+                        <button type="button" class="layui-btn layui-btn-normal" @click="search()">查询
+                        </button>
+                        <span class="morePan" @click="showMore"><a v-if="!showMoreFlag">更多  <ion-icon
+                                name="chevron-forward-outline"></ion-icon></a><a
+                                v-if="showMoreFlag">收起 V</a></span>
                       </div>
-                    </form>
+                    </div>
                   </div>
                 </div>
-              </div>
+              </form>
             </div>
+          </div>
+        </div>
+      </div>
 
-            <div class="table_box" style="padding-top: 0;">
-              <div class="table_process">
-                <table id="table1" lay-filter="test"></table>
-                <div class="pagination-box" id="pagination"></div>
-              </div>
-            </div>
+      <div class="table_box" style="padding-top: 0;">
+        <div class="table_process">
+          <table id="table1" lay-filter="test"></table>
+          <div class="pagination-box" id="pagination"></div>
+        </div>
+      </div>
 
 
-          </div>
-        </template>
-        <%----%>
-          <%-- <script type="text/html" id="currentTableBar1">--%>
-            <%-- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit2">查看</a>--%>
-              <%-- </script>--%>
+    </div>
+  </template>
+  <%----%>
+  <%-- <script type="text/html" id="currentTableBar1">--%>
+  <%-- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit2">查看</a>--%>
+  <%-- </script>--%>
 
-      </div>
-      <script type="text/html" id="currentTableBar">
-<div class="toolBar">
-	<span lay-event="edit2">查看</span>
+</div>
+<script type="text/html" id="currentTableBar">
+  <div class="toolBar">
+    <span lay-event="edit2">查看</span>
 
-  	{{# if("${currUser.edit}" == 'true') { }}
-      <span lay-event="edit">编辑</span>
+    {{# if("${currUser.edit}" == 'true') { }}
+    <span lay-event="edit">编辑</span>
     {{#} else { }}
 
-  	<c:if test="${editUnit}">
-        {{#if(d.status=="待审核"||d.status=="已审核"||d.status=="不通过"){ }}
+    <c:if test="${editUnit}">
+      {{#if(d.status=="待审核"||d.status=="已审核"||d.status=="不通过"){ }}
 
-        {{#}else { }}
-        <span lay-event="edit">编辑</span>
-        {{#} }}
-      </c:if>
+      {{#}else { }}
+      <span lay-event="edit">编辑</span>
+      {{#} }}
+    </c:if>
     {{#} }}
-</div>
+  </div>
 
 
   <!-- <span class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit2">查看</span>
@@ -170,282 +184,299 @@
 
 
 </script>
-      <jsp:include page="../common/common-js-include.jsp"></jsp:include>
-      <script type="text/javascript">
-        new Vue({
-          el: "#app",
-          template: "#template",
-          data: {
-            winH: 0,
-            dataList: [],
-            junit: {},
-            tableName: 'test',
-            pageNo: 1,
-            xmselect: {},
-            xmselect1: {},
-            xmselect2: {},
-            pageSize: 10
-          },
-          mounted: function () {
-            this.init();
-          },
-          methods: {
-            init: function () {
-              layui.laydate.render({
-                elem: '#startDate',
-                theme: layDateTheme,
-              });
-              layui.laydate.render({
-                elem: '#endDate',
-                theme: layDateTheme,
-              });
-              this.getData();
-            },
-            add: function (obj) {
-              App.openLayer({
-                title: "新增角色",
-                content: App.getUrl("/Rolemeun/add"),
-                height: "600",
-                width: "800"
-              });
+<jsp:include page="../common/common-js-include.jsp"></jsp:include>
+<script type="text/javascript">
+  new Vue({
+    el: "#app",
+    template: "#template",
+    data: {
+      winH: 0,
+      dataList: [],
+      junit: {},
+      tableName: 'test',
+      pageNo: 1,
+      xmselect: {},
+      xmselect1: {},
+      xmselect2: {},
+      pageSize: 10,
+      showMoreFlag: false
+    },
+    mounted: function () {
+      this.init();
+    },
+    methods: {
+      init: function () {
+        layui.laydate.render({
+          elem: '#startDate',
+          theme: layDateTheme,
+        });
+        layui.laydate.render({
+          elem: '#endDate',
+          theme: layDateTheme,
+        });
+        this.getData();
+        window.addEventListener('message',this.receiveMessage,false);
+        window.parent.postMessage('init loaded');
+        $(".hiddenParams").show();
+      },
+      receiveMessage(e){
+        if(e.data.topBreadcrumb){
+          $('.top-breadcrumb').html(e.data.topBreadcrumb);
+        }
+      },
+      showMore: function () {
+        this.showMoreFlag = !this.showMoreFlag;
+        if (this.showMoreFlag) {
+          $(".hiddenParam").show();
+        } else {
+          $(".hiddenParam").hide();
+        }
+      },
+      add: function (obj) {
+        App.openLayer({
+          title: "新增角色",
+          content: App.getUrl("/Rolemenu/add"),
+          height: "600",
+          width: "800"
+        });
+      },
+      edit: function (obj) {
+        window.location.href = App.getUrl("register/editSbdw?id=" + obj.data.id);
+      },
+      edit2: function (obj) {
+        window.location.href = App.getUrl("register/editCkSbdw?id=" + obj.data.id);
+      },
+      del: function (obj) {
+        App.msg.confirm("确定删除该角色吗？", function () {
+          App.postJson("/api/Rolemenu/del", { id: obj.data.id }, function (res) {
+            if (res.success) methods.reload();
+          });
+        });
+      },
+      loadPage: function (totalCount) {
+        var self = this;
+        layui.laypage.render({
+          elem: 'pagination',
+          count: totalCount,
+          curr: self.pageNo,
+          limit: self.pageSize,
+          layout: ['count', 'prev', 'page', 'next', 'skip'],
+          jump: function (obj, first) {
+            //首次不执行
+            if (!first) {
+              self.pageNo = obj.curr;
+              self.getData();
+            }
+          }
+        });
+      },
+      getData: function () {
+        var self = this;
+        var param = layui.form.getValue("searchForm");
+        param.pageNo = this.pageNo;
+        param.pageSize = this.pageSize;
+        App.postJson("/api/register/list", param, function (res) {
+          self.dataList = res.rows;
+          self.loadPage(res.total);
+
+
+          self.loadTable();
+
+          // if(res.data=="1"){
+          //   if (self.dataList[0].status=="待审核"||self.dataList[0].status=="已审核"||self.dataList[0].status=="不通过"){
+          //     self.loadTable1();
+          //   }else{
+          //     self.loadTable();
+          //   }
+          // }
+          // else{
+          //   self.loadTable1();
+          // }
+
+
+        });
+      },
+      search: function () {
+        var param = layui.form.getValue("searchForm");
+        this.pageNo = 1;
+        param.pageNo = this.pageNo;
+        param.pageSize = this.pageSize;
+        var self = this;
+        App.postJson("/api/register/list", param, function (res) {
+          self.dataList = res.rows;
+          self.loadPage(res.total);
+
+
+          self.loadTable();
+
+          // if(res.data=="1"){
+          //   if (self.dataList[0].status=="已审核"||self.dataList[0].status=="不同意"){
+          //     self.loadTable1();
+          //   }else{
+          //     self.loadTable();
+          //   }
+          // }
+          // else{
+          //   self.loadTable1();
+          // }
+        });
+      },
+      loadTable: function () {
+        var self = this;
+        layui.table.render({
+          elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
+          even: true,
+          cols: [[ // 设置表头
+            { type: 'numbers',  width: 44,title:'序号' },
+            {
+              field: 'title', title: '单位名称', minWidth: 200, templet: function (row) {
+                if (row.title != null) {
+                  return '<span title="' + row.title + '">' + row.title + '</span>';
+                }
+                return ""
+              }
             },
-            edit: function (obj) {
-              window.location.href = App.getUrl("register/editSbdw?id=" + obj.data.id);
+            { field: 'status', title: '状态', minWidth: 80 },
+            {
+              field: 'area', title: '所在区县', minWidth: 80, templet: function (row) {
+                if (row.area != null) {
+                  return '<span title="' + row.area + '">' + row.area + '</span>';
+                }
+                return ""
+              }
             },
-            edit2: function (obj) {
-              window.location.href = App.getUrl("register/editCkSbdw?id=" + obj.data.id);
+            { field: 'dateFound', title: '成立日期', minWidth: 80 },
+            { field: 'amt', title: '注册资金', minWidth: 80 },
+            { field: 'unitPropName', title: '单位性质', minWidth: 80 },
+            { field: 'unitKindName', title: '单位类型', minWidth: 80},
+            { field: 'nameJur1', title: '法人', minWidth: 80 },
+            { field: 'simCode', title: '联系电话', minWidth: 120 },
+            {
+              field: 'reason', title: '退回原因', minWidth: 100, templet: function (row) {
+                if (row.reason != null) {
+                  return '<span title="' + row.reason + '">' + row.reason + '</span>';
+                }
+                return "";
+              }
             },
-            del: function (obj) {
-              App.msg.confirm("确定删除该角色吗？", function () {
-                App.postJson("/api/Rolemeun/del", { id: obj.data.id }, function (res) {
-                  if (res.success) methods.reload();
-                });
-              });
+            { title: '操作', width: 100, align: 'center', toolbar: '#currentTableBar', fixed: 'right' }
+          ]],
+          data: self.dataList,
+          done:function(res, curr, count) {
+            $('tr').css({ 'border': 'none' })
+            $(".layui-table-main tr").each(function (index, val) {
+              $($(".layui-table-fixed-l .layui-table-body tbody tr")[index]).height($(val).height());
+              $($(".layui-table-fixed-r .layui-table-body tbody tr")[index]).height($(val).height());
+            })
+          }
+        });
+        layui.table.on('tool(' + this.tableName + ')', function (obj) {
+          var event = obj.event;
+          self[event].call(this, obj);
+        });
+      },
+      loadTable_1: function () {
+        var self = this;
+        layui.table.render({
+          elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
+          even: true,
+          cols: [[ // 设置表头
+            { type: 'numbers', fixed: 'left', align: '5%',title:'序号' , width: 44},
+            {
+              field: 'title', title: '单位名称', width: '15%', templet: function (row) {
+                if (row.title != null) {
+                  return '<span title="' + row.title + '">' + row.title + '</span>';
+                }
+                return ""
+              }
             },
-            loadPage: function (totalCount) {
-              var self = this;
-              layui.laypage.render({
-                elem: 'pagination',
-                count: totalCount,
-                curr: self.pageNo,
-                limit: self.pageSize,
-                layout: ['count', 'prev', 'page', 'next', 'skip'],
-                jump: function (obj, first) {
-                  //首次不执行
-                  if (!first) {
-                    self.pageNo = obj.curr;
-                    self.getData();
-                  }
+            { field: 'status', title: '状态', width: '7%' },
+            {
+              field: 'area', title: '所在区县', width: '8%', templet: function (row) {
+                if (row.area != null) {
+                  return '<span title="' + row.area + '">' + row.area + '</span>';
                 }
-              });
+                return ""
+              }
             },
-            getData: function () {
-              var self = this;
-              var param = layui.form.getValue("searchForm");
-              param.pageNo = this.pageNo;
-              param.pageSize = this.pageSize;
-              App.postJson("/api/register/list", param, function (res) {
-                self.dataList = res.rows;
-                self.loadPage(res.total);
-
-
-                self.loadTable();
-
-                // if(res.data=="1"){
-                //   if (self.dataList[0].status=="待审核"||self.dataList[0].status=="已审核"||self.dataList[0].status=="不通过"){
-                //     self.loadTable1();
-                //   }else{
-                //     self.loadTable();
-                //   }
-                // }
-                // else{
-                //   self.loadTable1();
-                // }
-
-
-              });
+            { field: 'dateFound', title: '成立日期', width: '9%' },
+            { field: 'amt', title: '注册资金', width: '8%' },
+            { field: 'unitPropName', title: '单位性质', width: '8%' },
+            { field: 'unitKindName', title: '单位类型', width: '8%' },
+            { field: 'nameJur1', title: '法人', width: '7%' },
+            { field: 'simCode', title: '联系电话', width: '10%' },
+            {
+              field: 'reason', title: '退回原因', width: '10%', templet: function (row) {
+                if (row.reason != null) {
+                  return '<span title="' + row.reason + '">' + row.reason + '</span>';
+                }
+                return "";
+              }
             },
-            search: function () {
-              var param = layui.form.getValue("searchForm");
-              this.pageNo = 1;
-              param.pageNo = this.pageNo;
-              param.pageSize = this.pageSize;
-              var self = this;
-              App.postJson("/api/register/list", param, function (res) {
-                self.dataList = res.rows;
-                self.loadPage(res.total);
-
-
-                self.loadTable();
-
-                // if(res.data=="1"){
-                //   if (self.dataList[0].status=="已审核"||self.dataList[0].status=="不同意"){
-                //     self.loadTable1();
-                //   }else{
-                //     self.loadTable();
-                //   }
-                // }
-                // else{
-                //   self.loadTable1();
-                // }
-              });
+            { title: '操作', width: '6%', align: 'center', toolbar: '#currentTableBar2' }
+          ]],
+          data: self.dataList,
+          /*        done:function (res,curr,count){
+                 $('tr').css({'background-color':'#ECEDFF','border':'none'})
+               } */
+        });
+        layui.table.on('tool(' + this.tableName + ')', function (obj) {
+          var event = obj.event;
+          self[event].call(this, obj);
+        });
+      },
+      loadTable1: function () {
+        var self = this;
+        layui.table.render({
+          elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
+          even: true,
+          cols: [[ // 设置表头
+            { type: 'numbers', fixed: 'left', align: '5%',title:'序号' , width: 44},
+            {
+              field: 'title', title: '单位名称', width: '15%', templet: function (row) {
+                if (row.title != null) {
+                  return '<span title="' + row.title + '">' + row.title + '</span>';
+                }
+                return ""
+              }
             },
-            loadTable: function () {
-              var self = this;
-              layui.table.render({
-                elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
-                even: true,
-                cols: [[ // 设置表头
-                  { type: 'numbers',  width: 44,title:'序号' },
-                  {
-                    field: 'title', title: '单位名称', minWidth: 200, templet: function (row) {
-                      if (row.title != null) {
-                        return '<span title="' + row.title + '">' + row.title + '</span>';
-                      }
-                      return ""
-                    }
-                  },
-                  { field: 'status', title: '状态', minWidth: 80 },
-                  {
-                    field: 'area', title: '所在区县', minWidth: 80, templet: function (row) {
-                      if (row.area != null) {
-                        return '<span title="' + row.area + '">' + row.area + '</span>';
-                      }
-                      return ""
-                    }
-                  },
-                  { field: 'dateFound', title: '成立日期', minWidth: 80 },
-                  { field: 'amt', title: '注册资金', minWidth: 80 },
-                  { field: 'unitPropName', title: '单位性质', minWidth: 80 },
-                  { field: 'unitKindName', title: '单位类型', minWidth: 80},
-                  { field: 'nameJur1', title: '法人', minWidth: 80 },
-                  { field: 'simCode', title: '联系电话', minWidth: 120 },
-                  {
-                    field: 'reason', title: '退回原因', minWidth: 100, templet: function (row) {
-                      if (row.reason != null) {
-                        return '<span title="' + row.reason + '">' + row.reason + '</span>';
-                      }
-                      return "";
-                    }
-                  },
-                  { title: '操作', width: 100, align: 'center', toolbar: '#currentTableBar', fixed: 'right' }
-                ]],
-                data: self.dataList,
-                done:function(res, curr, count) {
-                  $('tr').css({ 'border': 'none' })
-                  $(".layui-table-main tr").each(function (index, val) {
-                    $($(".layui-table-fixed-l .layui-table-body tbody tr")[index]).height($(val).height());
-                    $($(".layui-table-fixed-r .layui-table-body tbody tr")[index]).height($(val).height());
-                  })
+            { field: 'status', title: '状态', width: '7%' },
+            {
+              field: 'area', title: '所在区县', width: '8%', templet: function (row) {
+                if (row.area != null) {
+                  return '<span title="' + row.area + '">' + row.area + '</span>';
                 }
-              });
-              layui.table.on('tool(' + this.tableName + ')', function (obj) {
-                var event = obj.event;
-                self[event].call(this, obj);
-              });
+                return ""
+              }
             },
-            loadTable_1: function () {
-              var self = this;
-              layui.table.render({
-                elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
-                even: true,
-                cols: [[ // 设置表头
-                  { type: 'numbers', fixed: 'left', align: '5%',title:'序号' , width: 44},
-                  {
-                    field: 'title', title: '单位名称', width: '15%', templet: function (row) {
-                      if (row.title != null) {
-                        return '<span title="' + row.title + '">' + row.title + '</span>';
-                      }
-                      return ""
-                    }
-                  },
-                  { field: 'status', title: '状态', width: '7%' },
-                  {
-                    field: 'area', title: '所在区县', width: '8%', templet: function (row) {
-                      if (row.area != null) {
-                        return '<span title="' + row.area + '">' + row.area + '</span>';
-                      }
-                      return ""
-                    }
-                  },
-                  { field: 'dateFound', title: '成立日期', width: '9%' },
-                  { field: 'amt', title: '注册资金', width: '8%' },
-                  { field: 'unitPropName', title: '单位性质', width: '8%' },
-                  { field: 'unitKindName', title: '单位类型', width: '8%' },
-                  { field: 'nameJur1', title: '法人', width: '7%' },
-                  { field: 'simCode', title: '联系电话', width: '10%' },
-                  {
-                    field: 'reason', title: '退回原因', width: '10%', templet: function (row) {
-                      if (row.reason != null) {
-                        return '<span title="' + row.reason + '">' + row.reason + '</span>';
-                      }
-                      return "";
-                    }
-                  },
-                  { title: '操作', width: '6%', align: 'center', toolbar: '#currentTableBar2' }
-                ]],
-                data: self.dataList,
-                /*        done:function (res,curr,count){
-                       $('tr').css({'background-color':'#ECEDFF','border':'none'})
-                     } */
-              });
-              layui.table.on('tool(' + this.tableName + ')', function (obj) {
-                var event = obj.event;
-                self[event].call(this, obj);
-              });
+            { field: 'dateFound', title: '成立日期', width: '9%' },
+            { field: 'amt', title: '注册资金', width: '8%' },
+            { field: 'unitPropName', title: '单位性质', width: '8%' },
+            { field: 'unitKindName', title: '单位类型', width: '8%' },
+            { field: 'nameJur1', title: '法人', width: '7%' },
+            { field: 'simCode', title: '联系电话', width: '10%' },
+            {
+              field: 'reason', title: '退回原因', width: '10%', templet: function (row) {
+                if (row.reason != null) {
+                  return '<span title="' + row.reason + '">' + row.reason + '</span>';
+                }
+                return "";
+              }
             },
-            loadTable1: function () {
-              var self = this;
-              layui.table.render({
-                elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
-                even: true,
-                cols: [[ // 设置表头
-                  { type: 'numbers', fixed: 'left', align: '5%',title:'序号' , width: 44},
-                  {
-                    field: 'title', title: '单位名称', width: '15%', templet: function (row) {
-                      if (row.title != null) {
-                        return '<span title="' + row.title + '">' + row.title + '</span>';
-                      }
-                      return ""
-                    }
-                  },
-                  { field: 'status', title: '状态', width: '7%' },
-                  {
-                    field: 'area', title: '所在区县', width: '8%', templet: function (row) {
-                      if (row.area != null) {
-                        return '<span title="' + row.area + '">' + row.area + '</span>';
-                      }
-                      return ""
-                    }
-                  },
-                  { field: 'dateFound', title: '成立日期', width: '9%' },
-                  { field: 'amt', title: '注册资金', width: '8%' },
-                  { field: 'unitPropName', title: '单位性质', width: '8%' },
-                  { field: 'unitKindName', title: '单位类型', width: '8%' },
-                  { field: 'nameJur1', title: '法人', width: '7%' },
-                  { field: 'simCode', title: '联系电话', width: '10%' },
-                  {
-                    field: 'reason', title: '退回原因', width: '10%', templet: function (row) {
-                      if (row.reason != null) {
-                        return '<span title="' + row.reason + '">' + row.reason + '</span>';
-                      }
-                      return "";
-                    }
-                  },
-                  { title: '操作', width: '6%', align: 'center', toolbar: '#currentTableBar1' }
-                ]],
-                data: self.dataList,
-              });
-              layui.table.on('tool(' + this.tableName + ')', function (obj) {
-                var event = obj.event;
-                self[event].call(this, obj);
-              });
-            }
-          }
+            { title: '操作', width: '6%', align: 'center', toolbar: '#currentTableBar1' }
+          ]],
+          data: self.dataList,
+        });
+        layui.table.on('tool(' + this.tableName + ')', function (obj) {
+          var event = obj.event;
+          self[event].call(this, obj);
+        });
+      }
+    }
 
 
-        });
-      </script>
-    </body>
+  });
+</script>
+</body>
 
-    </html>
+</html>

projects/src/main/webapp/vmodules/project/monthDetail.jsp

@@ -15,7 +15,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin detail" style="padding: 0 20px 150px;overflow: auto">
         <!-- 内容区域 -->
         <div class="right_title">
             <div class="layui-collapse">

projects/src/main/webapp/vmodules/project/monthReport.jsp

@@ -158,11 +158,11 @@
 <div id="app"></div>
 <template id="template">
     <div>
-        <div class="layui-layout layui-layout-admin">
+        <div class="layui-layout layui-layout-admin pd0">
             <!-- 内容区域 -->
             <div class="right_title">
-                <span class="txt">项目月报</span>
-                <div class="layui-collapse">
+                <div class="txt">项目月报<div class="top-breadcrumb"></div></div>
+                <div class="layui-collapse search_form">
                     <div class="layui-colla-item">
                         <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                         <div class="layui-colla-content layui-show">
@@ -603,6 +603,8 @@
                 } else {
                     self.loadTable([]);
                 }
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
             },
 
 
@@ -1410,6 +1412,12 @@
             },
             choseExport: function () {
                 this.showExport = false;
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     })

projects/src/main/webapp/vmodules/project/weekDetail.jsp

@@ -18,7 +18,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-  <div class="layui-layout layui-layout-admin">
+  <div class="layui-layout layui-layout-admin detail" style="padding: 0 20px 150px;overflow: auto">
     <!-- 内容区域 -->
     <div class="right_title">
       <div class="layui-collapse">

projects/src/main/webapp/vmodules/project/weekReport.jsp

@@ -71,11 +71,11 @@
 <template id="template">
     <div>
     <div>
-        <div class="layui-layout layui-layout-admin">
+        <div class="layui-layout layui-layout-admin pd0">
             <!-- 内容区域 -->
             <div class="right_title">
-                <span class="txt">项目周报</span>
-                <div class="layui-collapse">
+                <div class="txt">项目周报<div class="top-breadcrumb"></div></div>
+                <div class="layui-collapse search_form">
                     <div class="layui-colla-item">
                         <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                         <div class="layui-colla-content layui-show">
@@ -355,7 +355,8 @@
                 } else {
                     self.loadTable([]);
                 }
-
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
             },
             showTitle(obj) {
                 return "附件名称:" + obj.fileName;
@@ -906,6 +907,12 @@
             onSearch() {
                 this.pageNo = 1;
                 this.getData();
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     })

projects/src/main/webapp/vmodules/project/xmzhtj.jsp

@@ -14,7 +14,7 @@
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}" media="all" />
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}" media="all" />
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}" media="all" />
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all" />
+    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style_new.css?version=${version}" media="all"/>
 
     <style>
         .table_box .pagination-box {
@@ -31,10 +31,10 @@
 <body>
 <div id="app">
     <template id="template">
-        <div class="layui-layout layui-layout-admin">
+        <div class="layui-layout layui-layout-admin pd0">
             <div class="right_title">
-                <span class="txt">项目转化统计</span>
-                <div class="layui-collapse">
+                <div class="txt">项目转化统计<div class="top-breadcrumb"></div></div>
+                <div class="layui-collapse search_form">
                     <div class="layui-colla-item">
                         <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                         <div class="layui-colla-content layui-show">
@@ -122,6 +122,8 @@
                     format: 'yyyy-MM',  // 设置显示格式为年-月
                 });
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
             },
             loadPage: function (totalCount) {
                 var self = this;
@@ -170,18 +172,19 @@
                     even: true,
                     cols: [[ // 设置表头
                         { type: 'numbers',  width: 80,title:'序号' },
-                        {field: 'projectDate', title: '月', minWidth: 200},
+                        {field: 'projectDate',align: "center", title: '月', minWidth: 200},
                         {
                             field: 'kind',
-                            title: '类型',
+                            title: '类型'
+                            ,align: "center",
                             minWidth: 200,
                             templet: function (row) {
                                 // 判断 kind 的值，进行转换
                                 return row.kind === '1' ? '正转' : (row.kind === '2' ? '逆转' : '未知');
                             }
                         },
-                        { field: 'title', title: '说明', minWidth: 200 },
-                        { field: 'number', title: '数量', minWidth: 200 },
+                        { field: 'title',align: "center", title: '说明', minWidth: 200 },
+                        { field: 'number',align: "center", title: '数量', minWidth: 200 },
                         { title: '操作', width: 100, align: 'center', toolbar: '#currentTableBar', fixed: 'right' }
                     ]],
                     data: self.dataList,
@@ -301,6 +304,12 @@
                     title: "项目转换统计详情",
                     content: App.getUrl("/tjfx/xmzhtjDetail?kind=" + obj.data.kind + "&title=" + obj.data.title + "&projectDate=" + obj.data.projectDate),
                 });
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

projects/src/main/webapp/vmodules/statics/analysisScreen_four.jsp

@@ -64,6 +64,9 @@
             <img class="img1" src="${WebSite.asset}/images/static/left-img.png" alt="">
             <img class="img2" src="${WebSite.asset}/images/static/right-img4.png" alt="">
             <img class="img3" src="${WebSite.asset}/images/static/bottom-img1.png" alt="">
+            <img  class="img4" src="${WebSite.asset}/images/static/left-bottom-img.png" alt="">
+            <img  class="img5" src="${WebSite.asset}/images/static/right-bottom-img.png" alt="">
+            <div class="bgc-center"></div>
         </div>
         <main class="main">
 
@@ -152,14 +155,14 @@
                             </div>
                             <div class="data-container">
                                 <div class="data-content">
-                                    <p class="data">9</p>
+                                    <p class="data">0</p>
                                     <p class="data-des">项目数(个)</p>
                                 </div>
                                 <img class="data-img" src="${WebSite.asset}/images/static/left-img2.png" alt="">
                             </div>
                             <div class="data-container">
                                 <div class="data-content">
-                                    <p class="data">37.28</p>
+                                    <p class="data">0</p>
                                     <p class="data-des">投资金额(亿元)</p>
                                 </div>
                                 <img class="data-img" src="${WebSite.asset}/images/static/left-img2.png" alt="">
@@ -922,6 +925,14 @@
             myChart3.resize();
             myChart4.resize();
             myChart5.resize();
+            var fontSize = window.innerWidth < 500 ? 12 : 20; // 根据窗口大小调整字体大小
+            myChart.setOption({
+                title: {
+                    textStyle: {
+                        fontSize: fontSize
+                    }
+                }
+            });
         });
 
 

projects/src/main/webapp/vmodules/subIndu/form.jsp

@@ -13,6 +13,15 @@
     body {
         background-color: #ffffff;
     }
+    .layui-btn-back {
+        padding: 6px 26px !important;
+        border-radius: 3px 3px 3px 3px !important;
+        background: #e7dccf !important;
+        font-size: 14px !important;
+        font-weight: 500 !important;
+        color: #FFFFFF !important;
+        cursor: pointer;
+    }
 </style>
 <body>
 <div class="layuimini-container">
@@ -21,14 +30,14 @@
             <div class="layui-form-item">
                 <input type="hidden" id="id" name="id" value="${id}">
             </div>
-            <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+            <%--<div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
                 <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">
                     保存
                 </button>
                 <button type="button" class="layui-btn layui-btn-normal" lay-submit
                         lay-filter="goBack"> 返回
                 </button>
-            </div>
+            </div>--%>
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <label class="layui-form-label">代码</label>
@@ -63,6 +72,14 @@
                     </div>
                 </div>
             </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label"></label>
+                <div class="layui-input-block">
+                    <button type="button" class="layui-btn-submit" lay-submit lay-filter="save">保存</button>
+                    <button type="button" class="layui-btn-back" lay-submit lay-filter="goBack"> 返回</button>
+                </div>
+            </div>
         </div>
     </div>
 </div>

projects/src/main/webapp/vmodules/subIndu/list.jsp

@@ -6,6 +6,8 @@
     <meta charset="UTF-8">
     <title>项目文档的单位设置</title>
     <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+    <jsp:include page="../common/common-css-include.jsp"></jsp:include>
     <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
           media="all"/>
@@ -13,7 +15,7 @@
           media="all"/>
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
           media="all"/>
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all"/>
+<%--    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all"/>--%>
     <style type="text/css">
         .layui-form-pane .layui-form-label {
             width: 160px;
@@ -31,24 +33,15 @@
 </head>
 
 <body>
-<div class="layui-layout layui-layout-admin">
+<div class="layui-layout layui-layout-admin pd0">
     <div class="right_title">
         <span class="txt">行业设置</span>
-        <div class="layui-collapse">
+        <div class="layui-collapse search_form">
             <div class="layui-colla-item">
                 <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                 <div class="layui-colla-content layui-show">
                     <form class="layui-form" lay-filter="searchForm">
                         <div class="layui-row" style="margin-bottom: 30px">
-                            <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                                <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">
-                                    查询
-                                </button>
-                                <button type="button" class="layui-btn layui-btn-normal" lay-submit
-                                      lay-filter="add"> 添加 </button>
-                            </div>
-                        </div>
-                        <div class="layui-row">
                             <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">行业</label>
@@ -57,6 +50,25 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label"></label>
+                                    <div class="layui-input-block">
+                                        <button type="button" class="layui-btn layui-btn-normal" @click="search()">查询
+                                        </button>
+                                       <%-- <span class="morePan" @click="showMore"><a v-if="!showMoreFlag">更多  <ion-icon
+                                                name="chevron-forward-outline"></ion-icon></a><a
+                                                v-if="showMoreFlag">收起 V</a></span>--%>
+                                    </div>
+                                </div>
+                            </div>
+                           <%-- <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">
+                                    查询
+                                </button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit
+                                      lay-filter="add"> 添加 </button>
+                            </div>--%>
                         </div>
                     </form>
                 </div>
@@ -64,11 +76,11 @@
         </div>
     </div>
 
-    <%--      <script type="text/html" id="toolbarDemo">--%>
-    <%--            <div class="layui-btn-container">--%>
-    <%--                <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add"> 添加 </button>--%>
-    <%--            </div>--%>
-    <%--        	</script>--%>
+          <script type="text/html" id="toolbarDemo">
+                <div class="layui-btn-container">
+                    <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add"> 添加 </button>
+                </div>
+            	</script>
 
     <div class="table_box" style="padding-top: 0;">
         <div class="table_process">
@@ -169,8 +181,8 @@
                 layui.table.render({
                     elem: "#" + _tableName, // 指定原始表格元素选择器（推荐id选择器）
                     even: true,
-                    // toolbar: '#toolbarDemo',
-                    // defaultToolbar: [],
+                     toolbar: '#toolbarDemo',
+                     defaultToolbar: [],
                     cols: [[ // 设置表头
                         {type: 'numbers', title: '序号', align: 'center', minwidth: 50},
                         {field: 'code', title: '代码', minwidth: 138},

projects/src/main/webapp/vmodules/subject/log/list.jsp

@@ -15,12 +15,11 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
-            <span class="txt">操作日志查询</span>
-<%--            <button class="btn btn_add" @click="add"><i class="layui-icon layui-icon-add-circle"></i> 新增</button>--%>
-            <div class="layui-collapse">
+            <div class="txt">日志查询<div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -42,7 +41,7 @@
                                         <label class="layui-form-label">类型</label>
                                         <div class="layui-input-block">
                                             <select name="type" lay-filter="status" id="status" >
-<%--                                                <option value="">所有</option>--%>
+                                                <%--                                                <option value="">所有</option>--%>
                                                 <option value="1">基本信息</option>
                                                 <option value="2">月报</option>
                                                 <option value="3">年度计划</option>
@@ -62,12 +61,30 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">所属行业</label>
+                                        <div class="layui-input-block">
+                                            <select name="hyfl" lay-search="">
+                                                <option value="">请选择</option>
+                                                <c:forEach items="${HYFL }" var="hy">
+                                                    <c:if test="${indusKind == hy.title}">
+                                                        <option value="${hy.id }" selected="selected">${hy.title }</option>
+                                                    </c:if>
+                                                    <c:if test="${indusKind != hy.title}">
+                                                        <option value="${hy.id }">${hy.title }</option>
+                                                    </c:if>
+                                                </c:forEach>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
 
                             <div class="layui-row">
-                              <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">建设地点</label>
+                                        <label class="layui-form-label">隶属关系</label>
                                         <div class="layui-input-block">
                                             <select name="jsdd">
                                                 <option value="">请选择</option>
@@ -97,55 +114,45 @@
                                         </div>
                                     </div>
                                 </div>
-
                                 <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">所属行业</label>
-                                        <div class="layui-input-block">
-                                            <select name="hyfl" lay-search="">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${HYFL }" var="hy">
-                                                    <c:if test="${indusKind == hy.title}">
-                                                        <option value="${hy.id }" selected="selected">${hy.title }</option>
-                                                    </c:if>
-                                                    <c:if test="${indusKind != hy.title}">
-                                                        <option value="${hy.id }">${hy.title }</option>
-                                                    </c:if>
-                                                </c:forEach>
-                                            </select>
+                                        <label class="layui-form-label">说明</label>
+                                        <div class="layui-input-block time_box">
+                                            <input type="text" name="shuoMing" placeholder="请输入" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
+
                             </div>
                             <div class="layui-row">
-<%--                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label">差额</label>--%>
-<%--                                        <div class="layui-input-block time_box">--%>
-<%--                                            <select name="ce" lay-filter="ce" id="ce" >--%>
-<%--                                                <option value="">所有</option>--%>
-<%--                                                <option value="1">仅显示有差额的</option>--%>
-<%--                                            </select>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-<%--                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label">排序</label>--%>
-<%--                                        <div class="layui-input-block time_box">--%>
-<%--                                            <select name="sort" lay-filter="sort" id="sort" >--%>
-<%--                                                <option value="">金额</option>--%>
-<%--                                                <option value="last_update_time">修改时间</option>--%>
-<%--                                            </select>--%>
-<%--                                            <select name="sortField" lay-filter="sortField" id="sortField" >--%>
-<%--                                                <option value="asc">升序</option>--%>
-<%--                                                <option value="desc">降序</option>--%>
-<%--                                            </select>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
+                                <%--                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">--%>
+                                <%--                                    <div class="layui-form-item">--%>
+                                <%--                                        <label class="layui-form-label">差额</label>--%>
+                                <%--                                        <div class="layui-input-block time_box">--%>
+                                <%--                                            <select name="ce" lay-filter="ce" id="ce" >--%>
+                                <%--                                                <option value="">所有</option>--%>
+                                <%--                                                <option value="1">仅显示有差额的</option>--%>
+                                <%--                                            </select>--%>
+                                <%--                                        </div>--%>
+                                <%--                                    </div>--%>
+                                <%--                                </div>--%>
+                                <%--                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">--%>
+                                <%--                                    <div class="layui-form-item">--%>
+                                <%--                                        <label class="layui-form-label">排序</label>--%>
+                                <%--                                        <div class="layui-input-block time_box">--%>
+                                <%--                                            <select name="sort" lay-filter="sort" id="sort" >--%>
+                                <%--                                                <option value="">金额</option>--%>
+                                <%--                                                <option value="last_update_time">修改时间</option>--%>
+                                <%--                                            </select>--%>
+                                <%--                                            <select name="sortField" lay-filter="sortField" id="sortField" >--%>
+                                <%--                                                <option value="asc">升序</option>--%>
+                                <%--                                                <option value="desc">降序</option>--%>
+                                <%--                                            </select>--%>
+                                <%--                                        </div>--%>
+                                <%--                                    </div>--%>
+                                <%--                                </div>--%>
 
- 								<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">项目单位名称</label>
                                         <div class="layui-input-block">
@@ -158,34 +165,25 @@
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">项目名称</label>
                                         <div class="layui-input-block">
-                                                <input type="text" name="subName" placeholder="请输入" autocomplete="off" class="layui-input">
+                                            <input type="text" name="subName" placeholder="请输入" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
-
-                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
+                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md4" style="float: right">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">说明</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" name="shuoMing" placeholder="请输入" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                           </div>
-
-                           <div class="layui-row">
-                           		<div class="layui-col-xs6 layui-col-sm6 layui-col-md6">
-                           		 	<button type="button" class="layui-btn layui-btn-normal" @click="search">查询</button>
-                           		</div>
-                               <div class="layui-col-xs6 layui-col-sm6 layui-col-md4" style="float: right">
-                                     <div class="layui-form-item">
                                         <label class="layui-form-label">金额合计(万元)</label>
                                         <div class="layui-input-block">
-                                           <input type="text" placeholder="" disabled="disabled" autocomplete="off" class="layui-input" v-model="amtSum">
+                                            <input type="text" placeholder="" disabled="disabled" autocomplete="off" class="layui-input" v-model="amtSum">
                                         </div>
-                                     </div>
+                                    </div>
                                 </div>
-                           </div>
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6">
+                                    <button type="button" class="layui-btn layui-btn-normal" @click="search">查询</button>
+                                </div>
+                            </div>
+
                         </form>
                     </div>
                 </div>
@@ -203,6 +201,7 @@
 
 
 
+
 </template>
 <script type="text/html" id="subName">
     <span title="{{d.subName}}">{{d.subName}}</span>
@@ -261,6 +260,8 @@
                 });
                 this.getData();
                 //window.toDetail = this.toDetail;
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
             },
             getData : function(){
                 var self = this;
@@ -393,6 +394,12 @@
             search : function(){
                 this.pageNo = 1;
                 this.getData();
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

projects/src/main/webapp/vmodules/subject/subInfo/report.jsp

@@ -20,12 +20,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-	<div class="layui-layout layui-layout-admin">
+	<div class="layui-layout layui-layout-admin pd0">
 		<!-- 内容区域 -->
 			<div class="right_title">
-				<span class="txt">项目信息申报</span>
+				<span class="txt">项目信息申报<div class="top-breadcrumb"></div></span>
 <%--				<button class="btn btn_add" @click="add">新增</button>--%>
-				<div class="layui-collapse">
+				<div class="layui-collapse search-form">
 					<div class="layui-colla-item">
 						<%--                    <h2 class="layui-colla-title">筛选</h2>--%>
 						<div class="layui-colla-content layui-show">

projects/src/main/webapp/vmodules/subject/subInfo/report_department.jsp

@@ -66,7 +66,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--    <span class="txt">按部门统计</span>--%>
@@ -146,7 +146,7 @@
 
 
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item" style="display: flex">
                     <label class="juli">
                         已办理件数<span class="lanse-first">{{beginRate.doNum||"--"}}</span>

projects/src/main/webapp/vmodules/subject/subInfo/report_file.jsp

@@ -83,7 +83,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-	<div class="layui-layout layui-layout-admin">
+	<div class="layui-layout layui-layout-admin pd0">
 		<!-- 内容区域 -->
 		<div class="right_title">
 		<%--	<span class="txt">按办理手续统计</span>--%>
@@ -163,7 +163,7 @@
 
 
 		<div>
-			<div class="layui-row">
+			<div class="layui-row class_ls">
 				<div class="layui-form-item" style="display: flex">
 					<label class="juli">
 						已办理件数<span class="lanse-first">{{beginRate.doNum||"--"}}</span>

projects/src/main/webapp/vmodules/subject/subInfo/report_project.jsp

@@ -83,7 +83,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--    <span class="txt">按部门统计</span>--%>
@@ -163,7 +163,7 @@
 
 
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item" style="display: flex">
                     <label class="juli">
                         已办理件数<span class="lanse-first">{{beginRate.needNum!==undefined?beginRate.finshNum:"--"}}</span>

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend.jsp

@@ -88,13 +88,13 @@
 </script>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
-            <div class="txt" style="width: 100%;text-align: center">在建项目库</div>
+            <div class="txt">在建项目库<div class="top-breadcrumb"></div></div>
             <%--           <span class="txt">续建项目库</span>--%>
-            <div class="layui-collapse">
+            <div class="layui-collapse search-form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -211,12 +211,12 @@
 <%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
 <%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
 <%--                                            </button>--%>
-                                            <button type="button" class="layui-btn layui-btn-norma"
+                                            <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>--%>
                                         </div>
                                     </div>
                                 </div>
@@ -232,7 +232,7 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -261,13 +261,13 @@
                         </label>
                     </div>
 
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.title,item.code)"
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.title,item.code)"
                                v-for="(item, index) in beginRate.indusKindList" :key="index">
@@ -279,6 +279,16 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative;">
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportFixDetailExcel">项目明细导出</button>
+                        <button type="button" class="" @click="exportFixTotalExcel">项目汇总导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test" style="position: relative;"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -711,6 +721,9 @@
                         , multiple: false //允许上传多个文件
                     });
                     this.getData();
+
+                    window.addEventListener('message', this.receiveMessage, false);
+                    window.parent.postMessage('init loaded')
                     window.toDetail = this.toDetail;
                     window.toVideo = this.toVideo;
                     $(".hiddenParams").show();
@@ -1346,6 +1359,12 @@
                 choseExport: function () {
                     this.showExport = false;
                     console.log('移出了')
+                },
+                receiveMessage (e) {
+                    console.log('cb receiveMessage: ', e.data)
+                    if (e.data.topBreadcrumb) {
+                        $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                    }
                 }
             }
         });

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend_sum.jsp

@@ -74,7 +74,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
@@ -341,7 +341,7 @@
             </div>--%>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -377,13 +377,13 @@
                             </div>
                         </label>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
                                v-for="(item, index) in beginRate.jsddList" :key="index">
                             {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
                         </label>
                     </div>
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
                                v-for="(item, index) in beginRate.hyflList" :key="index">

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new.jsp

@@ -87,13 +87,13 @@
 </script>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
-                <div class="txt" style="width: 100%;text-align: center">新建项目库</div>
+                <div class="txt">新建项目库<div class="top-breadcrumb"></div></div>
  <%--           <span class="txt">新建项目库</span>--%>
-            <div class="layui-collapse">
+            <div class="layui-collapse search-form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -209,12 +209,12 @@
 <%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
 <%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
 <%--                                            </button>--%>
-                                            <button type="button" class="layui-btn layui-btn-norma"
+                                            <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>--%>
                                         </div>
                                     </div>
                                 </div>
@@ -230,7 +230,7 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -242,7 +242,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            开工数<span class="lanse-first">{{beginRate.kgTotal}}</span>
+                            开工数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.kgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -258,13 +258,13 @@
                             </div>
                         </label>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.title,item.code)"
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.title,item.code)"
                                v-for="(item, index) in beginRate.indusKindList" :key="index">
@@ -276,6 +276,16 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative;">
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportFixDetailExcel">项目明细导出</button>
+                        <button type="button" class="" @click="exportFixTotalExcel">项目汇总导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test" style="position: relative;"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -707,6 +717,9 @@
                         , multiple: false //允许上传多个文件
                     });
                     this.getData();
+
+                    window.addEventListener('message', this.receiveMessage, false);
+                    window.parent.postMessage('init loaded')
                     window.toDetail = this.toDetail;
                     window.toVideo = this.toVideo;
                     $(".hiddenParams").show();
@@ -1341,6 +1354,12 @@
                 choseExport: function () {
                     this.showExport = false;
                     console.log('移出了')
+                },
+                receiveMessage (e) {
+                    console.log('cb receiveMessage: ', e.data)
+                    if (e.data.topBreadcrumb) {
+                        $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                    }
                 }
             }
         });

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new_sum.jsp

@@ -74,7 +74,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
@@ -341,7 +341,7 @@
             </div>--%>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -402,13 +402,13 @@
                              </div>
                          </label>--%>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
                                v-for="(item, index) in beginRate.jsddList" :key="index">
                             {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
                         </label>
                     </div>
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
                                v-for="(item, index) in beginRate.hyflList" :key="index">

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve.jsp

@@ -87,13 +87,13 @@
 </script>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
-            <div class="txt" style="width: 100%;text-align: center">储备项目库</div>
+            <div class="txt">储备项目库<div class="top-breadcrumb"></div></div>
             <%--           <span class="txt">储备项目库</span>--%>
-            <div class="layui-collapse">
+            <div class="layui-collapse search-form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -214,12 +214,12 @@
 <%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
 <%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
 <%--                                            </button>--%>
-                                            <button type="button" class="layui-btn layui-btn-norma"
+                                            <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>--%>
                                         </div>
                                     </div>
                                 </div>
@@ -235,7 +235,7 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -247,7 +247,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            A类项目数<span class="lanse-first">{{beginRate.atotal}}</span>
+                            A类项目数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.atotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -255,7 +255,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            B类项目数<span class="lanse-first">{{beginRate.btotal}}</span>
+                            B类项目数<span class="lanse-first" style="color: #E0534E">{{beginRate.btotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
@@ -263,7 +263,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            C类项目数<span class="lanse-first">{{beginRate.ctotal}}</span>
+                            C类项目数<span class="lanse-first" style="color: #ff0d56">{{beginRate.ctotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
@@ -287,14 +287,14 @@
                             </div>
                         </label>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.title,item.code)"
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
 
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.title,item.code)"
                                v-for="(item, index) in beginRate.indusKindList" :key="index">
@@ -307,6 +307,16 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative;">
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportFixDetailExcel">项目明细导出</button>
+                        <button type="button" class="" @click="exportFixTotalExcel">项目汇总导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test" style="position: relative;"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -735,6 +745,9 @@
                         , multiple: false //允许上传多个文件
                     });
                     this.getData();
+
+                    window.addEventListener('message', this.receiveMessage, false);
+                    window.parent.postMessage('init loaded')
                     window.toDetail = this.toDetail;
                     window.toVideo = this.toVideo;
                     $(".hiddenParams").show();
@@ -1312,6 +1325,12 @@
                 choseExport: function () {
                     this.showExport = false;
                     console.log('移出了')
+                },
+                receiveMessage (e) {
+                    console.log('cb receiveMessage: ', e.data)
+                    if (e.data.topBreadcrumb) {
+                        $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                    }
                 }
             }
         });

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve_sum.jsp

@@ -74,14 +74,14 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
                 <div class="txt" style="width: 100%;text-align: center">储备项目库</div>
             <div style="width: 100%;text-align: center">${tips}</div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -134,13 +134,13 @@
                             </div>
                         </label>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
                                v-for="(item, index) in beginRate.jsddList" :key="index">
                             {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
                         </label>
                     </div>
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
                                v-for="(item, index) in beginRate.hyflList" :key="index">

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum.jsp

@@ -87,13 +87,13 @@
 </script>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
-            <div class="txt" style="width: 100%;text-align: center">投产项目库</div>
+            <div class="txt">投产项目库<div class="top-breadcrumb"></div></div>
             <%--           <span class="txt">续建项目库</span>--%>
-            <div class="layui-collapse">
+            <div class="layui-collapse search-form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -210,12 +210,12 @@
 <%--                                            <button type="button" class="layui-btn layui-btn-norma"--%>
 <%--                                                    style="margin-left: 20px" @click="uploadProject">导入--%>
 <%--                                            </button>--%>
-                                            <button type="button" class="layui-btn layui-btn-norma"
+                                            <button type="button" class="layui-btn layui-btn-normal"
                                                     style="margin-left: 20px"
                                                     @click="subInfoToSubFix">自动抓取
                                             </button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>
-                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixTotalExcel">项目汇总导出</button>--%>
+<%--                                            <button type="button" class="layui-btn layui-btn-norma" style="margin-left: 20px" @click="exportFixDetailExcel">项目明细导出</button>--%>
                                         </div>
                                     </div>
                                 </div>
@@ -231,7 +231,7 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -275,13 +275,13 @@
                             </div>
                         </label>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.title,item.code)"
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.title,item.code)"
                                v-for="(item, index) in beginRate.indusKindList" :key="index">
@@ -293,6 +293,16 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative;">
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportFixDetailExcel">项目明细导出</button>
+                        <button type="button" class="" @click="exportFixTotalExcel">项目汇总导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test" style="position: relative;"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -723,6 +733,9 @@
                         , multiple: false //允许上传多个文件
                     });
                     this.getData();
+
+                    window.addEventListener('message', this.receiveMessage, false);
+                    window.parent.postMessage('init loaded')
                     window.toDetail = this.toDetail;
                     window.toVideo = this.toVideo;
                     $(".hiddenParams").show();
@@ -1363,6 +1376,12 @@
                 choseExport: function () {
                     this.showExport = false;
                     console.log('移出了')
+                },
+                receiveMessage (e) {
+                    console.log('cb receiveMessage: ', e.data)
+                    if (e.data.topBreadcrumb) {
+                        $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                    }
                 }
             }
         });

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum_sum.jsp

@@ -74,7 +74,7 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
@@ -341,7 +341,7 @@
             </div>--%>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
@@ -436,7 +436,7 @@
                             </div>
                         </label>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
+                    <div style="display: flex;margin-bottom: 3px" class="second_line">
 
                         <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
                                v-for="(item, index) in beginRate.tzlxList" :key="index">
@@ -447,7 +447,7 @@
                             {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
                         </label>
                     </div>
-                    <div style="margin-bottom: 3px">
+                    <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
                                @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
                                v-for="(item, index) in beginRate.hyflList" :key="index">

projects/src/main/webapp/vmodules/sysTable/list.jsp

@@ -1,235 +1,252 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-  <!DOCTYPE html>
-  <html>
+<!DOCTYPE html>
+<html>
 
-  <head>
-    <meta charset="UTF-8">
-    <title>系统参数</title>
-    <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
-    <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
-      <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
+<head>
+  <meta charset="UTF-8">
+  <title>系统参数</title>
+  <jsp:include page="../common/common-meta-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-js-include.jsp"></jsp:include>
+  <jsp:include page="../common/common-css-include.jsp"></jsp:include>
+  <%-- <jsp:include page="../common/common-css-include.jsp"></jsp:include> --%>
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
         media="all" />
-      <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}"
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.5.5/css/public.css?version=${version}"
         media="all" />
-                <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
-          media="all" />
-        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all"/>
-  </head>
+  <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/layui-v2.6.5/css/layui.css?version=${version}"
+        media="all" />
+  <%--        <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all"/>--%>
+</head>
 
-  <body>
-    <div class="layui-layout layui-layout-admin">
-        <div class="right_title">
-          <span class="txt">系统参数设置</span>
-          <div class="layui-collapse">
-            <div class="layui-colla-item">
-              <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
-              <div class="layui-colla-content layui-show">
-                <form class="layui-form" lay-filter="searchForm">
-                  <div class="layui-row">
-                    <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                      <div class="layui-form-item">
-                        <label class="layui-form-label">名称</label>
-                        <div class="layui-input-block">
-                          <input type="text" name="title" autocomplete="off" class="layui-input">
-                        </div>
-                      </div>
-                    </div>
+<body>
+<div class="layui-layout layui-layout-admin pd0">
+  <div class="right_title">
+    <span class="txt">系统参数设置<div class="top-breadcrumb"></div></span>
+    <div class="layui-collapse search_form">
+      <div class="layui-colla-item">
+        <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
+        <div class="layui-colla-content layui-show">
+          <form class="layui-form" lay-filter="searchForm">
+            <div class="layui-row">
+              <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                <div class="layui-form-item">
+                  <label class="layui-form-label">名称</label>
+                  <div class="layui-input-block">
+                    <input type="text" name="title" autocomplete="off" class="layui-input">
+                  </div>
+                </div>
+              </div>
 
-                    <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                      <button type="button" class="layui-btn layui-btn-normal" lay-submit
-                        lay-filter="search">查询</button>
-                    </div>
+              <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
+                <div class="layui-form-item">
+                  <label class="layui-form-label"></label>
+                  <div class="layui-input-block">
+                    <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">查询
+                    </button>
+                    <%--<span class="morePan" @click="showMore"><a v-if="!showMoreFlag">更多  <ion-icon
+                            name="chevron-forward-outline"></ion-icon></a><a
+                            v-if="showMoreFlag">收起 V</a></span>--%>
                   </div>
-                </form>
+                </div>
               </div>
             </div>
-          </div>
+          </form>
         </div>
+      </div>
+    </div>
+  </div>
 
-        <script type="text/html" id="toolbarDemo">
-          <div class="layui-btn-container">
-              <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add"> 添加 </button>
-          </div>
-        </script>
+  <script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+      <button class="layui-btn layui-btn-add layui-btn-sm data-add-btn" lay-event="add"> 添加 </button>
+    </div>
+  </script>
 
-        <div class="table_box" style="padding-top: 0;">
-          <div class="table_process">
-            <table id="sysTable" lay-filter="sysTable"></table>
-            <div class="pagination-box" id="pagination"></div>
-          </div>
-        </div>
+  <div class="table_box" style="padding-top: 0;">
+    <div class="table_process">
+      <table id="sysTable" lay-filter="sysTable"></table>
+      <div class="pagination-box" id="pagination"></div>
+    </div>
+  </div>
 
-        <script type="text/html" id="kind">
-          {{# if(d.kind == 'YQTS'){ }}
-            <span title="延期天数">延期天数</span>
-          {{# } else if(d.kind == 'APPVERSION'){ }}
-            <span title="APP最新版本">APP最新版本</span>
-          {{# } else if(d.kind == 'OPEN_MSG'){ }}
-            <span title="短信服务">短信服务</span>
-          {{# } else if(d.kind == 'MSG1') { }}
-            <span title="短信发送时间：项目即将逾期-平台录入人">短信发送时间：项目即将逾期-平台录入人</span>
-          {{# } else if(d.kind == 'MSG2') { }}
-            <span title="短信发送时间：项目已逾期X天-平台录入人,项目负责人">短信发送时间：项目已逾期X天-平台录入人,项目负责人</span>
-          {{# } else if(d.kind == 'MSG3') { }}
-            <span title="短信发送时间：项目已逾期X天-平台录入人,项目负责人,监管单位负责人">短信发送时间：项目已逾期X天-平台录入人,项目负责人,监管单位负责人</span>
-          {{# } else if(d.kind == 'MSG4') { }}
-            <span title="短信发送时间：项目手续即将逾期-平台录入人">短信发送时间：项目手续即将逾期-平台录入人</span>
-          {{# } else if(d.kind == 'MSG5') { }}
-            <span title="短信发送时间：项目手续已经逾期-平台录入人,项目负责人,监管单位负责人">短信发送时间：项目手续已经逾期-平台录入人,项目负责人,监管单位负责人</span>
-          {{# } else if(d.kind == 'MSG6') { }}
-            <span title="短信发送时间：项目开工-平台录入人">短信发送时间：项目开工-平台录入人</span>
-          {{# } else if(d.kind == 'MSG7') { }}
-            <span title="短信发送时间：项目开工-平台录入人,项目负责人,监管单位负责人">短信发送时间：项目开工-平台录入人,项目负责人,监管单位负责人</span>
-          {{# } else if(d.kind == 'MSG8') { }}
-            <span title="短信发送偏离度范围：项目偏离度范围-平台录入人">短信发送偏离度范围：项目偏离度范围-平台录入人</span>
-          {{# } else if(d.kind == 'MSG9') { }}
-            <span title="短信发送偏离度范围：项目偏离度范围-平台录入人,项目负责人,监管单位负责人">短信发送偏离度范围：项目偏离度范围-平台录入人,项目负责人,监管单位负责人</span>
-          {{# } else if(d.kind == 'YEAR_FIX') { }}
-          <span title="当前固定资产投资年度">当前固定资产投资年度</span>
-          {{#}}}
-        </script>
+  <script type="text/html" id="kind">
+    {{# if(d.kind == 'YQTS'){ }}
+    <span title="延期天数">延期天数</span>
+    {{# } else if(d.kind == 'APPVERSION'){ }}
+    <span title="APP最新版本">APP最新版本</span>
+    {{# } else if(d.kind == 'OPEN_MSG'){ }}
+    <span title="短信服务">短信服务</span>
+    {{# } else if(d.kind == 'MSG1') { }}
+    <span title="短信发送时间：项目即将逾期-平台录入人">短信发送时间：项目即将逾期-平台录入人</span>
+    {{# } else if(d.kind == 'MSG2') { }}
+    <span title="短信发送时间：项目已逾期X天-平台录入人,项目负责人">短信发送时间：项目已逾期X天-平台录入人,项目负责人</span>
+    {{# } else if(d.kind == 'MSG3') { }}
+    <span title="短信发送时间：项目已逾期X天-平台录入人,项目负责人,监管单位负责人">短信发送时间：项目已逾期X天-平台录入人,项目负责人,监管单位负责人</span>
+    {{# } else if(d.kind == 'MSG4') { }}
+    <span title="短信发送时间：项目手续即将逾期-平台录入人">短信发送时间：项目手续即将逾期-平台录入人</span>
+    {{# } else if(d.kind == 'MSG5') { }}
+    <span title="短信发送时间：项目手续已经逾期-平台录入人,项目负责人,监管单位负责人">短信发送时间：项目手续已经逾期-平台录入人,项目负责人,监管单位负责人</span>
+    {{# } else if(d.kind == 'MSG6') { }}
+    <span title="短信发送时间：项目开工-平台录入人">短信发送时间：项目开工-平台录入人</span>
+    {{# } else if(d.kind == 'MSG7') { }}
+    <span title="短信发送时间：项目开工-平台录入人,项目负责人,监管单位负责人">短信发送时间：项目开工-平台录入人,项目负责人,监管单位负责人</span>
+    {{# } else if(d.kind == 'MSG8') { }}
+    <span title="短信发送偏离度范围：项目偏离度范围-平台录入人">短信发送偏离度范围：项目偏离度范围-平台录入人</span>
+    {{# } else if(d.kind == 'MSG9') { }}
+    <span title="短信发送偏离度范围：项目偏离度范围-平台录入人,项目负责人,监管单位负责人">短信发送偏离度范围：项目偏离度范围-平台录入人,项目负责人,监管单位负责人</span>
+    {{# } else if(d.kind == 'YEAR_FIX') { }}
+    <span title="当前固定资产投资年度">当前固定资产投资年度</span>
+    {{#}}}
+  </script>
 
-        <script type="text/html" id="currentTableBar">
-          <div class="toolBar"><span lay-event="edit">编辑</span></div>
-          <!-- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="del">删除</a> -->
-       	</script>
-    </div>
+  <script type="text/html" id="currentTableBar">
+    <div class="toolBar"><span lay-event="edit">编辑</span></div>
+    <!-- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="del">删除</a> -->
+  </script>
+</div>
 
-    <jsp:include page="../common/common-js-include.jsp"></jsp:include>
-    <script type="text/javascript">
-      App.namespace("App.projects.sysTable");
-      (function ($, mod) {
-        mod = mod || {}; //对象声明
+<jsp:include page="../common/common-js-include.jsp"></jsp:include>
+<script type="text/javascript">
+  App.namespace("App.projects.sysTable");
+  (function ($, mod) {
+    mod = mod || {}; //对象声明
 
-        // ---------------变量声明--------------
-        var _table = layui.table,
-          _form = layui.form,
-          pageNo = 1,
-          pageSize = 10,
-          _toolbar = layui.toolbar,
-          _tableName = "sysTable";
+    // ---------------变量声明--------------
+    var _table = layui.table,
+            _form = layui.form,
+            pageNo = 1,
+            pageSize = 10,
+            _toolbar = layui.toolbar,
+            _tableName = "sysTable";
 
-        mod.options = mod.options || {}; // 成员变量
+    mod.options = mod.options || {}; // 成员变量
 
-        // ---------------私有方法定义---------------
-        var methods = {
-          init: function () {
-            //单行监听
-            _table.on("tool(" + _tableName + ")", function (obj) {
-              methods[obj.event].call(this, obj);
-            });
-            // 工具栏监听
-            _table.on("toolbar(" + _tableName + ")", function (obj) {
-              methods[obj.event].call(this, obj);
-            });
-            _form.on("submit(search)", function () {
-              methods.search();
-            });
-            methods.getData();
-          },
-          add: function (obj) {
-            App.openLayer({
-              title: "新增参数",
-              content: App.getUrl("/sysTable/add"),
-              height: "600",
-              width: "800"
-            });
-          },
-          edit: function (obj) {
-            App.openLayer({
-              title: "编辑参数",
-              content: App.getUrl("/sysTable/add?id=" + obj.data.id),
-              height: "380",
-              width: "400"
-            });
-          },
-          del: function (obj) {
-            App.msg.confirm("确定删除该参数吗？", function () {
-              App.postJson("/api/sysTable/del", { id: obj.data.id }, function (res) {
-                if (res.success) methods.reload();
-              });
-            });
-          },
-          getData: function () {
-            var searchForm = _form.val("searchForm");
-            searchForm.pageNo = pageNo;
-            searchForm.pageSize = pageSize;
-            App.postJson("/api/sysTable/list", searchForm, function (res) {
-              methods.initTable(res.rows);
-              methods.loadPage(res.total);
-            });
-          },
-          initTable: function (data) {
-            layui.table.render({
-              elem: "#" + _tableName, // 指定原始表格元素选择器（推荐id选择器）
-              even: true,
-              toolbar: '#toolbarDemo',
-              defaultToolbar: [],
-              cols: [[ // 设置表头
-                { type: 'numbers', title: '序号',width:44, align: 'center' },
-                { field: 'kind', title: '类型', minWidth: 80, align: 'center', templet: '#kind' },
-                { field: 'code', title: '代码', minWidth: 80, align: 'center' },
-                {
-                  field: 'title', title: '名称', minWidth: 80, width: '25%', align: 'center', templet: function (row) {
-                    if (row.title != null) {
-                      return '<span title="' + row.title + '">' + row.title + '</span>';
-                    }
-                    return "";
-                  }
-                },
-                {
-                  field: 'remark', title: '备注', minWidth: 233, align: 'center', templet: function (row) {
-                    if (row.remark != null) {
-                      return '<span title="' + row.remark + '">' + row.remark + '</span>';
-                    }
-                    return "";
-                  }
-                },
-                { title: '操作', width: 70, align: 'center', toolbar: '#currentTableBar', fixed: 'right' }
-              ]],
-              limit: pageSize,
-              data: data
-            });
-            layui.table.on('tool(' + _tableName + ')', function (obj) {
-              var event = obj.event;
-              methods[event].call(this, obj);
-            });
-          },
-          loadPage: function (totalCount) {
-            var self = this;
-            layui.laypage.render({
-              elem: 'pagination',
-              count: totalCount,
-              curr: pageNo,
-              limit: pageSize,
-              layout: ['count', 'prev', 'page', 'next', 'skip'],
-              jump: function (obj, first) {
-                //首次不执行
-                if (!first) {
-                  pageNo = obj.curr;
-                  methods.getData();
+    // ---------------私有方法定义---------------
+    var methods = {
+      init: function () {
+        //单行监听
+        _table.on("tool(" + _tableName + ")", function (obj) {
+          methods[obj.event].call(this, obj);
+        });
+        // 工具栏监听
+        _table.on("toolbar(" + _tableName + ")", function (obj) {
+          methods[obj.event].call(this, obj);
+        });
+        _form.on("submit(search)", function () {
+          methods.search();
+        });
+        methods.getData();
+        window.addEventListener('message',methods.receiveMessage,false);
+        window.parent.postMessage('init loaded');
+      },
+      receiveMessage(e){
+        if(e.data.topBreadcrumb){
+          $('.top-breadcrumb').html(e.data.topBreadcrumb);
+        }
+      },
+      add: function (obj) {
+        App.openLayer({
+          title: "新增参数",
+          content: App.getUrl("/sysTable/add"),
+          height: "600",
+          width: "800"
+        });
+      },
+      edit: function (obj) {
+        App.openLayer({
+          title: "编辑参数",
+          content: App.getUrl("/sysTable/add?id=" + obj.data.id),
+          height: "380",
+          width: "400"
+        });
+      },
+      del: function (obj) {
+        App.msg.confirm("确定删除该参数吗？", function () {
+          App.postJson("/api/sysTable/del", { id: obj.data.id }, function (res) {
+            if (res.success) methods.reload();
+          });
+        });
+      },
+      getData: function () {
+        var searchForm = _form.val("searchForm");
+        searchForm.pageNo = pageNo;
+        searchForm.pageSize = pageSize;
+        App.postJson("/api/sysTable/list", searchForm, function (res) {
+          methods.initTable(res.rows);
+          methods.loadPage(res.total);
+        });
+      },
+      initTable: function (data) {
+        layui.table.render({
+          elem: "#" + _tableName, // 指定原始表格元素选择器（推荐id选择器）
+          even: true,
+          toolbar: '#toolbarDemo',
+          defaultToolbar: [],
+          cols: [[ // 设置表头
+            { type: 'numbers', title: '序号',width:44, align: 'center' },
+            { field: 'kind', title: '类型', minWidth: 80, align: 'center', templet: '#kind' },
+            { field: 'code', title: '代码', minWidth: 80, align: 'center' },
+            {
+              field: 'title', title: '名称', minWidth: 80, width: '25%', align: 'center', templet: function (row) {
+                if (row.title != null) {
+                  return '<span title="' + row.title + '">' + row.title + '</span>';
+                }
+                return "";
+              }
+            },
+            {
+              field: 'remark', title: '备注', minWidth: 233, align: 'center', templet: function (row) {
+                if (row.remark != null) {
+                  return '<span title="' + row.remark + '">' + row.remark + '</span>';
                 }
+                return "";
               }
-            });
-          },
-          search: function () {
-            pageNo = 1;
-            methods.getData();
+            },
+            { title: '操作', width: 70, align: 'center', toolbar: '#currentTableBar', fixed: 'right' }
+          ]],
+          limit: pageSize,
+          data: data
+        });
+        layui.table.on('tool(' + _tableName + ')', function (obj) {
+          var event = obj.event;
+          methods[event].call(this, obj);
+        });
+      },
+      loadPage: function (totalCount) {
+        var self = this;
+        layui.laypage.render({
+          elem: 'pagination',
+          count: totalCount,
+          curr: pageNo,
+          limit: pageSize,
+          layout: ['count', 'prev', 'page', 'next', 'skip'],
+          jump: function (obj, first) {
+            //首次不执行
+            if (!first) {
+              pageNo = obj.curr;
+              methods.getData();
+            }
           }
-        };
-        // ---------------成员方法定义---------------
-        mod.list = methods;
-
-        // ---------------初始化---------------
-        $(function () {
-          methods.init();
         });
+      },
+      search: function () {
+        pageNo = 1;
+        methods.getData();
+      }
+    };
+    // ---------------成员方法定义---------------
+    mod.list = methods;
+
+    // ---------------初始化---------------
+    $(function () {
+      methods.init();
+    });
 
-        // 开放公共方法给子页面自动调用，由App.js来完成调用，子页面无需特殊处理
-        App.addReloadEvent(methods.getData);
+    // 开放公共方法给子页面自动调用，由App.js来完成调用，子页面无需特殊处理
+    App.addReloadEvent(methods.getData);
 
-      })(jQuery, App.projects.sysTable)
-    </script>
-  </body>
+  })(jQuery, App.projects.sysTable)
+</script>
+</body>
 
-  </html>
+</html>

projects/src/main/webapp/vmodules/top.jsp

@@ -95,11 +95,11 @@
         <li class="layui-nav-item">
             <div class="top-cutline-normal"></div>
         </li>
-<%--        <li class="layui-nav-item">--%>
-<%--            <div style="display: flex; align-items: center; height: 100%;">--%>
-<%--                <button class="layui-btn" @click="changeSystem">返回发改委系统</button>--%>
-<%--            </div>--%>
-<%--        </li>--%>
+        <li class="layui-nav-item">
+            <div style="display: flex; align-items: center; height: 100%;">
+                <button class="layui-btn" @click="changeSystem">返回发改委系统</button>
+            </div>
+        </li>
         <li class="layui-nav-item">
             <a style="padding:0;margin-left:25px;">
 				<span class="txt">

projects/src/main/webapp/vmodules/user/log.jsp

@@ -15,12 +15,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-	<div class="layui-layout layui-layout-admin">
+	<div class="layui-layout layui-layout-admin pd0">
 		<!-- 内容区域 -->
 		<div class="right_title">
-			<span class="txt">日志查询</span>
+			<div class="txt">日志查询<div class="top-breadcrumb"></div></div>
 			<%--            <button class="btn btn_add" @click="add"><i class="layui-icon layui-icon-add-circle"></i> 新增</button>--%>
-			<div class="layui-collapse">
+			<div class="layui-collapse search_form">
 				<div class="layui-colla-item">
 					<%--                    <h2 class="layui-colla-title">筛选</h2>--%>
 					<div class="layui-colla-content layui-show">
@@ -92,6 +92,8 @@
 				this.winH = document.body.clientHeight
 				this.getData();
 				//window.toDetail = this.toDetail;
+				window.addEventListener('message', this.receiveMessage, false);
+				window.parent.postMessage('init loaded')
 			},
 			getData : function(){
 				var self = this;
@@ -162,6 +164,12 @@
 			search : function(){
 				this.pageNo = 1;
 				this.getData();
+			},
+			receiveMessage (e) {
+				console.log('cb receiveMessage: ', e.data)
+				if (e.data.topBreadcrumb) {
+					$(".top-breadcrumb").html(e.data.topBreadcrumb)
+				}
 			}
 		}
 	});