xuzhiheng 6 éve
szülő
commit
f9178f5a04

+ 5 - 3
src/web/staticres/wx_dataExport/js/keyWord.js

@@ -130,7 +130,7 @@ $(function(){
                 }
             }]
         });
-        console.log('删除关键词:',$(this).parent().find('span').text())
+        // console.log('删除关键词:',$(this).parent().find('span').text())
 
     })
     // 编辑确定
@@ -175,7 +175,7 @@ $(function(){
     //关键词个数
     $('.modify span').keydown(function(){
         var olength = $(this).text().replace(/\s+/g,'').length;
-        console.log(olength)
+        // console.log(olength)
         if(olength >= 100){
             $('.fontLength').show();
             var s = $(this).text().slice(0,100)
@@ -183,7 +183,9 @@ $(function(){
             weui.toast('关键词不能超过100字', {
                 duration: 2000,
                 className: 'text-overflow100',
-                callback: function(){ console.log('close') }
+                callback: function(){
+
+                }
             });
         }
     })

+ 114 - 57
src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -12,57 +12,96 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 </head>
-
 <body>
 
-    <div class="keyWord">
-        <p class="title">示例:开发(附加词)</p>
-        <!-- 添加附加词 -->
-        <div class="enter addkeyWord">
-            <input type="text" class="enterOne" placeholder="请输入附加词" />
-            <div class="btn">
-                <button disabled>确认</button>
-            </div>
-        </div>
+<div class="keyWord">
+    <p class="title">示例:开发(附加词)</p>
+<!-- 添加附加词 -->
+<div class="enter addkeyWord">
+    <input type="text" class="enterOne" placeholder="请输入附加词" />
+    <div class="btn">
+    <button disabled>确认</button>
+</div>
+</div>
+
+<!-- 添加附加词显示列表 -->
+<div class="showKeyWord">
+    <ul>
+
+    </ul>
 
-        <!-- 添加附加词显示列表 -->
-        <div class="showKeyWord">
-            <ul>
+    </div>
+
+    <div class="addKeyWord">
+    <i class="iconfont icon-tianjia"></i>
+    </div>
 
-            </ul>
+    <div class="problem">
+    疑问解答 <i class="iconfont icon-wenhao"></i>
+    </div>
 
-            <div class="addKeyWord">
-                <i class="iconfont icon-tianjia"></i>
-            </div>
+    <!-- 疑难问题弹窗 -->
+    <div class="problemPop">
+    <div class="problemPopContent">
+    <h3>疑问解答</h3>
+    <ul>
+    <li>
+    <h4>·关键词</h4>
+<p>目标信息中的关键性词语,如“软件系统”</p>
+</li>
+<li>
+<h4>·附加词</h4>
+<p>与关键词形成一体/组合,便于查找准确信息,如“开发”</p>
+</li>
+<li>
+<h4>·排除词</h4>
+<p>与关键词互斥,可排除一部分非目标信息,如“运维”</p>
+</li>
+</ul>
+<button class="knowBtn">我知道了</button>
+    </div>
 
-        </div>
+    </div>
 
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
+        var keyWordArr = [];
         var appendedArr = [];
-        if(localStorage.appended !== "" && localStorage.appended !== undefined){
-            var appended = localStorage.appended.split(",");
-            appendedArr = appended;
+        var url = location.href;
+        var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        //
+        if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+            var keyWord = localStorage.keyWord;
+            keyWordArr = JSON.parse(keyWord);
             var html = "";
-            for(var i in appended){
-                html +=
-                    `<li>
+            for(var i in keyWordArr){
+                var keyWords = keyWordArr[i].keyWord;
+                var appendeds = keyWordArr[i].appended;
+                if(keyWords === token){
+                    appendedArr = appendeds
+                    if(appendeds !== undefined){
+                        for(var m in appendedArr){
+                            html +=
+                                `<li>
                             <div class="one">
                                 <div>
                                     <span>
-                                        <p class="key">${ appended[i] }</p>
+                                        <p class="key">${ appendedArr[m] }</p>
                                     </span>
                                 </div>
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span contentEditable="true">${ appended[i] }</span>
+                                <span contentEditable="true">${ appendedArr[m] }</span>
                                 <button class="deleteKey">删除</button>
                                 <button class="ascertainKey">确定</button>
                             </div>
                         </li>`
+                        }
+                    }
+                }
             }
             $('.showKeyWord > ul').prepend(html);
         }
@@ -70,10 +109,10 @@
 
             $('.knowBtn').on('click',function(){
                 $(".problemPop").hide()
-            })
+            });
             $(".problem").on('click',function(){
                 $(".problemPop").css("display",'flex');
-            })
+            });
 
             function hasWords () {
                 var showKeyWordLength = $(".showKeyWord ul").find('li').length;
@@ -85,19 +124,19 @@
                     $(".showKeyWord").show();
                 }
             }
-            hasWords()
+            hasWords();
 
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
                 $(".addkeyWord").show();
                 $(".showKeyWord").hide();
-            })
+            });
 
             // 添加keyWords检查输入框内是否有文字,如果有才能点击添加按钮
             $('.addkeyWord input.enterOne').on('input', function() {
                 if ($(this).val().length >= 100) {
-                    var s = $(this).val().slice(0,100)
-                    $(this).val(s)
+                    var s = $(this).val().slice(0,100);
+                    $(this).val(s);
 
                     weui.toast('附加词不能超过100字', {
                         duration: 2000,
@@ -107,78 +146,96 @@
                     return
                 }
 
-                var buttonDOM = $(this).siblings().find('button')[0]
+                var buttonDOM = $(this).siblings().find('button')[0];
                 if ($(this).val().length >= 1) {
-                    buttonDOM.style.opacity = 1
+                    buttonDOM.style.opacity = 1;
                     buttonDOM.removeAttribute("disabled")
                 } else {
-                    buttonDOM.style.opacity = .5
+                    buttonDOM.style.opacity = .5;
                     buttonDOM.setAttribute("disabled", true)
                 }
-            })
+            });
 
             // 添加 按钮的点击事件
             $('.addkeyWord .btn button').on('click', function(){
-                var keyWord = $('.addkeyWord input.enterOne').val()
-                appendedArr.push(keyWord);
-                localStorage.setItem("appended", appendedArr);
+                var appended = $('.addkeyWord input.enterOne').val();
+                appendedArr.push(appended);
+                for(var i in keyWordArr){
+                    if(keyWordArr[i].keyWord === token){
+                        keyWordArr[i].appended = appendedArr
+                    }
+                }
+                sessionStorage.appended = JSON.stringify(appendedArr);
+                localStorage.keyWord = JSON.stringify(keyWordArr);
                 var html = `<li>
                                 <div class="one">
                                     <div>
                                         <span>
-                                            <p class="key">${ keyWord }</p>
+                                            <p class="key">${ appended }</p>
                                         </span>
                                     </div>
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span contentEditable="true">${ keyWord }</span>
+                                    <span contentEditable="true">${ appended }</span>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
-                            </li>`
-                $('.showKeyWord > ul').prepend(html)
+                            </li>`;
+                $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
                 $(".addkeyWord").hide();
                 $('.showKeyWord').show();
-                $('.enter.addkeyWord > input').val('')
-                var buttonDOM = $('.enter.addkeyWord .btn button')[0]
-                buttonDOM.style.opacity = .5
+                $('.enter.addkeyWord > input').val('');
+                var buttonDOM = $('.enter.addkeyWord .btn button')[0];
+                buttonDOM.style.opacity = .5;
                 buttonDOM.setAttribute("disabled", true)
 
-            })
+            });
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
                 $('.modify span').each(function(item){
                     $('.modify span')[0].contentEditable = true
-                })
+                });
                 // console.log($(this).parent().siblings().find('span').text())
