xg

src/service/private_rule.go

@@ -88,6 +88,7 @@ func (r *Rule) RuleCreate() {
 		r.T["topTypeArr"] = TopTypeArr
 		r.T["subTypeArr"] = SubTypeArr
 		r.T["matchTypeMap"] = MatchTypeMap
+		r.T["matchTypeMap2"] = MatchTypeMap2
 		r.T["existField"] = ExistFiled
 		r.T["buyerClass"] = BuyerClass
 		r.T["scopeClass"] = ScopeClassMap
@@ -156,6 +157,7 @@ func (r *Rule) RuleEdit() {
 	r.T["topTypeArr"] = TopTypeArr
 	r.T["subTypeArr"] = SubTypeArr
 	r.T["matchTypeMap"] = MatchTypeMap
+	r.T["matchTypeMap2"] = MatchTypeMap2
 	r.T["existField"] = ExistFiled
 	r.T["buyerClass"] = BuyerClass
 	r.T["scopeClass"] = ScopeClassMap
@@ -393,12 +395,13 @@ func (r *Rule) ImportComRule() {
 	defer qu.Catch()
 	result := map[string]interface{}{} //存储所有追加好的数据
 	o_rules_all := []interface{}{}     //o_rule所有数据
-	// tagid := r.GetString("tagid")      //有tagid表示编辑，无是新建
-	// if tagid != "" { //在原有数据的基础上追加
-	// 	tag, _ := Mgo.FindById("tags", tagid, `{}`)
-	// 	o_rules_all = addcomrule(*tag, result, o_rules_all)
-	// 	//补充在编标签不可追加字段数据 i_startime,i_endtime,s_budgetlimit,s_bidamountlimit
-	// }
+	tagid := r.GetString("tagid")      //有tagid表示编辑，无是新建
+	if tagid != "" {                   //在原有数据的基础上追加
+		tag, _ := Mgo.FindById("tags", tagid, `{}`)
+		if o_rule_tmp, ok := (*tag)["o_rules"].([]interface{}); ok {
+			o_rules_all = append(o_rules_all, o_rule_tmp...)
+		}
+	}
 	ids := r.GetString("ids")
 	idArr := strings.Split(ids, ",")
 	rep := false
@@ -415,7 +418,6 @@ func (r *Rule) ImportComRule() {
 			rep = true
 		}
 	}
-	qu.Debug(result)
 	r.ServeJson(map[string]interface{}{
 		"rep":  rep,
 		"data": result,
@@ -442,7 +444,7 @@ func addcomrule(d, result map[string]interface{}, o_rules_all []interface{}) []i
 			continue
 		}
 
-		if k == "o_rules" { //封装所有的o_rules
+		if k == "o_rules" && v != nil { //封装所有的o_rules
 			o_rulesArr := v.([]interface{})
 			if len(o_rulesArr) > 0 {
 				o_rules_all = append(o_rules_all, o_rulesArr...)

src/util/config.go

@@ -13,7 +13,7 @@ var (
 	EsIndex, EsType string
 	MgoEnC          string
 	Subday          float64
-	PreviewHref string //数据预览地址
+	PreviewHref     string //数据预览地址
 )
 
 var (
@@ -24,6 +24,7 @@ var (
 	CityDistricts map[string][]string       //市:[区1,区2]
 	BuyerClass    []string                  //采购单位行业
 	MatchTypeMap  *[]map[string]interface{} //匹配方式
+	MatchTypeMap2 map[string]interface{}    //匹配方式
 	ExistFiled    []string                  //存在的字段
 	ScopeClassMap *[]map[string]interface{} //公告行业
 
@@ -108,7 +109,15 @@ func initBuyerClass() {
 
 func initMatchType() {
 	//map初始化
+	if MatchTypeMap2 == nil {
+		MatchTypeMap2 = make(map[string]interface{})
+	}
 	MatchTypeMap, _ = Mgo.Find("code_matchtype", `{}`, `{"_id":1}`, `{}`, false, -1, -1)
+	for _, d := range *MatchTypeMap {
+		code := qu.ObjToString(d["code"])
+		name := qu.ObjToString(d["name"])
+		MatchTypeMap2[code] = name
+	}
 }
 
 func initExitField() {

src/web/templates/com/modal.html

@@ -376,7 +376,6 @@
       showConfirm("确定新增标签?", function() {
 				$.post("/service/rule/importcomrule",{"ids":ids.join(","),"tagid":dataMap._id},function(d){
           if(d&&d.rep){
-            console.log(d.data)
             $("#modal-comrule").modal("hide");
             addcomdata(d);
           }else{
@@ -486,14 +485,17 @@
       }
       //全局附加词匹配方式
       if(d.data.s_globaladdkeymatch != undefined){
-        $("#addKey").selectpicker('deselectAll');//清除已有值
-        $("#addKey").find("option").each(function(){
-          if(d.data.s_globaladdkeymatch.indexOf($(this).val()) != -1){
-            $(this).attr("selected",true);
+        var v ="";
+        var s_globaladdkeymatchArr = d.data.s_globaladdkeymatch.split(",")
+        for(var i in s_globaladdkeymatchArr){
+          var code = s_globaladdkeymatchArr[i];
+          if(i == 0){
+            v = matchTypeMap2[code];
+          }else{
+            v = v+","+matchTypeMap2[code];
           }
-        })
-        //$("#addKey").selectpicker("refresh");//刷新select框
-         dataMap.s_globaladdkeymatch = d.data.s_globaladdkeymatch;
+        }
+        $("#s_addkeymatch").val(v);
       }
       //全局排除词
       if(d.data.s_globalnotkey != undefined){
@@ -502,13 +504,17 @@
       }
       //全局排除词匹配方式
       if(d.data.s_globalnotkeymatch != undefined){
-        $("#notKey").selectpicker('deselectAll');//清除已有值
-        $("#notKey").find("option").each(function(){
-          if(d.data.s_globalnotkeymatch.indexOf($(this).val()) != -1){
-            $(this).attr("selected",true);
+        var v ="";
+        var s_globalnotkeymatchArr = d.data.s_globalnotkeymatch.split(",")
+        for(var i in s_globalnotkeymatchArr){
+          var code = s_globalnotkeymatchArr[i];
+          if(i == 0){
+            v = matchTypeMap2[code];
+          }else{
+            v = v+","+matchTypeMap2[code];
           }
-        })
-        //$("#notKey").selectpicker("refresh");//刷新select框
+        }
+        $("#s_notkeymatch").val(v);
          dataMap.s_globalnotkeymatch = d.data.s_globalnotkeymatch;
       }
       //采购单位行业

src/web/templates/private/common_rule_create.html

@@ -162,7 +162,7 @@
                                                 })
                                             </script>
                                         </div>
-                                    </div>
+                                    </div>S
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label ">开始时间</label>
                                         <div class="col-sm-3">
@@ -196,11 +196,11 @@
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label">选择字段</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="existField"
+                                            <select class="form-control selectpicker" multiple id="existFieldSelect"
                                                     data-actions-box="true"></select>
                                             <script>
-                                                $('#existField').on('hide.bs.select', function () {
-                                                    var arr = $('#existField').val();
+                                                $('#existFieldSelect').on('hide.bs.select', function () {
+                                                    var arr = $('#existFieldSelect').val();
                                                     var arrStr = "";
                                                     for (var i in arr) {
                                                         if (arrStr === "") {
@@ -243,21 +243,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="addKey"></select>
-                                            <script>
-                                                $('#addKey').on('hide.bs.select', function () {
-                                                    var arr = $('#addKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globaladdkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_addkeymatch" onclick="selectKeyMatch(0)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -268,21 +255,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="notKey"></select>
-                                            <script>
-                                                $('#notKey').on('hide.bs.select', function () {
-                                                    var arr = $('#notKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globalnotkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_notkeymatch" onclick="selectKeyMatch(1)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -333,11 +307,11 @@
                                 <i class="fa fa-bookmark"></i>
                                 <h3 class="box-title">关键词规则</h3>
                                 <div style="float: right">
-                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch()">关键词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectAddMatch()">附加词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectNotMatch()">排除词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(8)">采购单位行业</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectScope(9)">公告行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(4)">关键词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(6)">附加词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(8)">排除词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(9)">采购单位行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectScope(10)">公告行业</a>
                                 </div>
                             </div>
                             <table id="keywords" class="table table-bordered">
@@ -394,7 +368,7 @@
     var keyTableChecked = false;        //关键词表格数据是否有选中
     var keyTableAllChecked = true;      //表单数据是否被全选中
     var selectIndex = [];               //选中的编号
-    var setValue = 5;                   // 赋值表格，5: 关键词/附加词匹配方式，7：排除词匹配方式，8：采购行业，9：公告行业， 2：全局采购单位行业， 3：全局公告行业
+    var setValue = 0;                   // 0：全局附加词，1：全局排除词，2：全局采购单位行业，3：全局公告行业，4: 关键词匹配方式，6：附加词匹配方式，8：排除词匹配方式，9：采购单位，10：公告行业，
     var o_rules = [];                    //关键词列表
 
     var s_dataid = "";                  //预览链接加密串
@@ -474,27 +448,24 @@
             var opt = document.createElement('option');
             opt.innerText = existField[i];
             opt.value = existField[i];
-            $('#existField')[0].appendChild(opt)
+            $('#existFieldSelect')[0].appendChild(opt)
         }
-        $("#addKey").selectpicker("refresh");
-        $("#notKey").selectpicker("refresh");
-        $("#existField").selectpicker("refresh");
+        $("#existFieldSelect").selectpicker("refresh");
 
-        var btnMatchHtml = "";
+        var btnMatchHtml1 = "";
+        var btnMatchHtml2 = "";
+        //匹配方式
         for (var i in matchTypeMap) {
-            var opt = document.createElement('option');
-            var opt1 = document.createElement('option');
-            opt.innerText = matchTypeMap[i]["name"];
-            opt.value = matchTypeMap[i]["code"];
-            opt1.innerText = matchTypeMap[i]["name"];
-            opt1.value = matchTypeMap[i]["code"];
-            $('#addKey')[0].appendChild(opt1);
-            $('#notKey')[0].appendChild(opt);
-
-            btnMatchHtml += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
+            if (i < 5) {
+                btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
+                            code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
+            }else {
+                btnMatchHtml2 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn2(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
+            }
         }
-        $("#btnGroupMatch").append(btnMatchHtml);
+        $("#btnGroupMatch").append(btnMatchHtml1);
+        $("#btnGroupMatch2").append(btnMatchHtml2);
         var btnBuyerHtml = "";
         for (var i in buyerClass) {
             btnBuyerHtml += `<input type="button" class="btn btn-default col-md-2" style="margin-left: 10px;margin-top: 10px" onclick="clickBuyerBtn(this)"
@@ -631,37 +602,21 @@
             $(this).removeClass("active-btn-match");
         });
     }
-    //关键词匹配方式modal
-    function selectKeyMatch() {
-        if (keyTableChecked) {
-            setValue = 4;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        }else {
-            alert("请选中关键词")
-        }
-    }
-    //附加词匹配方式
-    function selectAddMatch() {
-        if (keyTableChecked) {
-            setValue = 6;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        }else {
-            alert("请选中关键词")
-        }
-    }
-    //排除词匹配方式modal
-    function selectNotMatch() {
-        if (keyTableChecked) {
-            setValue = 8;
+    //关键词/附加词/排除词匹配方式modal
+    function selectKeyMatch(val) {
+        setValue = val;
+        if (setValue == 0 || setValue == 1) {
             matchCode.length = 0;
             matchName.length = 0;
             $('#modal-select-match').modal("show");
         }else {
-            alert("请选中关键词")
+            if (keyTableChecked) {
+                matchCode.length = 0;
+                matchName.length = 0;
+                $('#modal-select-match').modal("show");
+            }else {
+                alert("请选中关键词")
+            }
         }
     }
     //匹配方式按钮点击事件
@@ -697,7 +652,13 @@
         }
         for (var i in selectIndex) {
             var j = selectIndex[i] - 1;
-            if (setValue == 4) {
+            if (setValue == 0) {
+                $('#s_addkeymatch').val(matchNameStr);
+                dataMap["s_globaladdkeymatch"] = codeStr
+            }else if (setValue == 1) {
+                $('#s_notkeymatch').val(matchNameStr);
+                dataMap["s_globalnotkeymatch"] = codeStr
+            }else if (setValue == 4) {
                 if ($("#keywords tbody tr:nth-child("+selectIndex[i]+") td:nth-child(3)").text() != "") {
                     $("#keywords tbody tr:nth-child("+selectIndex[i]+") td:nth-child("+setValue+")").html(matchNameStr);
                     o_rules[j]["s_keymatch"] = codeStr;
@@ -734,7 +695,7 @@
     //采购单位点击
     function clickBuyerBtn(obj) {
         if ($(obj).hasClass("active-btn-match")) {
-            $(obj).removeClass("active-btn-match")
+            $(obj).removeClass("active-btn-match");
             buyerArr.splice($.inArray($(obj).val(), buyerArr), 1)
         } else {
             $(obj).addClass("active-btn-match");
@@ -784,7 +745,7 @@
     //公告行业二级点击
     function btnSubScopeClick(obj) {
         if ($(obj).hasClass("active-btn-match")) {
-            $(obj).removeClass("active-btn-match")
+            $(obj).removeClass("active-btn-match");
             scopeSubArr.splice($.inArray($(obj).val(), scopeSubArr), 1)
         } else {
             $(obj).addClass("active-btn-match");
@@ -854,7 +815,6 @@
 
         $('#keywords').dataTable().fnClearTable();
         $('#keywords').dataTable().fnAddData(rdata["o_rules"]);
-
     }
     //表格全选
     function allSelect(obj) {
@@ -876,14 +836,13 @@
     }
     //表格单个选中
     function singleSelect(obj) {
-        var tag = true;
+        var tag = false;
         selectIndex.length = 0;
         $('input[name="ckb-keyid"]').each(function () {
-            if (this.checked == true) {
+            if (this.checked) {
                 keyTableChecked = true;
+                tag = true;
                 selectIndex.push($(this).parents("tr").index() + 1);
-            }else {
-                tag = false;
             }
         });
         if (tag) {
@@ -947,6 +906,8 @@
         }else if (dataMap.s_globaladdkeymatch.indexOf("6") > -1 || dataMap.s_globaladdkeymatch.indexOf("7") > -1 ||
             dataMap.s_globaladdkeymatch.indexOf("8") > -1 || dataMap.s_globaladdkeymatch.indexOf("9") > -1) {
             dataMap["i_globaladdkeytype"] = 2
+        }else {
+            dataMap["i_globaladdkeytype"] = 0
         }
         if (dataMap.s_globalnotkeymatch.indexOf("1") > -1 || dataMap.s_globalnotkeymatch.indexOf("2") > -1 || dataMap.s_globalnotkeymatch.indexOf("3") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("4") > -1 || dataMap.s_globalnotkeymatch.indexOf("5") > -1) {
@@ -954,6 +915,8 @@
         }else if (dataMap.s_globalnotkeymatch.indexOf("6") > -1 || dataMap.s_globalnotkeymatch.indexOf("7") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("8") > -1 || dataMap.s_globalnotkeymatch.indexOf("9") > -1) {
             dataMap["i_globalnotkeytype"] = 2
+        }else {
+            dataMap["i_globalnotkeytype"] = 0
         }
         dataMap["o_rules"] = JSON.stringify(o_rules);
         $.ajax({

src/web/templates/private/common_rule_edit.html

@@ -247,21 +247,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="addKey"></select>
-                                            <script>
-                                                $('#addKey').on('hide.bs.select', function () {
-                                                    var arr = $('#addKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globaladdkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_addkeymatch" onclick="selectKeyMatch(0)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -272,21 +259,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="notKey"></select>
-                                            <script>
-                                                $('#notKey').on('hide.bs.select', function () {
-                                                    var arr = $('#notKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globalnotkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_notkeymatch" onclick="selectKeyMatch(1)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -338,11 +312,11 @@
                                 <i class="fa fa-bookmark"></i>
                                 <h3 class="box-title">关键词规则</h3>
                                 <div style="float: right">
-                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch()">关键词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectAddMatch()">附加词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectNotMatch()">排除词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(8)">采购单位行业</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectScope(9)">公告行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(4)">关键词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(6)">附加词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(8)">排除词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(9)">采购单位行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectScope(10)">公告行业</a>
                                 </div>
                             </div>
                             <table id="keywords" class="table table-bordered">
@@ -395,7 +369,7 @@
     var keyTableChecked = false;        //关键词表格数据是否有选中
     var keyTableAllChecked = true;      //表单数据是否被全选中
     var selectIndex = [];               //选中的编号
-    var setValue = 5;                   // 赋值表格，5: 关键词/附加词匹配方式，7：排除词匹配方式，8：采购行业，9：公告行业
+    var setValue = 0;                   //4: 关键词匹配方式，6：附加词匹配方式，8：排除词匹配方式，9：采购单位，10：公告行业， 2：全局采购单位行业， 3：全局公告行业
     var state = 1;
     $(document).ready(function () {
         $('#extfiledselect').val(dataMap.i_extfieldstype);
@@ -510,22 +484,9 @@
 
         var btnMatchHtml1 = "";
         var btnMatchHtml2 = "";
+        var addMatchName = "";
+        var notMatchName = "";
         for (var i in matchTypeMap) {
-            var opt = document.createElement('option');
-            var opt1 = document.createElement('option');
-            opt.innerText = matchTypeMap[i]["name"];
-            opt.value = matchTypeMap[i]["code"];
-            if (dataMap.s_globaladdkeymatch && dataMap.s_globalnotkeymatch.indexOf(matchTypeMap[i]["code"]) != -1) {
-                opt.selected = true
-            }
-            opt1.innerText = matchTypeMap[i]["name"];
-            opt1.value = matchTypeMap[i]["code"];
-            if (dataMap.s_globaladdkeymatch && dataMap.s_globaladdkeymatch.indexOf(matchTypeMap[i]["code"]) != -1) {
-                opt1.selected = true
-            }
-            $('#addKey')[0].appendChild(opt1);
-            $('#notKey')[0].appendChild(opt);
-
             if (i < 5) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
@@ -533,11 +494,26 @@
                 btnMatchHtml2 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn2(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             }
+            if (dataMap.s_globaladdkeymatch.indexOf(matchTypeMap[i]["code"]) > -1) {
+                if (addMatchName == "") {
+                    addMatchName = matchTypeMap[i]["name"]
+                }else {
+                    addMatchName = addMatchName + "," + matchTypeMap[i]["name"]
+                }
+            }
+            if (dataMap.s_globalnotkeymatch.indexOf(matchTypeMap[i]["code"]) > -1) {
+                if (notMatchName == "") {
+                    notMatchName = matchTypeMap[i]["name"]
+                }else {
+                    notMatchName = notMatchName + "," + matchTypeMap[i]["name"]
+                }
+            }
         }
+
         $("#btnGroupMatch").append(btnMatchHtml1);
         $("#btnGroupMatch2").append(btnMatchHtml2);
-        $("#addKey").selectpicker("refresh");
-        $("#notKey").selectpicker("refresh");
+        if (addMatchName != "") $('#s_addkeymatch').val(addMatchName);
+        if (notMatchName != "") $('#s_notkeymatch').val(notMatchName);
         var btnBuyerHtml = "";
         for (var i in buyerClass) {
             btnBuyerHtml += `<input type="button" class="btn btn-default col-md-2" style="margin-left: 10px;margin-top: 10px" onclick="clickBuyerBtn(this)"
@@ -745,37 +721,21 @@
         $('#infoType').selectpicker("deselectAll")
         $('#infoType').selectpicker("refresh");
     }
-    //关键词匹配方式modal
-    function selectKeyMatch() {
-        if (keyTableChecked) {
-            setValue = 4;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        } else {
-            alert("请选中关键词")
-        }
-    }
-    //附加词匹配方式
-    function selectAddMatch() {
-        if (keyTableChecked) {
-            setValue = 6;
+    //关键词/附加词/排除词匹配方式modal
+    function selectKeyMatch(val) {
+        setValue = val;
+        if (setValue == 0 || setValue == 1) {
             matchCode.length = 0;
             matchName.length = 0;
             $('#modal-select-match').modal("show");
         }else {
-            alert("请选中关键词")
-        }
-    }
-    //排除词匹配方式modal
-    function selectNotMatch() {
-        if (keyTableChecked) {
-            setValue = 8;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        } else {
-            alert("请选中关键词")
+            if (keyTableChecked) {
+                matchCode.length = 0;
+                matchName.length = 0;
+                $('#modal-select-match').modal("show");
+            }else {
+                alert("请选中关键词")
+            }
         }
     }
     //匹配方式按钮点击事件
@@ -1015,21 +975,22 @@
     }
     //表格单个选中
     function singleSelect(obj) {
-        var tag = true;
+        var tag = false;
         selectIndex.length = 0;
         $('input[name="ckb-keyid"]').each(function () {
-            if (this.checked == true) {
+            if (this.checked) {
                 keyTableChecked = true;
+                tag = true;
                 selectIndex.push($(this).parents("tr").index() + 1);
-            } else {
-                tag = false;
             }
         });
         if (tag) {
             keyTableAllChecked = true;
+            keyTableChecked = true;
             $('#allCheckbox').prop("checked", true);
         } else {
             keyTableAllChecked = false;
+            keyTableChecked = false;
             $('#allCheckbox').prop("checked", false);
         }
     }
@@ -1088,6 +1049,8 @@
         }else if (dataMap.s_globaladdkeymatch.indexOf("6") > -1 || dataMap.s_globaladdkeymatch.indexOf("7") > -1 ||
             dataMap.s_globaladdkeymatch.indexOf("8") > -1 || dataMap.s_globaladdkeymatch.indexOf("9") > -1) {
             dataMap["i_globaladdkeytype"] = 2
+        }else {
+            dataMap["i_globaladdkeytype"] = 0
         }
         if (dataMap.s_globalnotkeymatch.indexOf("1") > -1 || dataMap.s_globalnotkeymatch.indexOf("2") > -1 || dataMap.s_globalnotkeymatch.indexOf("3") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("4") > -1 || dataMap.s_globalnotkeymatch.indexOf("5") > -1) {
@@ -1095,6 +1058,8 @@
         }else if (dataMap.s_globalnotkeymatch.indexOf("6") > -1 || dataMap.s_globalnotkeymatch.indexOf("7") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("8") > -1 || dataMap.s_globalnotkeymatch.indexOf("9") > -1) {
             dataMap["i_globalnotkeytype"] = 2
+        }else {
+            dataMap["i_globalnotkeytype"] = 0
         }
         dataMap["o_rules"] = JSON.stringify(o_rules);
         $.ajax({

src/web/templates/private/rule_create.html

@@ -257,21 +257,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="addKey"></select>
-                                            <script>
-                                                $('#addKey').on('hide.bs.select', function () {
-                                                    var arr = $('#addKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globaladdkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_addkeymatch" onclick="selectKeyMatch(0)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -282,21 +269,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="notKey"></select>
-                                            <script>
-                                                $('#notKey').on('hide.bs.select', function () {
-                                                    var arr = $('#notKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globalnotkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_notkeymatch" onclick="selectKeyMatch(1)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -347,11 +321,11 @@
                                 <i class="fa fa-bookmark"></i>
                                 <h3 class="box-title">关键词规则</h3>
                                 <div style="float: right">
-                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch()">关键词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectAddMatch()">附加词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectNotMatch()">排除词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(8)">采购单位行业</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectScope(9)">公告行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(4)">关键词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(6)">附加词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(8)">排除词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(9)">采购单位行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectScope(10)">公告行业</a>
                                 </div>
                             </div>
                             <table id="keywords" class="table table-bordered">
@@ -390,6 +364,7 @@
     var topTypeArr = {{.T.topTypeArr}};
     var subTypeArr = {{.T.subTypeArr}};
     var matchTypeMap = {{.T.matchTypeMap}};
+    var matchTypeMap2 = {{.T.matchTypeMap2}};
     var existField = {{.T.existField}};
     var buyerClass = {{.T.buyerClass}};
     var scopeClass = {{.T.scopeClass}};
@@ -403,7 +378,7 @@
     var keyTableChecked = false;        //关键词表格数据是否有选中
     var keyTableAllChecked = true;      //表单数据是否被全选中
     var selectIndex = [];               //选中的编号
-    var setValue = 5;                   // 赋值表格，5: 关键词/附加词匹配方式，7：排除词匹配方式，8：采购行业，9：公告行业， 2：全局采购单位行业， 3：全局公告行业
+    var setValue = 0;                   // 4: 关键词匹配方式，6：附加词匹配方式，8：排除词匹配方式，9：采购单位，10：公告行业， 2：全局采购单位行业， 3：全局公告行业
     var o_rules = [];                    //关键词列表
 
     var s_dataid = "";                  //预览链接加密串
@@ -479,25 +454,20 @@
             opt.value = existField[i];
             $('#existFieldSelect')[0].appendChild(opt)
         }
-        $("#addKey").selectpicker("refresh");
-        $("#notKey").selectpicker("refresh");
         $("#existFieldSelect").selectpicker("refresh");
-
-        var btnMatchHtml = "";
+        var btnMatchHtml1 = "";
+        var btnMatchHtml2 = "";
         for (var i in matchTypeMap) {
-            var opt = document.createElement('option');
-            var opt1 = document.createElement('option');
-            opt.innerText = matchTypeMap[i]["name"];
-            opt.value = matchTypeMap[i]["code"];
-            opt1.innerText = matchTypeMap[i]["name"];
-            opt1.value = matchTypeMap[i]["code"];
-            $('#addKey')[0].appendChild(opt1);
-            $('#notKey')[0].appendChild(opt);
-
-            btnMatchHtml += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
+            if (i < 5) {
+                btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
+            }else {
+                btnMatchHtml2 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn2(this)"
+                            code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
+            }
         }
-        $("#btnGroupMatch").append(btnMatchHtml);
+        $("#btnGroupMatch").append(btnMatchHtml1);
+        $("#btnGroupMatch2").append(btnMatchHtml2);
         var btnBuyerHtml = "";
         for (var i in buyerClass) {
             btnBuyerHtml += `<input type="button" class="btn btn-default col-md-2" style="margin-left: 10px;margin-top: 10px" onclick="clickBuyerBtn(this)"
@@ -662,37 +632,21 @@
             showMsg("json格式有误")
         }
     }
-    //关键词匹配方式modal
-    function selectKeyMatch() {
-        if (keyTableChecked) {
-            setValue = 4;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        }else {
-            alert("请选中关键词")
-        }
-    }
-    //附加词匹配方式
-    function selectAddMatch() {
-        if (keyTableChecked) {
-            setValue = 6;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        }else {
-            alert("请选中关键词")
-        }
-    }
-    //排除词匹配方式modal
-    function selectNotMatch() {
-        if (keyTableChecked) {
-            setValue = 8;
+    //关键词/附加词/排除词匹配方式modal
+    function selectKeyMatch(val) {
+        setValue = val;
+        if (setValue == 0 || setValue == 1) {
             matchCode.length = 0;
             matchName.length = 0;
             $('#modal-select-match').modal("show");
         }else {
-            alert("请选中关键词")
+            if (keyTableChecked) {
+                matchCode.length = 0;
+                matchName.length = 0;
+                $('#modal-select-match').modal("show");
+            }else {
+                alert("请选中关键词")
+            }
         }
     }
     //匹配方式按钮点击事件
@@ -933,14 +887,13 @@
     }
     //表格单个选中
     function singleSelect(obj) {
-        var tag = true;
+        var tag = false;
         selectIndex.length = 0;
         $('input[name="ckb-keyid"]').each(function () {
-            if (this.checked == true) {
+            if (this.checked) {
                 keyTableChecked = true;
+                tag = true;
                 selectIndex.push($(this).parents("tr").index() + 1);
-            }else {
-                tag = false;
             }
         });
         if (tag) {
@@ -1008,6 +961,8 @@
         }else if (dataMap.s_globaladdkeymatch.indexOf("6") > -1 || dataMap.s_globaladdkeymatch.indexOf("7") > -1 ||
             dataMap.s_globaladdkeymatch.indexOf("8") > -1 || dataMap.s_globaladdkeymatch.indexOf("9") > -1) {
             dataMap["i_globaladdkeytype"] = 2
+        }else {
+            dataMap["i_globaladdkeytype"] = 0
         }
         if (dataMap.s_globalnotkeymatch.indexOf("1") > -1 || dataMap.s_globalnotkeymatch.indexOf("2") > -1 || dataMap.s_globalnotkeymatch.indexOf("3") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("4") > -1 || dataMap.s_globalnotkeymatch.indexOf("5") > -1) {
@@ -1015,6 +970,8 @@
         }else if (dataMap.s_globalnotkeymatch.indexOf("6") > -1 || dataMap.s_globalnotkeymatch.indexOf("7") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("8") > -1 || dataMap.s_globalnotkeymatch.indexOf("9") > -1) {
             dataMap["i_globalnotkeytype"] = 2
+        }else {
+            dataMap["i_globalnotkeytype"] = 0
         }
         dataMap["o_rules"] = JSON.stringify(o_rules);
         $.ajax({

src/web/templates/private/rule_edit.html

@@ -265,21 +265,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="addKey"></select>
-                                            <script>
-                                                $('#addKey').on('hide.bs.select', function () {
-                                                    var arr = $('#addKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globaladdkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_addkeymatch" onclick="selectKeyMatch(0)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -290,21 +277,8 @@
                                         </div>
                                         <label class="col-sm-2 control-label">匹配方式</label>
                                         <div class="col-sm-3">
-                                            <select class="form-control selectpicker" multiple id="notKey"></select>
-                                            <script>
-                                                $('#notKey').on('hide.bs.select', function () {
-                                                    var arr = $('#notKey').val();
-                                                    var arrStr = "";
-                                                    for (var i in arr) {
-                                                        if (arrStr === "") {
-                                                            arrStr = arr[i]
-                                                        } else {
-                                                            arrStr = arrStr + "," + arr[i]
-                                                        }
-                                                    }
-                                                    dataMap["s_globalnotkeymatch"] = arrStr
-                                                })
-                                            </script>
+                                            <input class="form-control" style="text-align: left;overflow: hidden;white-space: nowrap;text-overflow: ellipsis"
+                                                   type="button" id="s_notkeymatch" onclick="selectKeyMatch(1)">
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -356,11 +330,11 @@
                                 <i class="fa fa-bookmark"></i>
                                 <h3 class="box-title">关键词规则</h3>
                                 <div style="float: right">
-                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch()">关键词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectAddMatch()">附加词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectNotMatch()">排除词匹配方式</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(8)">采购单位行业</a>
-                                    <a class="btn btn-default btn-sm" onclick="selectScope(9)">公告行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(4)">关键词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(6)">附加词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectKeyMatch(8)">排除词匹配方式</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectBuyer(9)">采购单位行业</a>
+                                    <a class="btn btn-default btn-sm" onclick="selectScope(10)">公告行业</a>
                                 </div>
                             </div>
                             <table id="keywords" class="table table-bordered">
@@ -400,6 +374,7 @@
     var topTypeArr = {{.T.topTypeArr}};
     var subTypeArr = {{.T.subTypeArr}};
     var matchTypeMap = {{.T.matchTypeMap}};
+    var matchTypeMap2 = {{.T.matchTypeMap2}};
     var existField = {{.T.existField}};
     var buyerClass = {{.T.buyerClass}};
     var scopeClass = {{.T.scopeClass}};
@@ -413,7 +388,7 @@
     var keyTableChecked = false;        //关键词表格数据是否有选中
     var keyTableAllChecked = true;      //表单数据是否被全选中
     var selectIndex = [];               //选中的编号
-    var setValue = 5;                   // 赋值表格，5: 关键词/附加词匹配方式，7：排除词匹配方式，8：采购行业，9：公告行业
+    var setValue = 0;                   // 4: 关键词匹配方式，6：附加词匹配方式，8：排除词匹配方式，9：采购单位，10：公告行业， 2：全局采购单位行业， 3：全局公告行业
     var state = 1;
     $(document).ready(function () {
         $('#extfiledselect').val(dataMap.i_extfieldstype);
@@ -537,25 +512,12 @@
         $("#infoType").selectpicker("refresh");
         $("#existFieldSelect").selectpicker("refresh");
 
+        //匹配方式
         var btnMatchHtml1 = "";
         var btnMatchHtml2 = "";
-        //匹配方式
+        var addMatchName = "";
+        var notMatchName = "";
         for (var i in matchTypeMap) {
-            var opt = document.createElement('option');
-            var opt1 = document.createElement('option');
-            opt.innerText = matchTypeMap[i]["name"];
-            opt.value = matchTypeMap[i]["code"];
-            if (dataMap.s_globaladdkeymatch && dataMap.s_globalnotkeymatch.indexOf(matchTypeMap[i]["code"]) != -1) {
-                opt.selected = true
-            }
-            opt1.innerText = matchTypeMap[i]["name"];
-            opt1.value = matchTypeMap[i]["code"];
-            if (dataMap.s_globaladdkeymatch && dataMap.s_globaladdkeymatch.indexOf(matchTypeMap[i]["code"]) != -1) {
-                opt1.selected = true
-            }
-            $('#addKey')[0].appendChild(opt1);
-            $('#notKey')[0].appendChild(opt);
-
             if (i < 5) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
@@ -563,11 +525,25 @@
                 btnMatchHtml2 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn2(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             }
+            if (dataMap.s_globaladdkeymatch.indexOf(matchTypeMap[i]["code"]) > -1) {
+                if (addMatchName == "") {
+                    addMatchName = matchTypeMap[i]["name"]
+                }else {
+                    addMatchName = addMatchName + "," + matchTypeMap[i]["name"]
+                }
+            }
+            if (dataMap.s_globalnotkeymatch.indexOf(matchTypeMap[i]["code"]) > -1) {
+                if (notMatchName == "") {
+                    notMatchName = matchTypeMap[i]["name"]
+                }else {
+                    notMatchName = notMatchName + "," + matchTypeMap[i]["name"]
+                }
+            }
         }
         $("#btnGroupMatch").append(btnMatchHtml1);
         $("#btnGroupMatch2").append(btnMatchHtml2);
-        $("#addKey").selectpicker("refresh");
-        $("#notKey").selectpicker("refresh");
+        if (addMatchName != "") $('#s_addkeymatch').val(addMatchName);
+        if (notMatchName != "") $('#s_notkeymatch').val(notMatchName);
         var btnBuyerHtml = "";
         for (var i in buyerClass) {
             btnBuyerHtml += `<input type="button" class="btn btn-default col-md-2" style="margin-left: 10px;margin-top: 10px" onclick="clickBuyerBtn(this)"
@@ -794,37 +770,21 @@
         $('#infoType').selectpicker("deselectAll")
         $('#infoType').selectpicker("refresh");
     }
-    //关键词匹配方式modal
-    function selectKeyMatch() {
-        if (keyTableChecked) {
-            setValue = 4;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        } else {
-            alert("请选中关键词")
-        }
-    }
-    //附加词匹配方式
-    function selectAddMatch() {
-        if (keyTableChecked) {
-            setValue = 6;
+    //关键词/附加词/排除词匹配方式modal
+    function selectKeyMatch(val) {
+        setValue = val;
+        if (setValue == 0 || setValue == 1) {
             matchCode.length = 0;
             matchName.length = 0;
             $('#modal-select-match').modal("show");
         }else {
-            alert("请选中关键词")
-        }
-    }
-    //排除词匹配方式modal
-    function selectNotMatch() {
-        if (keyTableChecked) {
-            setValue = 8;
-            matchCode.length = 0;
-            matchName.length = 0;
-            $('#modal-select-match').modal("show");
-        } else {
-            alert("请选中关键词")
+            if (keyTableChecked) {
+                matchCode.length = 0;
+                matchName.length = 0;
+                $('#modal-select-match').modal("show");
+            }else {
+                alert("请选中关键词")
+            }
         }
     }
     //匹配方式按钮点击事件
@@ -1090,11 +1050,12 @@
     }
     //表格单个选中
     function singleSelect(obj) {
-        var tag = true;
+        var tag = false;
         selectIndex.length = 0;
         $('input[name="ckb-keyid"]').each(function () {
-            if (this.checked == true) {
+            if (this.checked) {
                 keyTableChecked = true;
+                tag = true;
                 selectIndex.push($(this).parents("tr").index() + 1);
             } else {
                 tag = false;
@@ -1163,6 +1124,8 @@
         }else if (dataMap.s_globaladdkeymatch.indexOf("6") > -1 || dataMap.s_globaladdkeymatch.indexOf("7") > -1 ||
             dataMap.s_globaladdkeymatch.indexOf("8") > -1 || dataMap.s_globaladdkeymatch.indexOf("9") > -1) {
             dataMap["i_globaladdkeytype"] = 2
+        }else {
+            dataMap["i_globaladdkeytype"] = 0
         }
         if (dataMap.s_globalnotkeymatch.indexOf("1") > -1 || dataMap.s_globalnotkeymatch.indexOf("2") > -1 || dataMap.s_globalnotkeymatch.indexOf("3") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("4") > -1 || dataMap.s_globalnotkeymatch.indexOf("5") > -1) {
@@ -1170,6 +1133,8 @@
         }else if (dataMap.s_globalnotkeymatch.indexOf("6") > -1 || dataMap.s_globalnotkeymatch.indexOf("7") > -1 ||
             dataMap.s_globalnotkeymatch.indexOf("8") > -1 || dataMap.s_globalnotkeymatch.indexOf("9") > -1) {
             dataMap["i_globalnotkeytype"] = 2
+        }else {
+            dataMap["i_globalnotkeytype"] = 0
         }
         dataMap["o_rules"] = JSON.stringify(o_rules);
         $.ajax({