增加“领导批示反馈”列表

tip-front/src/main/java/com/minto/web/tc/MessageController.java

@@ -262,7 +262,7 @@ public class MessageController {
      * @param res
      * @return
      */
-    @RequestMapping(value = "/getHistoryMessage", method = RequestMethod.GET, params = {"filterLeaderComment = true"})
+    @RequestMapping(value = "/getHistoryMessage", method = RequestMethod.GET, params = {"filterLeaderComment=true"})
     public ModelAndView getSystemMsgFilterLeaderComment(HttpServletRequest req, HttpServletResponse res)
             throws Exception{
         Map<String, Object> result = new HashMap<String, Object>();

tip-front/src/main/webapp/WEB-INF/pages/apps/rolePage/manager/managerWorkIndex.html

@@ -228,15 +228,6 @@
 					</div>
 					<div class="listDiv">
 						<div id="contentList" >
-
-							<!--<div class="matterLi">
-                                <a class="matterLeft" href="javascript:">
-                                    <span class="matterTimeRed">【11月25日】</span>
-                                    <span>10月指标进度汇报</span>
-                                </a>
-                                <span class="mt-btn-font">[填报]</span>
-                            </div>-->
-
 						</div>
 					</div>
 				</div>
@@ -266,81 +257,28 @@
 						</tbody>
 					</table>
 				</div>
-				<!--<div class="notice">
-					<div class="title">
-						<div id="workTab" class="titleTab">
-							&lt;!&ndash;<span class="titleTabLi titleTabChosen">工作动态</span>
-                            <span class="titleLine">|</span>
-                            <span class="titleTabLi">通知公告<span class="tipsYuan"></span></span>&ndash;&gt;
-						</div>
-						<a class="more" onclick="toMore()">更多</a>
-					</div>
-					<div id="noticeList" class="noticeList">
-
-						&lt;!&ndash;<div class="noticeLi">
-                            <div class="userDiv">
-                                <img class="userImg" src="" alt="">
-                                <span class="noticeTips"></span>
-                            </div>
-                            <div class="noticeDetail">
-                                <div class="noticeTitle">
-                                    <span class="">谢小萍[产品设计部]</span>
-                                    <span class="mt-btn-font">[产品设计部7月第5周工作计划]</span>
-                                </div>
-                                <p class="noticeTime">2019-10-08 16:05:24</p>
-                                <p class="noticeInfo">在事项中汇报进度：产品下一步规划讨论以及sp主要工作任务项整理。</p>
-                                <div class="mt-fileList">
-                                    <div class="mt-fileLi">
-                                        <svg class="icon" aria-hidden="true">
-                                            <use xlink:href="#iconvideo"></use>
-                                        </svg>
-                                        <a class="mt-fileInfo" href="javascript:">
-                                            <span class="mt-fileName">出资证明</span><span class="mt-fileType">.doc</span>
-                                        </a>
-                                        <a class="mt-fileOperation" href="javascript:"><i class="mt-icon mt-icon-see"></i></a>
-                                    </div>
-                                    <div class="mt-fileLi">
-                                        <svg class="icon" aria-hidden="true">
-                                            <use xlink:href="#iconppt"></use>
-                                        </svg>
-                                        <a class="mt-fileInfo" href="javascript:">
-                                            <span class="mt-fileName">出资证明甲方的房间的房间放搅拌机发布时间发呆就</span><span class="mt-fileType">.doc</span>
-                                        </a>
-                                        <a class="mt-fileOperation" href="javascript:"><i class="mt-icon mt-icon-down"></i></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>&ndash;&gt;
-
-					</div>
-					<div class="needHide" id="workPage">
-
-					</div>
-					<div class="needHide" id="noticePage">
-
-					</div>
-				</div>-->
 			</div>
 
 			<div class="mt-content-left">
 				<div class="notice" style="display: block;margin-top: 0">
 					<div class="title">
-						<div id="workTab" class="titleTab">
-							<!--<span class="titleTabLi titleTabChosen">工作动态</span>
-                            <span class="titleLine">|</span>
-                            <span class="titleTabLi">通知公告<span class="tipsYuan"></span></span>-->
-						</div>
+						<div id="workTab" class="titleTab"></div>
 						<a class="more" onclick="toMore()">更多</a>
 					</div>
-					<div id="noticeList" class="noticeList">
-					</div>
-					<div class="needHide" id="workPage">
+					<div id="noticeList" class="noticeList"></div>
+					<div class="needHide" id="workPage"></div>
+					<div class="needHide" id="noticePage"></div>
+				</div>
 
+				<div class="notice" style="display: block;">
+					<div style="font-size: 15px;font-weight: bold;padding: 15px;">
+						领导批示反馈
 					</div>
-					<div class="needHide" id="noticePage">
 
-					</div>
+					<div id="leaderApproval" class="noticeList"></div>
+					<div id="approvalPages"></div>
 				</div>
+
 			</div>
 
 			<div class="mt-content-right" style="display: none">
@@ -841,8 +779,23 @@
 	</td>
 </script>
 
-
-
+<!-- 领导重要信息模板 -->
+<script id="leaderApprovalTemp" type="text/html">
+	{{if data.length==0}}
+	<div align="center" class="empty"><img th:src="@{/common/images/empty.png}" alt=""></div>
+	{{else if data.length>0}}
+	{{each data obj}}
+	<div class="matterLi">
+		<a class="matterLeft" href="javascript:">
+			<span title="{{obj.message}}" onclick="checkDetail('{{obj.resourceId}}')">
+				{{obj.message}}
+			</span>
+		</a>
+		<span style="flex-shrink: 0;">{{obj.sendTimeCalendar}}</span>
+	</div>
+	{{/each}}
+	{{/if}}
+</script>
 <script th:inline="javascript">
 	var mt = new mtConstructor();
 	var currentWorkTab = "1";
@@ -881,7 +834,7 @@
 		//初始化加载待办类型
 		initMyWaitTab()
 		initFileTab();
-		initWorkTab()
+		initWorkTab();
 
 		//统计所有我的关注条数
 		initMyFollowCount(codeStr)
@@ -889,6 +842,8 @@
 		initLeaderFollowCount(codeStr)
 		//统计所有待办条数
 		initCommonWaitDoCount(codeStr)
+		// 获取领导批示、回复的重点信息列表
+		initLeaderApproval();
 
 		// 模板
 		mt.initTab({
@@ -969,6 +924,48 @@
 		});
 	})
 
