Jonlin пре 6 година
родитељ
комит
e8d1159d21

+ 4 - 2
application/admin/controller/Sensitivec.php

@@ -173,9 +173,11 @@ class Sensitivec extends Base
         Loader::import('PHPExcel.PHPExcel.PHPExcel_Cell');
         //获取表单上传文件
         $file = request()->file('excel');
+//        return $file;
+
         if(empty($file)){
-            $this->error('请先上传文件');
-            //return json(['code' => -4, 'data' => '', 'msg' => '请先上传文件']);
+            //$this->error('请先上传文件');
+            return json(['code' => -4, 'data' => '', 'msg' => '请先上传文件']);
         }
 
         $info = $file->validate(['ext' => 'xlsx'])->move(ROOT_PATH . 'public' . DS . 'uploads');

+ 0 - 1
application/admin/controller/System.php

@@ -175,7 +175,6 @@ class System extends Base
             $param = input('param.');
             $limit = $param['pageSize'];
             $offset = ($param['pageNumber'] - 1) * $limit;
-
             // 默认显示最近7天
             $start = input('param.start');
             $end = input('param.end');

+ 34 - 8
application/admin/view/robot/index.html

@@ -28,15 +28,18 @@
                     <div class="form-group">
                         <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i>全部删除</button></a>
                     </div>
+                    <!--<div class="form-group">-->
+                        <!--<a href="/static/admin/file/robot.xlsx" class="btn btn-primary" style="margin-top:5px" >下载智能问答模板文件</a>-->
+                    <!--</div>-->
+                    <!--<div class="form-group">-->
+                        <!--&lt;!&ndash;<label>导入智能问答:</label>&ndash;&gt;-->
+                        <!--<input type="file" class="form-control" name="excel" style="width: 200px;border: none;" />-->
+                    <!--</div>-->
+                    <!--<div class="form-group">-->
+                        <!--<input type="submit" class="btn btn-primary" style="margin-top:5px" value="导入">-->
+                    <!--</div>-->
                     <div class="form-group">
-                        <a href="/static/admin/file/robot.xlsx" class="btn btn-primary" style="margin-top:5px" >下载智能问答模板文件</a>
-                    </div>
-                    <div class="form-group">
-                        <!--<label>导入智能问答:</label>-->
-                        <input type="file" class="form-control" name="excel" style="width: 200px;border: none;" />
-                    </div>
-                    <div class="form-group">
-                        <input type="submit" class="btn btn-primary" style="margin-top:5px" value="导入">
+                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary">导入智能问答</button></a>
                     </div>
                 </div>
             </form>
@@ -167,6 +170,29 @@
             layer.close(index);
         })
     }
+
+    function leadingin(){
+        layer.confirm('<form action="/admin/robot/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right"> <div class=""><input type="file" class=""  name="excel" style="border: none;" /> </div><div class="" style="margin-top: 20px;"><input type="submit" class="btn btn-primary"  value="开始导入"></div><div class="" style="margin-top: 20px;"> <a href="/static/admin/file/robot.xlsx" style="color:black;" class=""><input type="button"  value="下载智能问答模板文件"></a></div></form>', {icon: 6, title:'导入智能问答'}, function(index){
+            //do something
+            $.getJSON("{:url('robot/inserExcel')}", {'id' : id}, function(res){
+                if(1 == res.code){
+                    layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function(){
+                        initTable();
+                    });
+                }else if(111 == res.code){
+                    window.location.reload();
+                }else{
+                    layer.alert(res.msg, {title: '友情提示', icon: 2});
+                }
+            });
+
+            layer.close(index);
+        })
+
+        $('a.layui-layer-btn0').css('display','none');
+        $('.layui-layer-ico').css('display','none');
+
+    }
 </script>
 </body>
 </html>

+ 35 - 8
application/admin/view/sensitivec/index.html

@@ -36,15 +36,18 @@
                     <div class="form-group" style="margin-left: 20px">
                         <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i>全部删除</button></a>
                     </div>
+                    <!--<div class="form-group">-->
+                        <!--<a href="/static/admin/file/sensitivewords.xlsx" class="btn btn-primary"  >下载敏感词模板文件</a>-->
+                    <!--</div>-->
+                    <!--<div class="form-group">-->
+                        <!--&lt;!&ndash;<label>导入敏感词:</label>&ndash;&gt;-->
+                        <!--<input type="file" class="form-control" name="excel" style="width: 200px;border: none;" />-->
+                    <!--</div>-->
+                    <!--<div class="form-group">-->
+                        <!--<input type="submit" class="btn btn-primary"  value="导入">-->
+                    <!--</div>-->
                     <div class="form-group">
