wip:规则弹窗

CMPlatform/config.json

@@ -225,23 +225,23 @@
   "need_projectid_appid": [
     "jyFApXQQIEAw5TTUZOMBpD"
   ],
-  "redis_addrs": "datag=192.168.3.149:1712,session=192.168.3.149:1712,other=192.168.3.11:1712,ent=192.168.3.149:1712",
+  "redis_addrs": "datag=192.168.3.149:1712,session=192.168.3.149:1712,other=192.168.3.149:1712,ent=192.168.3.149:1712",
   "jyPushMysql": {
     "username": "root",
-    "password": "Topnet123",
-    "address": "192.168.3.149:3306",
+    "password": "=PDT49#80Z!RVv52_z",
+    "address": "192.168.3.14:4000",
     "dbName": "jianyu"
   },
   "jyMysql": {
     "username": "root",
-    "password": "Topnet123",
-    "address": "192.168.3.149:3306",
+    "password": "=PDT49#80Z!RVv52_z",
+    "address": "192.168.3.14:4000",
     "dbName": "jianyu"
   },
   "pushMysql": {
     "username": "root",
-    "password": "Topnet123",
-    "address": "192.168.3.149:3306",
+    "password": "=PDT49#80Z!RVv52_z",
+    "address": "192.168.3.14:4000",
     "dbName": "jianyu",
     "maxIdleConns": 2
   },
@@ -305,4 +305,4 @@
   ],
   "rpcServer_jy": "192.168.3.206:8699",
   "rpcServer_project": "127.0.0.1:7979"
-}
+}

CMPlatform/web/templates/com/modal.html

@@ -91,57 +91,58 @@
                         </div>
                         <div id="insertexactRule">
 
-                            <!--规则1 -->
-                            <div class="insertexactRule-form exact-rule-1 ">
-                                <div class="form-group" >
-                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>关键词分组:</label>
-                                    <div class="col-sm-8">
-                                        <select class="form-control groupSelect" name="groupSelect">
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>出现次数>=</label>
-                                    <div class="col-sm-8">
-                                        <input  type='number' type="number" min='0' class="form-control" name="count" placeholder="请输入次数">
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>匹配方式</label>
-                                    <div class="col-sm-8">
-                                        <select class="form-control selectpicker" multiple name="matchWay">
-                                            <option value="title" selected>标题</option>
-                                            <option value="content">正文</option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
+<!--                            &lt;!&ndash;规则1 &ndash;&gt;-->
+<!--                            <div class="insertexactRule-form exact-rule-1 ">-->
+<!--                                <div class="form-group" >-->
+<!--                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>关键词分组:</label>-->
+<!--                                    <div class="col-sm-8">-->
+<!--                                        <select class="form-control groupSelect" name="groupSelect">-->
+<!--                                        </select>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <div class="form-group">-->
+<!--                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>出现次数>=</label>-->
+<!--                                    <div class="col-sm-8">-->
+<!--                                        <input  type='number' type="number" min='0' class="form-control" name="count" placeholder="请输入次数">-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <div class="form-group">-->
+<!--                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>匹配方式</label>-->
+<!--                                    <div class="col-sm-8">-->
+<!--                                        <select class="form-control selectpicker" multiple name="matchWay">-->
+<!--                                            <option value="title" selected>标题</option>-->
+<!--                                            <option value="content">正文</option>-->
+<!--                                        </select>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+
+<!--                            &lt;!&ndash;规则1 &ndash;&gt;-->
+<!--                            <div class=" exact-rule-2" style="display: none">-->
+<!--                                <div class="form-group" >-->
+<!--                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>关键词分组:</label>-->
+<!--                                    <div class="col-sm-8">-->
+<!--                                        <select class="form-control groupSelect" name="groupSelect">-->
+<!--                                        </select>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <div class="form-group">-->
+<!--                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>出现次数>=</label>-->
+<!--                                    <div class="col-sm-8">-->
+<!--                                        <input  type='number' min='0'  class="form-control" name="count" placeholder="请输入次数">-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <div class="form-group">-->
+<!--                                    <label class="col-sm-4 control-label"><span style="color:red;">* </span>匹配方式</label>-->
+<!--                                    <div class="col-sm-8">-->
+<!--                                        <select class="form-control selectpicker" multiple name="matchWay">-->
+<!--                                            <option value="title" selected>标题</option>-->
+<!--                                            <option value="content">正文</option>-->
+<!--                                        </select>-->
+<!--                                    </div>-->
+<!--                                </div>-->
 
