根据项目id去重页面修改

src/history/historytask.go

@@ -27,6 +27,9 @@ func (this *HistoryData) HistoryTask(history_id string) {
 	go UpdateHistoryState(1, history_id, 0)
 	//加载一个客户
 	log.Println("history_id", history_id)
+	//是否根据项目id去重
+	isFilter, _ := this.GetInteger("isFilter")
+	log.Println(isFilter)
 	customer, _ := Mgo.Find("historylog", map[string]interface{}{"_id": mongoutil.StringTOBsonId(history_id)}, nil, nil, false, -1, -1)
 	if len(*customer) == 1 {
 		c := (*customer)[0]
@@ -57,7 +60,9 @@ func (this *HistoryData) HistoryTask(history_id string) {
 			}
 		}
 		//
-		if ProjectAppidMap[appId] {
+		//if ProjectAppidMap[appId] {
+		if isFilter == 1 {
+			log.Println("g根据项目id去重。。。")
 			start := time.Now().Unix()
 			log.Println("加载projectId---开始")
 			InitProjectId(appId)
@@ -82,7 +87,7 @@ func (this *HistoryData) HistoryTask(history_id string) {
 		qu.Debug("customer:", cus.ID, cus.Name, cus.PushModel, cus.AppId, cus.IsTagRule, cus.IsSearchHosp, cus.IsSearchEnps, len(cus.TagRules), len(cus.Departments))
 		cus.GetData("history")                     //获取数据
 		cus.RemoveRepeatData()                     //数据去重
-		cus.AssembelAndSaveData(history_id, isDup) //组装、保存数据
+		cus.AssembelAndSaveData(history_id, isDup,isFilter) //组装、保存数据
 		//发邮件
 		go func() {
 			time.Sleep(3 * time.Second)

src/history/task.go

@@ -393,7 +393,7 @@ func (c *Customer) RemoveRepeatData() {
 }
 
 //组装保存数据
-func (c *Customer) AssembelAndSaveData(historyId string, isDup int) {
+func (c *Customer) AssembelAndSaveData(historyId string, isDup, isFilter int) {
 	log.Println("开始组装保存数据...")
 	defer qu.Catch()
 	ch := make(chan bool, 10)
@@ -411,7 +411,7 @@ func (c *Customer) AssembelAndSaveData(historyId string, isDup int) {
 					datalock.Unlock()
 					wg.Done()
 				}()
-				AssembelSave(data, c.IsSearchHosp, c.IsSearchEnps, historyId, c.AppId, isDup)
+				AssembelSave(data, c.IsSearchHosp, c.IsSearchEnps, historyId, c.AppId, isDup, isFilter)
 			}(tmp)
 			n++
 			if n%500 == 0 {
@@ -432,7 +432,7 @@ func (c *Customer) AssembelAndSaveData(historyId string, isDup int) {
 							datalock.Unlock()
 							wg.Done()
 						}()
-						AssembelSave(data, c.IsSearchHosp, c.IsSearchEnps, historyId, c.AppId, isDup)
+						AssembelSave(data, c.IsSearchHosp, c.IsSearchEnps, historyId, c.AppId, isDup, isFilter)
 					}(tmp)
 					n++
 					if n%500 == 0 {
@@ -453,7 +453,7 @@ func (c *Customer) AssembelAndSaveData(historyId string, isDup int) {
 					datalock.Unlock()
 					wg.Done()
 				}()
-				AssembelSave(data, c.IsSearchHosp, c.IsSearchEnps, historyId, c.AppId, isDup)
+				AssembelSave(data, c.IsSearchHosp, c.IsSearchEnps, historyId, c.AppId, isDup, isFilter)
 			}(tmp)
 			n++
 			if n%500 == 0 {

src/history/util_history.go

@@ -62,7 +62,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 					tmp_nkw := nkw_addArr[0]
 					if tmp_nkw != "" {
 						cr := &CommonReg{}
-						cr.CsVal = tmp_nkw                   //记录原值
+						cr.CsVal = tmp_nkw //记录原值
 						if LetterCase.MatchString(tmp_nkw) { //判断附加词中是否有英文
 							tmp_nkw = strings.ToUpper(tmp_nkw) //附加词中有英文全部转为大写
 							cr.IsLetter = true                 //含字母
@@ -114,7 +114,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 				tmp_aw := aw_addArr[0]
 				if tmp_aw != "" {
 					cr := &CommonReg{}
-					cr.CsVal = tmp_aw                   //记录原值
+					cr.CsVal = tmp_aw //记录原值
 					if LetterCase.MatchString(tmp_aw) { //判断附加词中是否有英文
 						tmp_aw = strings.ToUpper(tmp_aw) //附加词中有英文全部转为大写
 						cr.IsLetter = true               //含字母
@@ -447,7 +447,7 @@ func MergeField(str1, str2 string) string {
 }
 
 //补充信息并保存
-func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, historyId, appid string, isDup int) {
+func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, historyId, appid string, isDup, isFilter int) {
 	if IsSearchHosp { //医院信息
 		SearchHospInfo(tmp)
 	}
@@ -466,7 +466,9 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 	}
 	//
 	isOk := true
-	if ProjectAppidMap[appid] {
+	//if ProjectAppidMap[appid] {
+	if isFilter == 1 {
+		//log.Println("补充信息中根据项目id去重。。。。")
 		projectId := GetProjectId(id)
 		if projectId != "" {
 			projectIds := strings.Split(projectId, ",")

src/web/templates/private/historylog_list.html

@@ -19,8 +19,10 @@
         <div class="tab-content">
             <div class="nav-tabs-custom">
                 <ul class="nav nav-tabs edit-step">
-                    <li class="active" data-mode="guide" id="showHistory"><a href="#tab_1" data-toggle="tab" aria-expanded="true">历史任务</a></li>
-                    <li data-mode="guide" class="tab_2" id="showSecondPush"><a href="#tab_2" data-toggle="tab" aria-expanded="false" >二次推送</a></li>
+                    <li class="active" data-mode="guide" id="showHistory"><a href="#tab_1" data-toggle="tab"
+                                                                             aria-expanded="true">历史任务</a></li>
+                    <li data-mode="guide" class="tab_2" id="showSecondPush"><a href="#tab_2" data-toggle="tab"
+                                                                               aria-expanded="false">二次推送</a></li>
                 </ul>
                 <div class="row" id="history-task-list">
                     <div class="col-xs-12">
@@ -74,10 +76,34 @@
         </div>
 
     </section>
+    <div class="modal fade" id="modal-whether-filter" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog" style="width: 25%">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <span style="font-size: 20px;font-weight: bold">历史数据</span>
+                    <div class="header">
+                        <p style="text-align:center;font-size: 18px;margin-top: 30px">是否根据项目id去重？</p>
+                        <div style="margin-top: 40px;margin-bottom: 20px;text-align: center;">
+                            <input type="button" onclick="executeHistoryWork(1)" class="btn btn-primary saveBtn" value="是"
+                                   style="margin: 0 auto;width: 70px;height: 35px">
+                            <input type="button" onclick="executeHistoryWork(0)" class="btn btn-default"
+                                   style="margin-left: 40px;width: 70px;height: 35px" value="否">
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div><!-- /.modal -->
+    </div>
 </div>
 {{include "com/footer.html"}}
 <script>
-    $(function() {
+    var historyId = "";
+    // var rowIndex = "";
+    var goon;
+    // $("#modal-whether-filter").modal("show")
+    $(function () {
         ttable = $('#dataTable').DataTable({
             "paging": true,
             "lengthChange": false,
@@ -95,47 +121,47 @@
             "language": {
                 "url": "/dist/js/dataTables.chinese.lang"
             },
-            "fnDrawCallback": function() {
+            "fnDrawCallback": function () {
                 $("#dataTable_paginate ul.pagination").prepend(
                     "&nbsp;&nbsp;&nbsp;转到第 <input type='text' id='changePage'   style='width:20px;'> 页    <a type='text' href='javascript:void(0);' id='dataTable-btn' style='text-align:center'>GO</a>"
                 );
-                $('#dataTable-btn').click(function(e) {
+                $('#dataTable-btn').click(function (e) {
                     var redirectpage = 0
                     if ($("#changePage").val() && $("#changePage").val() > 0) {
                         var redirectpage = $("#changePage").val() - 1;
                     }
                     ttable.page(redirectpage).draw(false);
                 });
-                this.api().column(0).nodes().each(function(cell, i) {
+                this.api().column(0).nodes().each(function (cell, i) {
                     cell.innerHTML = i + 1;
                 });
             },
             "columns": [{
-                    "data": null,
-                    width: "5%"
-                },
+                "data": null,
+                width: "5%"
+            },
                 {
                     "data": "_id"
                 },
                 {
                     "data": "create_user",
-                    render: function(val) {
-                        if(val === undefined){
-                           return ""
-                        }else{
+                    render: function (val) {
+                        if (val === undefined) {
+                            return ""
+                        } else {
                             return val
                         }
                     }
                 },
                 {
                     "data": "state",
-                    render: function(val) {
+                    render: function (val) {
                         var str = "";
-                        if(val === 0 || val === undefined){
+                        if (val === 0 || val === undefined) {
                             str = "未执行";
-                        }else if(val === 1){
+                        } else if (val === 1) {
                             str = "未完成";
-                        }else if(val === 2){
+                        } else if (val === 2) {
                             str = "已完成";
                         }
                         return str
@@ -143,17 +169,17 @@
                 },
                 {
                     "data": "result_count",
-                    render: function(val) {
-                        if(val === undefined || val === null || val === ""){
-                           return "未执行"
-                        }else{
+                    render: function (val) {
+                        if (val === undefined || val === null || val === "") {
+                            return "未执行"
+                        } else {
                             return val
                         }
                     }
                 },
                 {
                     "data": "createtime",
-                    render: function(val) {
+                    render: function (val) {
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000)
                         return dt.format("yyyy-MM-dd hh:mm:ss")
@@ -161,8 +187,8 @@
                 },
                 {
                     "data": "finishtime",
-                    render: function(val) {
-                        if (val === undefined){
+                    render: function (val) {
+                        if (val === undefined) {
                             return "未执行"
                         }
                         var dt = new Date()
@@ -171,27 +197,27 @@
                     }
                 },
                 {
-                    "data": "_id", width:"16%",
+                    "data": "_id", width: "16%",
                     render: function (val, a, row) {
                         var tmp = "";
-                        if(row.state === 2){
+                        if (row.state === 2) {
                             tmp = '<div>' +
-                              '<a class="btn btn-sm btn-primary" href="/service/customer/history?id='+ row.user_id +'&hid='+ val +'&check=true">查看</a>' +
-                              '<a style="margin-left:10px" class="btn btn-sm btn-success" disabled>完成</a>' +
-                              '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
-                              '</div>';
-                        }else if(row.state === 1){
+                                '<a class="btn btn-sm btn-primary" href="/service/customer/history?id=' + row.user_id + '&hid=' + val + '&check=true">查看</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-success" disabled>完成</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="' + val + '" onclick="cloneWork(this)">克隆</a>' +
+                                '</div>';
+                        } else if (row.state === 1) {
                             tmp = '<div>' +
-                              '<a class="btn btn-sm btn-primary" href="/service/customer/history?id='+ row.user_id +'&hid='+ val +'&check=true">查看</a>' +
-                              '<a style="margin-left:10px" class="btn btn-sm btn-info">进行</a>' +
-                              '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
-                              '</div>';
-                        }else{
+                                '<a class="btn btn-sm btn-primary" href="/service/customer/history?id=' + row.user_id + '&hid=' + val + '&check=true">查看</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-info">进行</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="' + val + '" onclick="cloneWork(this)">克隆</a>' +
+                                '</div>';
+                        } else {
                             tmp = '<div>' +
-                              '<a class="btn btn-sm btn-primary" href="/service/customer/history?id='+ row.user_id +'&hid='+ val +'">编辑</a>' +
-                              '<a style="margin-left:10px" class="btn btn-sm btn-default" eid="'+val+'" onclick="historyWork(this)">执行</a>' +
-                              '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
-                              '</div>';
+                                '<a class="btn btn-sm btn-primary" href="/service/customer/history?id=' + row.user_id + '&hid=' + val + '">编辑</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-default" eid="' + val + '" onclick="whetherFilter(this)">执行</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="' + val + '" onclick="cloneWork(this)">克隆</a>' +
+                                '</div>';
                         }
                         return tmp
                     }
@@ -215,18 +241,18 @@
             "language": {
                 "url": "/dist/js/dataTables.chinese.lang"
             },
-            "fnDrawCallback": function() {
+            "fnDrawCallback": function () {
                 $("#sdataTable_paginate ul.pagination").prepend(
                     "&nbsp;&nbsp;&nbsp;转到第 <input type='text' id='s_changePage'   style='width:20px;'> 页    <a type='text' href='javascript:void(0);' id='sdataTable-btn' style='text-align:center'>GO</a>"
                 );
-                $('#sdataTable-btn').click(function(e) {
+                $('#sdataTable-btn').click(function (e) {
                     var s_redirectpage = 0
                     if ($("#s_changePage").val() && $("#s_changePage").val() > 0) {
                         var s_redirectpage = $("#s_changePage").val() - 1;
                     }
                     stable.page(s_redirectpage).draw(false);
                 });
-                this.api().column(0).nodes().each(function(cell, i) {
+                this.api().column(0).nodes().each(function (cell, i) {
                     cell.innerHTML = i + 1;
                 });
             },
@@ -239,23 +265,23 @@
                 },
                 {
                     "data": "create_user",
-                    render: function(val) {
-                        if(val === undefined){
+                    render: function (val) {
+                        if (val === undefined) {
                             return ""
-                        }else{
+                        } else {
                             return val
                         }
                     }
                 },
                 {
                     "data": "state",
-                    render: function(val) {
+                    render: function (val) {
                         var str = "";
-                        if(val === 0 || val === undefined){
+                        if (val === 0 || val === undefined) {
                             str = "未执行";
-                        }else if(val === 1){
+                        } else if (val === 1) {
                             str = "未完成";
-                        }else if(val === 2){
+                        } else if (val === 2) {
                             str = "已完成";
                         }
                         return str
@@ -263,17 +289,17 @@
                 },
                 {
                     "data": "result_count",
-                    render: function(val) {
-                        if(val === undefined || val === null || val === ""){
+                    render: function (val) {
+                        if (val === undefined || val === null || val === "") {
                             return "未执行"
-                        }else{
+                        } else {
                             return val
                         }
                     }
                 },
                 {
                     "data": "createtime",
-                    render: function(val) {
+                    render: function (val) {
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000)
                         return dt.format("yyyy-MM-dd hh:mm:ss")
@@ -281,8 +307,8 @@
                 },
                 {
                     "data": "finishtime",
-                    render: function(val) {
-                        if (val === undefined){
+                    render: function (val) {
+                        if (val === undefined) {
                             return "未执行"
                         }
                         var dt = new Date()
@@ -291,26 +317,26 @@
                     }
                 },
                 {
-                    "data": "_id", width:"16%",
+                    "data": "_id", width: "16%",
                     render: function (val, a, row) {
                         var tmp = "";
-                        if(row.state === 2){
+                        if (row.state === 2) {
                             tmp = '<div>' +
-                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id='+ row.user_id +'&s_pushid='+ val +'&complete=1">查看</a>' +
+                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id=' + row.user_id + '&s_pushid=' + val + '&complete=1">查看</a>' +
                                 '<a style="margin-left:10px" class="btn btn-sm btn-success" disabled>完成</a>' +
-                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="' + val + '" onclick="cloneWork(this)">克隆</a>' +
                                 '</div>';
-                        }else if(row.state === 1){
+                        } else if (row.state === 1) {
                             tmp = '<div>' +
-                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id='+ row.user_id +'&s_pushid='+ val +'">编辑</a>' +
+                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id=' + row.user_id + '&s_pushid=' + val + '">编辑</a>' +
                                 '<a style="margin-left:10px" class="btn btn-sm btn-info">进行</a>' +
-                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="' + val + '" onclick="cloneWork(this)">克隆</a>' +
                                 '</div>';
-                        }else{
+                        } else {
                             tmp = '<div>' +
-                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id='+ row.user_id +'&s_pushid='+ val +'">编辑</a>' +
-                                '<a style="margin-left:10px" class="btn btn-sm btn-default" eid="'+val+'" onclick="historyWork(this)">执行</a>' +
-                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
+                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id=' + row.user_id + '&s_pushid=' + val + '">编辑</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-default" eid="' + val + '" onclick="historyWork(this)">执行</a>' +
+                                '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="' + val + '" onclick="cloneWork(this)">克隆</a>' +
                                 '</div>';
                         }
                         return tmp
@@ -319,47 +345,82 @@
             ]
         });
 
-    });
-    
-    if (sessionStorage.secondpush){
-        $("#history-task-list").hide();
-        $("#second-push-list").show();
-        $("#showHistory").removeClass("active");
-        $("#showSecondPush").addClass("active");
-    }else if (sessionStorage.historywork){
-        $("#second-push-list").hide();
-        $("#history-task-list").show();
-        $("#showSecondPush").removeClass("active");
-        $("#showHistory").addClass("active");
+    });
+
+    if (sessionStorage.secondpush) {
+        $("#history-task-list").hide();
+        $("#second-push-list").show();
+        $("#showHistory").removeClass("active");
+        $("#showSecondPush").addClass("active");
+    } else if (sessionStorage.historywork) {
+        $("#second-push-list").hide();
+        $("#history-task-list").show();
+        $("#showSecondPush").removeClass("active");
+        $("#showHistory").addClass("active");
+    }
+
+    //是否根据项目id去重
+    function whetherFilter(obj) {
+        historyId = $(obj).attr("eid");
+        // rowIndex = $(obj).parents('tr').find('td:eq(0)').text();
+        // $(obj).removeClass("btn-default").addClass("btn-info").attr("onclick", "");
+        $("#modal-whether-filter").modal("show")
+        goon = obj
+    }
+
+    function executeHistoryWork(isFilter) {
+        $("#modal-whether-filter").modal("hide")
+        setTimeout(function () {
+            var ok = confirm("是否确定执行？");
+            if (ok) {
+                $(goon).removeClass("btn-default").addClass("btn-info").attr("onclick", "");
+                $(goon).text("进行");
+                // var ishistory = $("#showHistory").hasClass("active")
+                $.ajax({
+                    url: "/service/history/" + historyId,
+                    type: 'POST',
+                    data: {"isFilter": isFilter},
+                    success: function (r) {
+                        $(goon).removeClass("btn-info").addClass("btn-success").attr("disabled", "disabled");
+                        $(goon).text("完成");
+                    },
+                    error: function (r) {
+                        $(goon).removeClass("btn-info").addClass("btn-danger").attr("disabled", "disabled");
+                        $(goon).text("失败");
+                    }
+                })
+            }
+        },500)
+
     }
-    
-    function historyWork(obj){
+
+    function historyWork(obj) {
         var ok = confirm("是否确定执行？");
-        if (ok){
-            $(obj).removeClass("btn-default").addClass("btn-info").attr("onclick","");
+        if (ok) {
+            $(obj).removeClass("btn-default").addClass("btn-info").attr("onclick", "");
             $(obj).text("进行");
             var ishistory = $("#showHistory").hasClass("active")
             var val = $(obj).attr("eid");
-            if (ishistory){
+            if (ishistory) {
                 $.ajax({
-                    url: "/service/history/"+ val,
+                    url: "/service/history/" + val,
                     type: 'POST',
-                    success: function(r) {
-                        $(obj).removeClass("btn-info").addClass("btn-success").attr("disabled","disabled");
+                    success: function (r) {
+                        $(obj).removeClass("btn-info").addClass("btn-success").attr("disabled", "disabled");
                         $(obj).text("完成");
                     },
                     error: function (r) {
-                        $(obj).removeClass("btn-info").addClass("btn-danger").attr("disabled","disabled");
+                        $(obj).removeClass("btn-info").addClass("btn-danger").attr("disabled", "disabled");
                         $(obj).text("失败");
                     }
                 })
-            }else{
+            } else {
                 $.ajax({
                     url: "/service/secondpush/dotask",
                     type: 'POST',
-                    data:{"s_pushid":val},
-                    success: function(r) {
-                        if (r.status){
+                    data: {"s_pushid": val},
+                    success: function (r) {
+                        if (r.status) {
                             stable.ajax.reload()
                         }
                     },
@@ -373,28 +434,28 @@
 
         }
     }
-    
-    function cloneWork(obj){
+
+    function cloneWork(obj) {
         var ok = confirm("是否确定克隆？");
-        if (ok){
+        if (ok) {
             var ishistory = $("#showHistory").hasClass("active")
             var val = $(obj).attr("eid");
-            if (ishistory){
+            if (ishistory) {
                 $.ajax({
-                    url: "/service/historyClone/"+ val,
+                    url: "/service/historyClone/" + val,
                     type: 'POST',
-                    success: function(r) {
+                    success: function (r) {
                         window.location.reload();
                     },
                     error: function (r) {
                         alert("克隆失败！");
                     }
                 })
-            }else{
+            } else {
                 $.ajax({
-                    url: "/service/secondPushClone/"+ val,
+                    url: "/service/secondPushClone/" + val,
                     type: 'POST',
-                    success: function(r) {
+                    success: function (r) {
                         window.location.reload();
                     },
                     error: function (r) {
@@ -408,24 +469,24 @@
 
     function addwork() {
         var isactive = $("#showHistory").hasClass("active")
-        if (isactive){
-            window.location.href = "/service/customer/history?id="+ {{.T.id}};
-        }else{
-            window.location.href = "/service/secondpush/create?id="+ {{.T.id}};
+        if (isactive) {
+            window.location.href = "/service/customer/history?id=" + {{.T.id}};
+        } else {
+            window.location.href = "/service/secondpush/create?id=" + {{.T.id}};
         }
     }
 
-    $("#showHistory").on("click",function () {
+    $("#showHistory").on("click", function () {
         $("#second-push-list").hide();
-        $("#history-task-list").show();
-        sessionStorage.historywork = true;
+        $("#history-task-list").show();
+        sessionStorage.historywork = true;
         sessionStorage.removeItem("secondpush");
     })
 
-    $("#showSecondPush").on("click",function () {
+    $("#showSecondPush").on("click", function () {
         $("#history-task-list").hide();
-        $("#second-push-list").show();
-        sessionStorage.secondpush = true;
+        $("#second-push-list").show();
+        sessionStorage.secondpush = true;
         sessionStorage.removeItem("historywork");
     })
 </script>