-                        <a href="/static/admin/file/sensitivewords.xlsx" class="btn btn-primary"  >下载敏感词模板文件</a>
-                    </div>
-                    <div class="form-group">
-                        <!--<label>导入敏感词:</label>-->
-                        <input type="file" class="form-control" name="excel" style="width: 200px;border: none;" />
-                    </div>
-                    <div class="form-group">
-                        <input type="submit" class="btn btn-primary"  value="导入">
+                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary">导入敏感词</button></a>
                     </div>
                 </div>
             </form>
@@ -215,6 +218,30 @@
         })
 
     }
+
+
+    function leadingin(){
+        layer.confirm('<form action="/admin/sensitivec/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right"> <div class=""><input type="file" class=""  name="excel" style="border: none;" /> </div><div class="" style="margin-top: 20px;"><input type="submit" class="btn btn-primary"  value="开始导入"></div><div class="" style="margin-top: 20px;"> <a href="/static/admin/file/sensitivewords.xlsx" style="color:black;" class=""><input type="button"  value="下载敏感词模板文件"></a></div></form>', {icon: 6, title:'导入敏感词'}, function(index){
+            //do something
+            $.getJSON("{:url('sensitivec/inserExcel')}", {'id' : id}, function(res){
+                if(1 == res.code){
+                    layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function(){
+                        initTable();
+                    });
+                }else if(111 == res.code){
+                    window.location.reload();
+                }else{
+                    layer.alert(res.msg, {title: '友情提示', icon: 2});
+                }
+            });
+
+            layer.close(index);
+        })
+
+        $('a.layui-layer-btn0').css('display','none');
+        $('.layui-layer-ico').css('display','none');
+
+    }
 </script>
 </body>
 </html>

+ 35 - 8
application/admin/view/words/index.html

@@ -39,17 +39,21 @@
                     <div class="form-group">
                         <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i>全部删除</button></a>
                     </div>
+                    <!--<div class="form-group">-->
+                        <!--<a href="/static/admin/file/words.xlsx" class="btn btn-primary" style="margin-top:5px" >下载快捷回复模板文件</a>-->
+                    <!--</div>-->
+                    <!--<div class="form-group">-->
+                        <!--&lt;!&ndash;<label>导入快捷回复:</label>&ndash;&gt;-->
+                        <!--<input type="file" class="form-control" name="excel" style="width: 200px;border: none;" />-->
+                    <!--</div>-->
+                    <!--<div class="form-group">-->
+                        <!--<input type="submit" class="btn btn-primary" style="margin-top:5px" value="导入">-->
+                    <!--</div>-->
                     <div class="form-group">
-                        <a href="/static/admin/file/words.xlsx" class="btn btn-primary" style="margin-top:5px" >下载快捷回复模板文件</a>
-                    </div>
-                    <div class="form-group">
-                        <!--<label>导入快捷回复:</label>-->
-                        <input type="file" class="form-control" name="excel" style="width: 200px;border: none;" />
-                    </div>
-                    <div class="form-group">
-                        <input type="submit" class="btn btn-primary" style="margin-top:5px" value="导入">
+                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary">导入快捷回复</button></a>
                     </div>
                 </div>
+
             </form>
             <!--搜索框开始-->
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
@@ -192,6 +196,29 @@
         })
 
     }
+
+    function leadingin(){
+        layer.confirm('<form action="/admin/words/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right"> <div class=""><input type="file" class=""  name="excel" style="border: none;" /> </div><div class="" style="margin-top: 20px;"><input type="submit" class="btn btn-primary"  value="开始导入"></div><div class="" style="margin-top: 20px;"> <a href="/static/admin/file/words.xlsx" style="color:black;" class=""><input type="button"  value="下载快捷回复模板文件"></a></div></form>', {icon: 6, title:'导入快捷回复'}, function(index){
+            //do something
+            $.getJSON("{:url('words/inserExcel')}", {'id' : id}, function(res){
+                if(1 == res.code){
+                    layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function(){
+                        initTable();
+                    });
+                }else if(111 == res.code){
+                    window.location.reload();
+                }else{
+                    layer.alert(res.msg, {title: '友情提示', icon: 2});
+                }
+            });
+
+            layer.close(index);
+        })
+
+        $('a.layui-layer-btn0').css('display','none');
+        $('.layui-layer-ico').css('display','none');
+
+    }
 </script>
 </body>
 </html>