-                            <!--规则1 -->
-                            <div class=" exact-rule-2" style="display: none">
-                            <div class="form-group" >
-                                <label class="col-sm-4 control-label"><span style="color:red;">* </span>关键词分组:</label>
-                                <div class="col-sm-8">
-                                    <select class="form-control groupSelect" name="groupSelect">
-                                    </select>
-                                </div>
                             </div>
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label"><span style="color:red;">* </span>出现次数>=</label>
-                                <div class="col-sm-8">
-                                    <input  type='number' min='0'  class="form-control" name="count" placeholder="请输入次数">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label"><span style="color:red;">* </span>匹配方式</label>
-                                <div class="col-sm-8">
-                                    <select class="form-control selectpicker" multiple name="matchWay">
-                                        <option value="title" selected>标题</option>
-                                        <option value="content">正文</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
                         </div>
                     </div>
          <div style="text-align: center" id="addExactRuleButton">
@@ -392,7 +393,7 @@
                                 <label class="col-sm-2 control-label">分组</label>
                                 <div class="col-sm-10">
                                     <select class="form-control selectpicker" id="selectGroups"></select>
-                                </div>                    
+                                </div>
                             </div>
                         </form>
                     </div>
@@ -525,6 +526,61 @@
 </div>
 
 <script>
+    var exactRuleBool = false
+    var matchWay = {
+        "title":"标题",
+        "content":"正文"
+    }
+    var ruleHtml = "<div class=\"insertexactRule-form  exact-rule-2 exact-rule-class\" >" +
+        "<div class=\"form-group\" >" +
+        "<label class=\"col-sm-4 control-label\"><span style=\"color:red;\">* </span>关键词分组:</label>" +
+        "<div class=\"col-sm-8\">" +
+        "<select class=\"form-control groupSelect\" name=\"groupSelect\">" +
+        "#1#" +
+        "</select>" +
+        "</div>" +
+        "</div>" +
+        "<div class=\"form-group\">" +
+        "<label class=\"col-sm-4 control-label\"><span style=\"color:red;\">* </span>出现次数>=</label>" +
+        "<div class=\"col-sm-8\">" +
+        "<input  type='number' min='0'  class=\"form-control\" name=\"count\" placeholder=\"请输入次数\" value=\"#2#\">" +
+        "</div>" +
+        "</div>" +
+        "<div class=\"form-group\">" +
+        "<label class=\"col-sm-4 control-label\"><span style=\"color:red;\">* </span>匹配方式</label>" +
+        "<div class=\"col-sm-8\">" +
+        "<select class=\"form-control matchWay selectpicker\"  multiple name=\"matchWay\">" +
+        "#3#" +
+        "</select>" +
+        "</div>" +
+        "</div>" +
+        "<div class=\"form-group division-line\">" +
+        "<label class=\"col-sm-4 control-label\"><span style=\"color:red;\"></span></label>" +
+        "<div class=\"col-sm-8\">" +
+        "</div>" +
+        "</div>" +
+        "</div>"
+    //弹窗内容编辑及新增
+    function ruleHtmlFunc(num,groupList) {//num 动作0：首次；1：新增
+        var phrasesHtml = '';
+        var numberHtml = '';
+        var matchWayHtml = '';
+        for (var i=0;i< groupList.length;i++){
+            console.info(groupList[i])
+            phrasesHtml += "<option value='"+groupList[i]["name"]+"'>"+groupList[i]["name"]+"</option>"
+        }
+        if (num>0){
+
+        }
+        for (let key in matchWay) {
+            console.log(`${key}: ${matchWay[key]}`);
+            matchWayHtml +="<option value='"+key+"'>"+matchWay[key]+"</option>"
+        }
+        var ph = ruleHtml.replaceAll("#1#",phrasesHtml).replaceAll("#2#",numberHtml).replaceAll("#3#",matchWayHtml)
+        $("#insertexactRule").append(ph)
+        // 初始化 selectpicker 插件
+        $('.selectpicker').selectpicker('refresh');
+    }
     //通用标签列表
     function importcomrule() {
         comruletable = $('#comrule').DataTable({
@@ -838,4 +894,4 @@
         $('#keywords').dataTable().fnAddData(d.data.o_rules);
         o_rules = d.data.o_rules;
     }
-</script>
+</script>

CMPlatform/web/templates/private/cuser_rule_edit.html

@@ -16,6 +16,38 @@
         background-color: red;
         font-weight: bold;
     }
+
+    .insertexactRule-form{
+        display: block;
+        padding: 10px;
+        border-bottom: 1px solid #ffffff;
+        min-height: 0;
+        max-height: none;
+    }
+    .insertexactRule-form .division-line{
+        display: inline-block !important;
+    }
+    .insertexactRule-form .form-group{
+        display: block;
+        /*overflow: auto;*/
+        margin-bottom: 1px !important;
+    }
+    .insertexactRule-form .form-group label{
+        padding-top: 8px;
+    }
+    .insertexactRule-form .form-group .col-sm-8{
+        margin-bottom: 5px;
+    }
+    .modal-header {
+        border-bottom-color: #fff;
+        padding-bottom: 0px !important;
+    }
+    #addExactRuleButton a {
+        cursor:pointer;
+    }
+    .insertexactRule-form {
+        padding: 10px 10px 0px 10px;
+    }
 </style>
 <div class="content-wrapper">
     <section class="content-header">