+	// 获取领导批示、回复的重点信息列表
+	function initLeaderApproval(){
+		let pageSize = 5;
+		mt.initPage({
+			id: 'approvalPages',
+			defaultValue: 1, // 默认页码, 如果不传入或删除该项配置则默认为1
+			change(item, obj) {
+				$.ajax({
+					url: TC.config.baseUrl + "/getHistoryMessage",
+					type: "get",
+					dataType: "json",
+					data: {
+						page: item.page,
+						filterLeaderComment:true,
+						pageSize: pageSize
+					},
+					traditional: true,
+					async: false,
+					success: function (result) {
+						if (result.state === "success") {
+							obj.total = parseInt((result.total + pageSize - 1) / pageSize) //根据总数计算总页数
+							obj.init()
+						}
+
+						var objs = {
+							data: result.data || []
+						}
+
+						var html = template('leaderApprovalTemp', objs);
+						$("#leaderApproval").html("")
+						$("#leaderApproval").append(html);
+					},
+				});
+			}
+		})
+	}
+
+	// 查看消息详情
+	function checkDetail (id) {
+		TC.ui.openTab("/taskmt/?m=taskDetail&id="+id,"查看事项")
+	}
+
 	//初始化工作动态
 	function initWorkTab(){
 

tip-front/src/main/webapp/apps_res/rolePage/css/index.css

@@ -646,10 +646,9 @@ body {
     }
 }
 
-#workPage, #spaceFilePage, #noticePage {
+#workPage, #spaceFilePage, #noticePage,#approvalPages {
     padding: 15px;
     display: flex;
-    justify-content: flex-end;
 }
 
 .red {

tip-front/src/main/webapp/apps_res/rolePage/js/managerIndex.js

@@ -795,7 +795,7 @@ function findGoalNotFill() {
 
 //初始化工作动态
 function initWorkDynamic(code = "", isPage = true) {
-    var pageSize = 6;
+    var pageSize = 5;
     mt.initPage({
         id: 'workPage',
         defaultValue: 1, // 默认页码, 如果不传入或删除该项配置则默认为1