Jonlin 6 tahun lalu
induk
melakukan
4b8fffa2b5

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

@@ -173,7 +173,9 @@ class Sensitivec extends Base
         Loader::import('PHPExcel.PHPExcel.PHPExcel_Cell');
         //获取表单上传文件
         $file = request()->file('excel');
+        //$file = $_FILES['excel'];
 //        return $file;
+//        print_r($file) ;
 
 //        if(request()->isAjax()){
 //            $file = input('param.file');
@@ -181,8 +183,9 @@ class Sensitivec extends Base
 //        }
 
         if(empty($file)){
+//return  '<script src="/static/admin/js/jquery.min.js?v=2.1.4"></script><script src="/static/admin/js/plugins/layer/layer.min.js"></script><script>layer.msg("请先上传文件123", {icon: 1});console.log(12345);</script>';
             $this->error('请先上传文件');
-            return json(['code' => -4, 'data' => url('sensitivec/index'), 'msg' => '请先上传文件']);
+            return json(['code' => -4, 'data' => '', 'msg' => '请先上传文件']);
         }
 
         $info = $file->validate(['ext' => 'xlsx'])->move(ROOT_PATH . 'public' . DS . 'uploads');

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

@@ -363,7 +363,7 @@ class System extends Base
             $content = json_decode($chat[$i]['content'], true);
             $chat[$i]['time_line'] = date('H:i',$chat[$i]['time_line']);
             if(!empty($content['text'])){
-                $content['content'] = $content['text'];
+                $content['content'] = '&nbsp&nbsp'.$content['text'].'&nbsp&nbsp';
             }
             if(!empty($content['img'])){
                 $content['content'] = '<img width="100%" src="'.$content['img'].'"/>';

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

@@ -241,22 +241,15 @@
         $('a.layui-layer-btn0').css('display','none');
         $('.layui-layer-ico').css('display','none');
 
-//        $('#daoru').click(function(){
-//            console.log(1);
-//            console.log($('#insert').val());
-//            var file = $('#insert').val();
-//            $.getJSON("{:url('sensitivec/inserExcel')}", {'file' : file}, function(res){
-//                console.log(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});
+//        $('#daoru').click(function () {
+//            $.post("{:url('sensitivec/inserExcel')}", $('.form-inline').serialize(), function (result) {
+//                console.log(result);
+//                if (result.code == 1) {
+//                    layer.msg(result.msg, {icon: 1});
+//                }  else {
+//                    layer.msg(result.msg, {icon: 5});
 //                }
-//            });
+//            }, 'json');
 //        });
 
     }