@@ -1873,7 +1905,7 @@
                     } else {
                         showTip("数据生成失败", 12000);
                     }
-            
+
                 },
                 error: function (r) {
                     com.maskHide();
@@ -2172,7 +2204,7 @@
             $('#dataCount').html(str);
         }
     }
-    
+
     function produceAll(){
         $('#modal-preview').modal("hide");
         produceData("2");
@@ -2799,15 +2831,18 @@
         })
     }
     //分组管理
+    var groupList = new Array()
     // 精准筛选规则-新增按钮点击方法
     function addExactRuleShow(){
+        //初始化
+        $("#insertexactRule").html("");
+        $("#addExactRuleButton").show();
         // 判断是否设置关键词
-
         // 判断是否设置关键词匹配方式
         //
         $("#modal-add-exactRule select[name='groupSelect']").empty()
         $("#modal-add-exactRule input[name='count']").val('')
-        debugger
+        // debugger
         // 新增精准筛选规则弹框
        // 请求分组列表接口获取数据
         $.ajax({
@@ -2817,12 +2852,14 @@
             async: false,
             success: function (r) {
                 if (r.data) {
-                    for (var i in r.data) {
-                        var groupOption = document.createElement('option');
-                        groupOption.innerText =r.data[i].name
-                        groupOption.value = r.data[i].name
-                        $("#modal-add-exactRule select[name='groupSelect']").append(groupOption)
-                    }
+                    groupList=r.data;
+                    ruleHtmlFunc(0,r.data)
+                    // for (var i in r.data) {
+                    //     var groupOption = document.createElement('option');
+                    //     groupOption.innerText =r.data[i].name
+                    //     groupOption.value = r.data[i].name
+                    //     $("#modal-add-exactRule select[name='groupSelect']").append(groupOption)
+                    // }
                 }
             }
         })
@@ -2831,10 +2868,14 @@
     }
     // 精准筛选规则-新增按钮
     function addExactRule(){
-        $("#insertexactRule .exact-rule-2").addClass("insertexactRule-form")
-        $("#insertexactRule .exact-rule-2").show()
-        $("#addExactRuleButton").hide()
+        // $("#insertexactRule .exact-rule-2").addClass("insertexactRule-form")
+        // $("#insertexactRule .exact-rule-2").show()
+        // $("#addExactRuleButton").hide()
         // $(".insertexactRule-form").selectpicker("refresh");
+        ruleHtmlFunc(0,groupList)
+        if ($('.exact-rule-class').length > 3){
+            $("#addExactRuleButton").hide()
+        }
     }
     // 精准筛选规则-新增精准匹配规则保存按钮点击事件
     function add_exactRule_save(){