xiugai

src/client/util_client.go

@@ -5,19 +5,22 @@ import (
 	"regexp"
 	"strings"
 )
+
 var LetterCase = regexp.MustCompile("[A-Za-z]")
+
 //匹配方式map
 var MatchType = map[string]interface{}{
 	"1": "title",
 	"2": "detail",
 	"3": "purchasing",
 	"4": "filetext",
-	"5": "projectname",
+	"5": "projectname.name",
 	"6": "buyer",
 	"7": "s_winner",
 	"8": "buyer",
 	"9": "s_winner",
 }
+
 func TestMactchKeys(types, key string, data map[string]interface{}) string {
 	keyWord := []string{}
 	if strings.Contains(types, "1") {

src/history/util_history.go

@@ -34,7 +34,7 @@ var MatchType = map[string]interface{}{
 	"2": "detail",
 	"3": "purchasing",
 	"4": "filetext",
-	"5": "projectname",
+	"5": "projectname.name",
 	"6": "buyer",
 	"7": "s_winner",
 	"8": "buyer",

src/util/utiltag.go

@@ -19,31 +19,31 @@ import (
 )
 
 const (
-	TitleMatchType            = "1"                //标题匹配
-	DetailMatchType           = "2"                //全文匹配
-	PurchasingMatchType       = "3"                //标的物匹配
-	AttachmentsMatchType      = "4"                //附件匹配
-	ProjectnameMatchType      = "5"                //项目名称匹配
-	BuyerMatchType            = "6"                //采购单位匹配
-	SWinnerMatchType          = "7"                //中标单位匹配
-	BuyerMatchType1           = "8"                //采购单位(正则)匹配
-	SWinnerMatchType1         = "9"                //中标单位(正则)匹配
-	TitleMatchTypeStr         = "title"            //标题匹配
-	DetailMatchTypeStr        = "detail"           //全文匹配
-	PurchasingMatchTypeStr    = "purchasing"       //标的物匹配
-	AttachmentsMatchTypeStr   = "filetext"         //附件匹配
-	ProjectnameMatchTypeStr   = "projectname.name" //项目名称匹配
-	BuyerMatchTypeStr         = "buyer"            //项目名称匹配
-	BuyerRegexpMatchTypeStr   = "buyer.mbuyer"     //采购单位正则匹配
-	SWinnerMatchTypeStr       = "s_winner"         //项目名称匹配
-	SWinnerRegexpMatchTypeStr = "s_winner.mwinner" //中标单位正则匹配
-	TitleMatchTypeField       = "title"            //标题匹配
-	DetailMatchTypeField      = "detail"           //全文匹配
-	PurchasingMatchTypeField  = "purchasing"       //标的物匹配
-	AttachmentsMatchTypeField = "filetext"         //附件匹配
-	ProjectnameMatchTypeField = "projectname.name" //项目名称匹配
-	BuyerMatchTypeField       = "buyer"            //项目名称匹配
-	SWinnerMatchTypeField     = "s_winner"         //项目名称匹配
+	TitleMatchType            = "1"                 //标题匹配
+	DetailMatchType           = "2"                 //全文匹配
+	PurchasingMatchType       = "3"                 //标的物匹配
+	AttachmentsMatchType      = "4"                 //附件匹配
+	ProjectnameMatchType      = "5"                 //项目名称匹配
+	BuyerMatchType            = "6"                 //采购单位匹配
+	SWinnerMatchType          = "7"                 //中标单位匹配
+	BuyerMatchType1           = "8"                 //采购单位(正则)匹配
+	SWinnerMatchType1         = "9"                 //中标单位(正则)匹配
+	TitleMatchTypeStr         = "title"             //标题匹配
+	DetailMatchTypeStr        = "detail"            //全文匹配
+	PurchasingMatchTypeStr    = "purchasing"        //标的物匹配
+	AttachmentsMatchTypeStr   = "filetext"          //附件匹配
+	ProjectnameMatchTypeStr   = "projectname.pname" //项目名称匹配
+	BuyerMatchTypeStr         = "buyer"             //项目名称匹配
+	BuyerRegexpMatchTypeStr   = "buyer.mbuyer"      //采购单位正则匹配
+	SWinnerMatchTypeStr       = "s_winner"          //项目名称匹配
+	SWinnerRegexpMatchTypeStr = "s_winner.mwinner"  //中标单位正则匹配
+	TitleMatchTypeField       = "title"             //标题匹配
+	DetailMatchTypeField      = "detail"            //全文匹配
+	PurchasingMatchTypeField  = "purchasing"        //标的物匹配
+	AttachmentsMatchTypeField = "filetext"          //附件匹配
+	ProjectnameMatchTypeField = "projectname.pname" //项目名称匹配
+	BuyerMatchTypeField       = "buyer"             //项目名称匹配
+	SWinnerMatchTypeField     = "s_winner"          //项目名称匹配
 	MultiMatchType            = "phrase"
 	Standard                  = 1          //1:标准字段包，
 	Advanced                  = 2          //2：高级字段包

src/web/templates/client/cuser_rule_edit.html

@@ -50,6 +50,7 @@
                 </form>
                 <a class="btn btn-sm btn-instagram previewDatass" onclick="previewData1()"><i class="fa fa-fw fa-database fa-lg"></i>快速预览</a>
                 <button class="btn btn-warning btn-sm previewDatass" onclick="previewData()"><i class="fa fa-fw fa-eye fa-lg"></i>数据导出</button>
+                <button class="btn btn-warning btn-sm" onclick="exportPreview()"><i class="fa fa-fw fa-eye fa-lg"></i>导出预览</button>
             </small>
             <a class="btn btn-primary btn-sm" id="back" style="float: right"> 返回</a>
 
@@ -1735,6 +1736,11 @@
         },1000)
     }
     
+    function exportPreview(){
+        var href = previewHref+"?type=private" + "&key=" + dataMap.s_dataid;
+        window.open(href);
+    }
+    
     //预览数据
         function previewData1() {
             com.maskShow("正在生成数据...");