-                $(this).parent().hide()
+                $(this).parent().hide();
                 $(this).parent().siblings().css('display','block')
-            })
+            });
 
             // 编辑 删除
             $('.showKeyWord').on('click', '.deleteKey', function(e) {
                 var appended = $(this).parent().prev().find('.key').text();
                 appendedArr.splice($.inArray(appended, appendedArr),1);
-                localStorage.appended = appendedArr.toString();
+                for(var i in keyWordArr){
+                    if(keyWordArr[i].keyWord === token){
+                        keyWordArr[i].appended = appendedArr
+                    }
+                }
+                sessionStorage.appended = JSON.stringify(appendedArr);
+                localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
                 hasWords()
                 // console.log('删除附加词:',$(this).parent().find('span').text())
             })
             // 编辑 确定
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-                var keyWord = $(this).siblings('span').text();
-                var appended = $(this).parent().prev().find('.key').text();
+                var appended = $(this).siblings('span').text();
+                var appendeds = $(this).parent().prev().find('.key').text();
                 for(var i in appendedArr){
-                    if(appendedArr[i] === appended){
-                        appendedArr[i] = keyWord;
+                    if(appendedArr[i] === appendeds){
+                        appendedArr[i] = appended;
+                    }
+                }
+                for(var m in keyWordArr){
+                    if(keyWordArr[m].keyWord === token){
+                        keyWordArr[m].appended = appendedArr
                     }
                 }
-                localStorage.appended = appendedArr.toString();
-                $(this).parent().siblings().find('.key').text(keyWord)
+                sessionStorage.appended = JSON.stringify(appendedArr);
+                localStorage.keyWord = JSON.stringify(keyWordArr);
+                $(this).parent().siblings().find('.key').text(appended);
                 $(this).parent().hide().siblings().show()
             })
 

