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

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/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/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"}}">