Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/front/swordfish.go

@@ -690,7 +690,7 @@ func getBidSearchQuery(area, publishtime, subtype string) string {
 			starttime = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-30, 0, 0, 0, 0, time.Local).Unix())
 		} else if publishtime == "thisyear" { //去年
 			starttime = fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Unix())
-			endtime = fmt.Sprint(time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local).Unix())
+			endtime = fmt.Sprint(time.Date(now.Year()-1, 12, 31, 23, 59, 59, 0, time.Local).Unix())
 		} else {
 			starttime = strings.Split(publishtime, "_")[0]
 			endtime = strings.Split(publishtime, "_")[1]

src/jfw/front/ws_dataExport.go

@@ -374,7 +374,7 @@ func (w *WsDataExport) SearchExport() error {
 		publishtime = fmt.Sprintf("%s_%d", starttime, now.Unix())
 	} else if publishtime == "thisyear" { //去年
 		starttime := fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Unix())
-		endtime := fmt.Sprint(time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local).Unix())
+		endtime := fmt.Sprint(time.Date(now.Year()-1, 12, 31, 23, 59, 59, 0, time.Local).Unix())
 		publishtime = fmt.Sprintf("%s_%s", starttime, endtime)
 	}
 

src/jfw/modules/app/src/app/front/swordfish.go

@@ -92,7 +92,7 @@ func getBidSearchQuery(area, publishtime, subtype string) string {
 			starttime = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-30, 0, 0, 0, 0, time.Local).Unix())
 		} else if publishtime == "thisyear" { //去年
 			starttime = fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Unix())
-			endtime = fmt.Sprint(time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local).Unix())
+			endtime = fmt.Sprint(time.Date(now.Year()-1, 12, 31, 23, 59, 59, 0, time.Local).Unix())
 		} else {
 			starttime = strings.Split(publishtime, "_")[0]
 			endtime = strings.Split(publishtime, "_")[1]

src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -370,7 +370,7 @@ func (w *WsDataExport) SearchExport() error {
 		publishtime = fmt.Sprintf("%s_%d", starttime, now.Unix())
 	} else if publishtime == "thisyear" { //去年
 		starttime := fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Unix())
-		endtime := fmt.Sprint(time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local).Unix())
+		endtime := fmt.Sprint(time.Date(now.Year()-1, 12, 31, 23, 59, 59, 0, time.Local).Unix())
 		publishtime = fmt.Sprintf("%s_%s", starttime, endtime)
 	}
 

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/choose_area.css

@@ -328,7 +328,7 @@
   background: #fff;
   font-size: .3rem;
   padding: .2rem .5rem;
-  border-bottom: 0.5px solid #e0e0e0;
+  border-bottom: 1px solid #e0e0e0;
   box-sizing: border-box;
 }
 

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -1411,6 +1411,10 @@ var SuperSearch = {
 		$(".newdialog .sub-search-title").find("li").removeClass("active");
 		$(".selected-export .options .search-title").find("em").text("全文搜索");
 		$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
+		//全文检索 表格展示切换成列表展示
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		$(".selected-export .show-list").find("em").text("列表显示");
+		$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
 	    //记录
 	    if(localStorage){
 	        localStorage.selectType="all";
@@ -1433,7 +1437,7 @@ var SuperSearch = {
 	//展示方式
 	//1.列表展示数据
 	showlist: function() {
-		sessionStorage.superSearch_showType="showlist";
+		//sessionStorage.superSearch_showType="showlist";
 	    $("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
 	    $("#supersearchPage #wrapper #table").addClass("hidden");
 	    $("#supersearchPage #wrapper #list").removeClass("hidden");
@@ -1463,7 +1467,7 @@ var SuperSearch = {
 				}
 			},1000);
 		}
-		sessionStorage.superSearch_showType="showTable";
+		//sessionStorage.superSearch_showType="showtable";
 	  	$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 	  	$("#supersearchPage #wrapper #table").removeClass("hidden");
 	  	$("#supersearchPage #wrapper #list").addClass("hidden");

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -481,7 +481,7 @@
 			if(filter["area"]!=null&&filter["area"]!=""){
 				localStorage.province = filter["area"];
 				localStorage.areaHtml = filter["area"].join(',').replace(/,/g,"、")
-			}else{
+            }else{
 				localStorage.province = "";
 			}
 			if(filter["city"]!=null&&filter["city"]!=""){
@@ -492,7 +492,7 @@
 				// localStorage.area = "";
 			}
 			if(filter["region"]!=null&&filter["region"]!=""){
-				localStorage.areaHtml = filter["region"];
+				localStorage.areaHtml = filter["region"].join(',').replace(/,/g,"、");
 			}else{
 				localStorage.areaHtml =  filter["area"].join(',').replace(/,/g,"、");
 			}
@@ -515,8 +515,10 @@
 			}
 	        //信息类型
 			if(filter["subtype"]!=null&&filter["subtype"]!=""){
+				localStorage.subType = filter["subtype"].replace(/,/g," ");
 				localStorage.subTypes = filter["subtype"].replace(/,/g," ");
 			}else{
+				localStorage.subType = "";
 				localStorage.subTypes = "";
 			}
 			//采购单位
@@ -533,6 +535,7 @@
 			}
 	        //时间
 	        if(filter["publishtime"]!=""){
+				console.log(filter["publishtime"])
 				var timeflag = true;
 				$(".chooseTime ul>li").each(function(i,e){
 					var temp = $(e).find("span").attr("data-value");
@@ -550,6 +553,7 @@
 						localStorage.date = filter["publishtime"];
 			            localStorage.removeItem("export_starttime");
 			            localStorage.removeItem("export_endtime");
+						localStorage.index = i;
 						timeflag = false;
 					}
 				})

