管理后台 看板

app/admin/view/course/course/detail.html

@@ -65,11 +65,15 @@
             <li>作业列表</li>
 
         </ul>
-        <div class="layui-tab-content" >
+        <div class="layui-tab-content" style=" background: #fff;">
             <div class="layui-tab-item layui-show">
-                <div style="width: 95%; margin: 10px auto;">
+                <style>
+                    .coursedetail{width: 95%; margin: 10px auto;}
+                    .coursedetail img{ width: 100%; height: auto;}
+                </style>
+                <div class="coursedetail">
 
-                    {$info.content}
+                    {$info.content|raw}
                 </div>
 
             </div>

app/admin/view/project/project/detail.html

@@ -98,11 +98,15 @@
             <li>接单人</li>
 
         </ul>
-        <div class="layui-tab-content" >
+        <div class="layui-tab-content" style=" background: #fff;">
             <div class="layui-tab-item layui-show">
-                <div style="width: 95%; margin: 10px auto;">
+                <style>
+                    .projectdetail{width: 95%; margin: 10px auto;}
+                    .projectdetail img{ width: 100%; height: auto;}
+                </style>
+                <div class="projectdetail">
 
-                    {$info.content}
+                    {$info.content|raw}
                 </div>
             </div>
             <div class="layui-tab-item">
@@ -157,7 +161,6 @@
             elem: '#projectput',
             page: true,
             limit:20,
-            height: 'full-341',
             url: map_root+"project.project_put/index?&do=json",
             where:{project_id:project_id},
             cols: [[

app/api/controller/manage/Student.php

@@ -273,4 +273,86 @@ class Student extends BaseController
         }
 
     }
+
+    /*
+     * 学生导入前端解析excel 后端接受数据
+     */
+    public function StudentImport(Request $request)
+    {
+        $checkfiled = ['realname', 'sex', 'age', 'idcard', 'mobile', 'xq', 'nj', 'bj', 'xh'];
+        $sv = new StudentValidate();
+        $parm = $request->param();
+        $data = $parm['data'];
+        $school_user_id = $request->userId;
+//        $data = json_decode($data, true);
+        $successcount = 0;
+        $failcount = 0;
+        Db::startTrans();
+        try {
+            $stime = time();
+            foreach ($data as &$item) {
+                $item['status'] = "导入失败";
+                //验证数据
+                $vo = $sv->goCheck($checkfiled, $item);
+                if ($vo !== true) {
+                    $item['errorMsg'] = $sv->getError();
+                    $failcount++;
+                    continue;
+                }
+                $user_id = $this->createuser($item);
+                $adddata = array(
+                    'school_user_id' => $school_user_id,
+                    'user_id' => $user_id,
+                    'realname' => $item['realname'],
+                    'sex' => $item['sex'],
+                    'age' => $item['age'],
+                    'birthday' => strtotime($item['birthday']),
+                    'idcard' => $item['idcard'],
+                    'mobile' => $item['mobile'],
+                    'xq' => $item['xq'],
+                    'nj' => $item['nj'],
+                    'bj' => $item['bj'],
+                    'xh' => $item['xh'],
+                    'createtime' => $stime,
+                );
+                $result = StudentModel::create($adddata);
+                if (!$result) {
+                    $failcount++;
+                    $item['errorMsg'] = "插入数据失败";
+                }
+                $successcount++;
+                $item['status'] = "导入成功";
+            }
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return $this->returnMsg($e->getMessage());
+        }
+        $returndata['successcount'] = $successcount;
+        $returndata['failcount'] = $failcount;
+        $returndata['data'] = $data;
+        return $this->returnMsg('导入成功', 1, $returndata);
+    }
+
+    /*
+    * 学生导入前端解析excel 后端接受数据
+    */
+    public function StudentImport111111(Request $request)
+    {
+        $checkfiled = ['realname', 'sex', 'age', 'idcard', 'mobile', 'xq', 'nj', 'bj', 'xh'];
+        $sv = new StudentValidate();
+        $parm = $request->param();
+        $data = $parm['data'];
+        $school_user_id = $request->userId;
+        foreach ($data as &$vo) {
+            $vo['status'] = "导入成功";
+            $vo['errorMsg'] = "具体失败原因";
+        }
+        $returndata['successcount'] = count($data);
+        $returndata['failcount'] = 0;
+        $returndata['data'] = $data;
+        return $this->returnMsg('导入成功', 1, $returndata);
+    }
+
+
 }
\ No newline at end of file

app/api/validate/StudentValidate.php

@@ -14,7 +14,6 @@ class StudentValidate extends BaseValidate
         'realname' => 'require',
         'sex' => 'require',
         'age' => 'require|between:5,80',
-        'birthday' => 'require',
         'idcard' => 'require|idCard',
         'mobile' => 'require|mobile|checkmobile',
         'xq' => 'require',
@@ -22,12 +21,13 @@ class StudentValidate extends BaseValidate
         'bj' => 'require',
         'xh' => 'require',
         'student_id' => 'require',
+        'birthday' => 'date',
     ];
     protected $message = [
         'realname.require' => '姓名不能为空',
         'sex.require' => '性别不能为空',
         'age.require' => '年龄不能为空',
-        'birthday.require' => '出生年月不能为空',
+//        'birthday.require' => '出生年月不能为空',
         'idcard.require' => '身份证不能为空',
         'idcard.idCard' => '身份证格式不对',
         'mobile.require' => '手机号不能为空',
@@ -37,7 +37,8 @@ class StudentValidate extends BaseValidate
         'bj.require' => '班级不能为空',
         'xh.require' => '学号不能为空',
         'mobile.checkmobile' => '手机号已存在',
-        'student_id.require' => '学生id不能为空'
+        'student_id.require' => '学生id不能为空',
+        'birthday.date' => '日期格式不对'
     ];
 
     protected function checkmobile($value, $rule, $data = [])