+ 48 - 53
src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -12,61 +12,56 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
 </head>
-
 <body>
 
-    <div class="keyWord">
-        <p class="title">示例:运维(排除词)</p>
-        <!-- 添加排除词 -->
-        <div class="enter addkeyWord">
-            <input type="text" class="enterOne" placeholder="请输入排除词" />
-            <div class="btn">
-                <button disabled>确认</button>
-            </div>
-        </div>
-
-        <!-- 添加排除词显示列表 -->
-        <div class="showKeyWord">
-            <ul>
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <p class="key">abcde</p>
-                            </span>
-                        </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <span contentEditable="true">abcde</span>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>
-
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <p class="key">abcde</p>
-                            </span>
-                        </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <span contentEditable="true">abcde</span>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>
-                
-            </ul>
-
-            <div class="addKeyWord">
-                <i class="iconfont icon-tianjia"></i>
-            </div>
-
-        </div>
+<div class="keyWord">
+    <p class="title">示例:开发(附加词)</p>
+<!-- 添加附加词 -->
+<div class="enter addkeyWord">
+    <input type="text" class="enterOne" placeholder="请输入附加词" />
+    <div class="btn">
+    <button disabled>确认</button>
+</div>
+</div>
+
+<!-- 添加附加词显示列表 -->
+<div class="showKeyWord">
+    <ul>
+
+    </ul>
+
+    </div>
+
+    <div class="addKeyWord">
+    <i class="iconfont icon-tianjia"></i>
+    </div>
+
+    <div class="problem">
+    疑问解答 <i class="iconfont icon-wenhao"></i>
+    </div>
+
+    <!-- 疑难问题弹窗 -->
+    <div class="problemPop">
+    <div class="problemPopContent">
+    <h3>疑问解答</h3>
+    <ul>
+    <li>
+    <h4>·关键词</h4>
+<p>目标信息中的关键性词语,如“软件系统”</p>
+</li>
+<li>
+<h4>·附加词</h4>
+<p>与关键词形成一体/组合,便于查找准确信息,如“开发”</p>
+</li>
+<li>
+<h4>·排除词</h4>
+<p>与关键词互斥,可排除一部分非目标信息,如“运维”</p>
+</li>
+</ul>
+<button class="knowBtn">我知道了</button>
+    </div>
+
+    </div>
 
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>

+ 99 - 3
src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/js/jquery.js"></script>
 </head>
 
 <body>
@@ -80,7 +81,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}9"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}10"></script>
     <script>
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -88,7 +89,90 @@
             keyWordArr = JSON.parse(keyWord);
             var keyWordHtml = "";
             for(var i in keyWordArr){
-                keyWordHtml += `
+                var append = keyWordArr[i].appended;
+                var appends = "";
+                for(var m in append){
+                    appends += append[m] + " "
+                }
+                var exclude = keyWordArr[i].exclude;
+                if(append !== undefined && exclude === undefined){
+                    keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词:</strong>
+                                    <p class="key">${ keyWordArr[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词:</strong>
+                                    <p class="addition">${ appends }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                }else if(append === undefined && exclude !== undefined){
+                    keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词:</strong>
+                                    <p class="key">${ keyWordArr[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词:</strong>
+                                    <p class="exclusion">${ exclude }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                }else if(append !== undefined && exclude !== undefined){
+                    keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词:</strong>
+                                    <p class="key">${ keyWordArr[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词:</strong>
+                                    <p class="addition">${ append }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词:</strong>
+                                    <p class="exclusion">${ exclude }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                }else if(append === undefined && exclude === undefined){
+                    keyWordHtml += `
                     <li>
                         <div class="one">
                             <div>
@@ -107,11 +191,23 @@
                             <button class="ascertainKey">确定</button>
                         </div>
                     </li>`;
-                $(".addAdjunctWord").on('click', )
+                }
+
             }
             $('.showKeyWord > ul').prepend(keyWordHtml);
+            $(".addAdjunctWord").on('click', function () {
+                var keyWord = $(this).parent().prev().find('.key').text();
+                sessionStorage.removeItem("appended");
+                window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
+            });
+            $(".addExclusion").on('click', function () {
+                var keyWord = $(this).parent().prev().find('.key').text();
+                // sessionStorage.removeItem("exclude");
+                window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+            });
         }
 
+
     </script>
 </body>