src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html

@@ -543,6 +543,7 @@
 				$('.detail').show()
 			});
 			//
+		    var areaArr = '';
 			/* 选中结果 */
 			function getResult() {
 				$('.result_name').empty();
@@ -637,7 +638,7 @@
 					}
 				}
 				$('.result_name').append(html);
-				localStorage.areaHtml = html;
+				areaArr = html;
 				isOpen()
 			}
 
@@ -732,7 +733,7 @@
 					 }
 					 $(".tab_content").find(".city.active").each(function(){
 						 var city = $(this).html();
-						 if(city !== "澳门" && city !=="北京" && city !=="重庆" && city !=="上海" && city !=="天津" && city !=="台湾" && city !=="香港"){
+						 if(city !== "澳门" && city !=="北京市" && city !=="重庆市" && city !=="上海市" && city !=="天津市" && city !=="台湾" && city !=="香港"){
 							 citys.push(city)
 						 }
 						 data.push(city);
@@ -754,6 +755,7 @@
 					 localStorage.city = citys.toString();
 					 localStorage.province = province.toString();
 					 localStorage.area = html;
+					 localStorage.areaHtml = areaArr;
 					 history.back();
 				 });
 				$('.reset-btn').click(function(){
@@ -792,22 +794,42 @@
 				 }else{
 					 if(localStorage.areaHtml!==""&&localStorage.areaHtml!==undefined){
 						 let area = localStorage.areaHtml.split("、");
+						 var citys = [];
+						 var province = [];
 						 for(var i in area){
 							 $(".tab").each(function(){
-								 let province = $(this).children(".province").text().replace(/\s/g,"")
-								 if(province === area[i]){
+								 let provinces = $(this).children(".province").text().replace(/\s/g,"");
+								 if(provinces === area[i]){
+									 province.push(area[i]);
 									 $(this).next().children(".city").addClass("active");
+									 $(this).next().find(".city").each(function () {
+										 var city = $(this).text();
+										 if(city !== "澳门" && city !=="北京市" && city !=="重庆市" && city !=="上海市" && city !=="天津市" && city !=="台湾" && city !=="香港"){
+											 citys.push(city)
+										 }
+									 });
 									 if($(this).prop("class") !== "tab municipality"){
 										 $(this).next().slideDown();
 									 }
 								 }
+							 });
+							 $(".tab_content").find(".city").each(function(){
+								 if($(this).text() === area[i]){
+									 $(this).addClass("active");
+									 if($(this).parent().prev().prop("class") !== "tab municipality"){
+										 $(this).parent().slideDown();
+									 }
+								 }
 							 })
 						 }
+						 localStorage.city = citys.toString();
+						 localStorage.province = province.toString();
+						 getResult();
 					 }else{
 						 $(".other").prop("checked", true);
 						 $(".reset-btn").hide();
+						 getResult();
 					 }
-					 getResult();
 				 }
 				 //
 				 $(".tab_content").find(".city.active").each(function(){

src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html

@@ -306,7 +306,6 @@
                 //     return e !== "";
                 // });
                 for(var i in subType){
-                    console.log(subType[i]);
                     $(".list ul li").find("dd").each(function(){
                         if($(this).text() === subType[i]){
                             $(this).addClass("active");

src/jfw/public/search.go

@@ -271,31 +271,28 @@ func GetDataExportSearchCountUseId(_id string) (count int) {
 	}
 	count = int(elastic.Count(INDEX, TYPE, qstr))
 	//超级搜索一致的检索（防止数据导出和超级搜索数据量不一致）
-	if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
-		if len(scd.Keyword) != 0 || len(scd.Industry) != 0 {
-
-			searchTextSize := 0
-			if len(scd.Keyword) > 0 {
-				searchTextSize = len([]rune(scd.Keyword[0].Keyword))
+	//if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
+	if len(scd.Keyword) != 0 {
+		searchTextSize := 0
+		if len(scd.Keyword) > 0 {
+			searchTextSize = len([]rune(scd.Keyword[0].Keyword))
+		}
+		if searchTextSize > 3 && count < 50 {
+			var res *[]map[string]interface{}
+			if count > 0 {
+				res = doSearch(qstr, 0, count, "")
 			}
-			if searchTextSize > 3 && count < 50 {
-				var res *[]map[string]interface{}
-				if count > 0 {
-					res = doSearch(qstr, 0, count, "")
-				}
-				secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", config.Sysconfig["elasticsearch"].(string))
-				scd.Keyword[0].Keyword = secondKWS
+			secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", config.Sysconfig["elasticsearch"].(string))
+			scd.Keyword[0].Keyword = secondKWS
 
-				qstr = getDataExportSql(scd)
-				res2 := doSearch(qstr, 0, 100-count, "")
+			qstr = getDataExportSql(scd)
+			res2 := doSearch(qstr, 0, 100-count, "")
 
-				return len(*delRepeatMapArr(res, res2))
-			}
-			return
-		} else {
-			return ExConf.MsgMaxCount
+			return len(*delRepeatMapArr(res, res2))
 		}
+		return
 	}
+	//}
 	return
 }
 

src/web/staticres/js/wxSupersearch.js

@@ -816,10 +816,13 @@ var SuperSearch = {
 			$("#supersearchPage #wrapper").addClass("hidden");
 			$("#supersearchPage .nullcontent").removeClass("hidden");
 		} else {
-			//判断显示信息方式  列表or表格
+			//判断显示信息方式  列表or表格  查询后都显示列表
 			$("#supersearchPage #wrapper").removeClass("hidden");
-			$("#supersearchPage #list").removeClass("hidden");
-			$("#supersearchPage #table").addClass("hidden");
+			$(".selected-export .show-list").find("em").text("列表显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
+			$("#supersearchPage #wrapper #table").addClass("hidden");
+			$("#supersearchPage #wrapper #list").removeClass("hidden");
+			SuperSearch.isTable(false);
 		}
 	},
 	formSubmit: function (nw){    //提交表单，获取数据
@@ -1326,6 +1329,10 @@ var SuperSearch = {
 		$(".newdialog .sub-search-title").find("li").removeClass("active");
 		$(".selected-export .options .search-title").find("em").text("全文搜索");
 		$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
+		//全文检索 表格展示切换成列表展示
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		$(".selected-export .show-list").find("em").text("列表显示");
+		$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
 	    //记录
 	    if(localStorage){
 	        localStorage.selectType="all";
@@ -1639,20 +1646,21 @@ var SuperSearch = {
 			$(".selected-export .options .search-title").find("em").text("全文搜索");
 			$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
 		}
-		if(sessionStorage.superSearch_showType=="showlist"){
-			$(".selected-export .show-list").find("em").text("列表显示");
-			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
-//			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
-			$("#supersearchPage #wrapper #table").addClass("hidden");
-			$("#supersearchPage #wrapper #list").removeClass("hidden");
-			SuperSearch.isTable(false);
-		}else if(sessionStorage.superSearch_showType=="showtable"){
+		console.log(sessionStorage.superSearch_showType)
+		if(sessionStorage.superSearch_showType=="showtable"){
 			$(".selected-export .show-list").find("em").text("表格显示");
 			$(".newdialog .sub-show-list").find("li[dataval='showtable']").addClass("active");
 //			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").removeClass("hidden");
 			$("#supersearchPage #wrapper #list").addClass("hidden");
 			SuperSearch.isTable(true);
+		}else{
+			$(".selected-export .show-list").find("em").text("列表显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
+//			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
+			$("#supersearchPage #wrapper #table").addClass("hidden");
+			$("#supersearchPage #wrapper #list").removeClass("hidden");
+			SuperSearch.isTable(false);
 		}
 	    SuperSearch.beforeSubmit();
 	},

src/web/templates/weixin/dataExport/dataExport.html

@@ -445,7 +445,7 @@
 				// localStorage.area = "";
 			}
 			if(filter["region"]!=null&&filter["region"]!=""){
-				localStorage.areaHtml = filter["region"];
+                localStorage.areaHtml = filter["region"].join(',').replace(/,/g,"、");
 			}else{
 				localStorage.areaHtml = filter["area"].join(',').replace(/,/g,"、");
 			}
@@ -469,8 +469,10 @@
 	        //信息类型
 			if(filter["subtype"]!=null&&filter["subtype"]!=""){
 				localStorage.subTypes = filter["subtype"].replace(/,/g," ");
+				localStorage.subType = filter["subtype"].replace(/,/g," ");
 			}else{
 				localStorage.subTypes = "";
+				localStorage.subType = "";
 			}
 			//采购单位
 	        if(filter["buyer"]!=null&&filter["buyer"].length>0){
@@ -503,6 +505,7 @@
 						localStorage.date = filter["publishtime"];
 			            localStorage.removeItem("export_starttime");
 			            localStorage.removeItem("export_endtime");
+						localStorage.index = i;
 						timeflag = false;
 					}
 				})

src/web/templates/weixin/dataExport/dataExport_area.html

@@ -505,6 +505,7 @@
 				$('.detail').show()
 			});
 			//
+			var areaArr = '';
 			/* 选中结果 */
 			function getResult() {
 				$('.result_name').empty();
@@ -599,7 +600,7 @@
 					}
 				}
 				$('.result_name').append(html);
-				localStorage.areaHtml = html;
+				areaArr = html;
 				isOpen()
 			}
 			//
@@ -690,7 +691,7 @@
 					}
 					$(".tab_content").find(".city.active").each(function(){
 						var city = $(this).html();
-						if(city !== "澳门" && city !=="北京" && city !=="重庆" && city !=="上海" && city !=="天津" && city !=="台湾" && city !=="香港"){
+						if(city !== "澳门" && city !=="北京市" && city !=="重庆市" && city !=="上海市" && city !=="天津市" && city !=="台湾" && city !=="香港"){
 							citys.push(city)
 						}
 						data.push(city);
@@ -712,6 +713,7 @@
 					localStorage.city = citys.toString();
 					localStorage.province = province.toString();
 					localStorage.area = html;
+					localStorage.areaHtml = areaArr;
 					history.back();
 				});
 				$('.reset-btn').click(function(){
@@ -756,22 +758,42 @@
 				 }else{
 					 if(localStorage.areaHtml!==""&&localStorage.areaHtml!==undefined){
 						 let area = localStorage.areaHtml.split("、");
+						 var citys = [];
+						 var province = [];
 						 for(var i in area){
 							 $(".tab").each(function(){
-								 let province = $(this).children(".province").text().replace(/\s/g,"")
-								 if(province === area[i]){
+								 let provinces = $(this).children(".province").text().replace(/\s/g,"");
+								 if(provinces === area[i]){
+									 province.push(area[i]);
 									 $(this).next().children(".city").addClass("active");
+									 $(this).next().find(".city").each(function () {
+										 var city = $(this).text();
+										 if(city !== "澳门" && city !=="北京市" && city !=="重庆市" && city !=="上海市" && city !=="天津市" && city !=="台湾" && city !=="香港"){
+											 citys.push(city)
+										 }
+									 });
 									 if($(this).prop("class") !== "tab municipality"){
 										 $(this).next().slideDown();
 									 }
 								 }
+							 });
+							 $(".tab_content").find(".city").each(function(){
+								 if($(this).text() === area[i]){
+									 $(this).addClass("active");
+									 if($(this).parent().prev().prop("class") !== "tab municipality"){
+										 $(this).parent().slideDown();
+									 }
+								 }
 							 })
 						 }
+						 localStorage.city = citys.toString();
+						 localStorage.province = province.toString();
+						 getResult();
 					 }else{
 						 $(".other").prop("checked", true);
 						 $(".reset-btn").hide();
+						 getResult();
 					 }
-					 getResult();
 				 }
 				 //
 				 $(".tab_content").find(".city.active").each(function(){

src/web/templates/weixin/search/mainSearch.html

@@ -22,7 +22,7 @@
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}411"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
 <!--2.8-->
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">