1

application/admin/controller/Sensitivec.php

@@ -166,11 +166,20 @@ class Sensitivec extends Base
                 $info[$k]['sensitivewords_time'] = date('Y-m-d H:m:s',time());
                 $info[$k]['sensitivewords_uid'] = session('user_id');
             }
-            //return json($info);
+            $sensitivewords = db('sensitivewords')->select();
+            for($i=0;$i<count($info);$i++){
+                for($j=0;$j<count($sensitivewords);$j++){
+                    if($info[$i]['sensitivewords_word'] == $sensitivewords[$j]['sensitivewords_word'] && $info[$i]['sensitivewords_for'] == $sensitivewords[$j]['sensitivewords_for']){
+                        return json(['code' => -1, 'data' => url('sensitivec/index'), 'msg' => 'excel表第'.($i+1).'行敏感词已存在']);
+                        return $this->redirect('sensitivec/index');
+                        //header('sensitivec/index')
+                    }
+                }
+            }
             db('sensitivewords')->insertAll($info); //批量插入数据
             return json(['code' => 1, 'data' => '', 'msg' => '插入敏感词成功']);
         } else {
-            return json(['code' => -1, 'data' => '', 'msg' => '插入敏感词失败']);
+            return json(['code' => -2, 'data' => '', 'msg' => '插入敏感词失败']);
         }
     }
 }

application/admin/controller/System.php

@@ -269,6 +269,25 @@ class System extends Base
                     }
                 }
 
+                if($vo['servicelog_close_type'] == 0){
+                    $result[$key]['servicelog_close_type'] = '未知';
+                }
+                if($vo['servicelog_close_type'] == 1){
+                    $result[$key]['servicelog_close_type'] = '访客静默关闭';
+                }
+                if($vo['servicelog_close_type'] == 2){
+                    $result[$key]['servicelog_close_type'] = '会话超时关闭';
+                }
+                if($vo['servicelog_close_type'] == 3){
+                    $result[$key]['servicelog_close_type'] = '客服关闭';
+                }
+                if($vo['servicelog_close_type'] == 4){
+                    $result[$key]['servicelog_close_type'] = '客服掉线';
+                }
+                if($vo['servicelog_close_type'] == 5){
+                    $result[$key]['servicelog_close_type'] = '转接';
+                }
+
                 // 生成操作按钮
                 if(0 != $vo['servicelog_id']){
                     $result[$key]['operate'] = $this->makeBtn($vo['servicelog_id']);

application/admin/view/system/wordslog.html

@@ -69,16 +69,16 @@
                 <div class="example">
                     <table id="cusTable">
                         <thead>
-                        <th data-field="servicelog_id">工单id</th>
+                        <th data-field="servicelog_id">id</th>
                         <th data-field="intime">访客进线时间</th>
                         <th data-field="kefu_name">接待客服</th>
-                        <th data-field="group_name">客服所在组</th>
+                        <th data-field="group_name">所在组</th>
                         <th data-field="user_name">访客账号</th>
-                        <th data-field="start_time">会话开始时间</th>
-                        <th data-field="end_time">会话结束时间</th>
+                        <th data-field="start_time">开始时间</th>
+                        <th data-field="end_time">结束时间</th>
                         <th data-field="conversation">会话时长</th>
                         <th data-field="response">响应时长</th>
-                        <!--<th data-field="website">来源网站</th>-->
+                        <th data-field="servicelog_close_type">关闭原因</th>
                         <!--<th data-field="system">来源系统</th>-->
                         <!--<th data-field="browse">来源浏览器</th>-->
                         <th data-field="evaluate_name">满意度</th>