1

app/admin/controller/Officer.php

@@ -78,21 +78,31 @@ class Officer extends AdminBaseController
         }
 
         $xlsCell = [
+            ['name', '姓名'],
+            ['sex', '性别'],
+            ['age', '年龄'],
+            ['current_position', '当前岗位'],
+            ['education', '学历'],
+            ['major', '专业'],
+            ['seniority', '工龄'],
+            ['leader', '担任领导的累计年限'],
+            ['industry', '所在行业'],
+            ['company', '所在单位'],
+            ['job', '职位'],
         ];
 
         $res = [];
         foreach ($list as $ak => $answer) {
-            $item         = [];
+            $item                     = [];
-            $item['name'] = $answer['name'];
+            $item['name']             = $answer['name'];
-            $item['mobile']    = $answer['mobile'];
+            $item['sex']              = $answer['sex'];
-            $item['sex']       = $answer['sex'];
+            $item['age']              = $answer['age'];
-            $item['age']       = $answer['age'];
+            $item['current_position'] = $answer['current_position'];
-            $item['marry']     = $answer['marry'];
+            $item['education']        = $answer['education'];
-            $item['education'] = $answer['education'];
+            $item['major']            = $answer['major'];
-            $item['major']     = $answer['major'];
+            $item['seniority']        = $answer['seniority'];
-            $item['seniority'] = $answer['seniority'];
+            $item['leader']           = $answer['leader'];
-            $item['leader']    = $answer['leader'];
+            $item['industry']         = $answer['industry'];
-            $item['industry']  = $answer['industry'];
 
             if (empty($answer['company_text'])) {
                 $item['company'] = $answer['company'];
@@ -114,19 +124,19 @@ class Officer extends AdminBaseController
             $res[] = $item;
         }
 
-        $xlsCell = array_merge($xlsCell, [
+//        $xlsCell = array_merge($xlsCell, [
-            ['name', '姓名'],
+//            ['name', '姓名'],
-            ['mobile', '手机号'],
+//            ['mobile', '手机号'],
-            ['sex', '性别'],
+//            ['sex', '性别'],
-            ['age', '年龄'],
+//            ['age', '年龄'],
-            ['marry', '婚姻状况'],
+//            ['marry', '婚姻状况'],
-            ['education', '学历'],
+//            ['education', '学历'],
-            ['major', '专业'],
+//            ['major', '专业'],
-            ['seniority', '工龄'],
+//            ['seniority', '工龄'],
-            ['leader', '担任领导的累计年限'],
+//            ['leader', '担任领导的累计年限'],
-            ['industry', '所在行业'],
+//            ['industry', '所在行业'],
-            ['company', '所在单位'],
+//            ['company', '所在单位'],
-            ['job', '职位'],]);
+//            ['job', '职位'],]);
 
 
         export_exl("考试明细", $xlsCell, $res);

app/admin/view/officer/detail.html

@@ -27,10 +27,9 @@
             cols: [
                 [
                     {field: 'name', title: '姓名' ,width: 150},
-                    {field: 'mobile', title: '手机号', width: 200},
                     {field: 'sex', title: '性别', width: 150},
                     {field: 'age', title: '年龄', width: 150},
-                    {field: 'marry', title: '婚姻状况', width: 150},
+                    {field: 'current_position', title: '请选择当前岗位', width: 150},
                     {field: 'education', title: '学历', width: 150},
                     {field: 'major', title: '专业', width: 150},
                     {field: 'score', title: '总分', width: 150},

app/admin/view/officer/index.html

@@ -10,9 +10,9 @@
                 <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="detail">
                     <i class="layui-icon layui-icon-edit"></i>明细
                 </a>
-                <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="qrcode">
+<!--                <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="qrcode">-->
-                    <i class="layui-icon layui-icon-picture-fine"></i>评测二维码
+<!--                    <i class="layui-icon layui-icon-picture-fine"></i>评测二维码-->
-                </a>
+<!--                </a>-->
                 <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="pc">
                     <i class="layui-icon layui-icon-edit"></i>复制PC端链接
                 </a>

app/home/view/officer/answer_base.html

@@ -5,11 +5,6 @@
                 <el-input v-model="answer.name" placeholder="请输入姓名"></el-input>
             </el-form-item>
         </el-col>
-        <el-col :span="12">
-            <el-form-item label="手机号" required>
-                <el-input v-model="answer.mobile" placeholder="请输入手机号"></el-input>
-            </el-form-item>
-        </el-col>
         <el-col :span="12">
             <el-form-item label="性别" required>
                 <el-radio-group v-model="answer.sex">
@@ -24,15 +19,8 @@
             </el-form-item>
         </el-col>
         <el-col :span="12">
-            <el-form-item label="婚姻状况" required>
+            <el-form-item label="当前岗位" required>
-                <el-select v-model="answer.marry" placeholder="请选择婚姻状况">
+                <el-input v-model="answer.current_position" placeholder="请输入当前岗位"></el-input>
-                    <el-option
-                            v-for="item in marry_list"
-                            :key="item.value"
-                            :label="item.text"
-                            :value="item.value"
-                    ></el-option>
-                </el-select>
             </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -222,10 +210,9 @@
 
             const required_field = [
                 {field:'name',tip:'请输入姓名'},
-                {field:'mobile',tip:'请输入手机号'},
                 {field:'sex',tip:'请选择性别'},
                 {field:'age',tip:'请输入年龄'},
-                {field:'marry',tip:'请选择婚姻状况'},
+                {field:'current_position',tip:'请选择当前岗位'},
                 {field:'education',tip:'请选择学历'},
                 {field:'major',tip:'请输入所修专业'},
                 {field:'seniority',tip:'请输入工龄'},