Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

SafeCampus.WEB/src/views/violation/portrait/index.vue

@@ -67,16 +67,32 @@ const columns: ColumnProps[] = [
     label: "姓名"
   },
   {
-    prop: "personId",
-    label: "人员ID"
+    prop: "personSetName",
+    label: "所属班级",
+  },
+  {
+    prop: "gender",
+    label: "性别",
+    enum: [
+    {
+      label: "男",
+      value: "GENDER_MALE"
+    },
+    {
+      label: "女",
+      value: "GENDER_FEMALE"
+    }],
   },
   {
     prop: "phone",
     label: "手机号"
   },
   {
-    prop: "personSetName",
-    label: "所属班级",
+    prop: "age",
+    label: "年龄",
+    render: scope => {
+      return scope.row.age ? scope.row.age : '--';
+    }
   },
   { prop: "operation", label: "操作", width: 250, fixed: "right" }
 ];