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

SafeCampus.WEB/src/api/modules/usermanage/classManage.ts

@@ -26,6 +26,9 @@ const userManageClassManageApi = {
   page(params: SysUserPersonnel.ClassPage) {
     return http.get("queryAll", params);
   },
+  getPageList(params: SysUserPersonnel.ClassPage) {
+    return http.get("getPageList", params);
+  },
   /** 删除底库 */
   delete(params: ReqId) {
     return http.delete("deleteDfieldD", params);

SafeCampus.WEB/src/views/userManage/classManage/index.vue

@@ -6,14 +6,7 @@
 <template>
   <div class="main-box">
     <div class="table-box">
-      <ProTable
-        ref="proTable"
-        :pagination="false"
-        title="班级管理"
-        :columns="columns"
-        rowKey="personSetId"
-        :request-api="userManageClassManageApi.page"
-      >
+      <ProTable ref="proTable" title="班级管理" :columns="columns" rowKey="personSetId" :request-api="userManageClassManageApi.getPageList">
         <!-- 表格 header 按钮 -->
         <template #tableHeader="scope">
           <s-button suffix="班级" @click="addClass(FormOptEnum.ADD)" />

SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue

@@ -43,8 +43,7 @@ const sysUserProps = reactive<FormProps.Base<SysUserPersonnel.SysUserPerInfo>>({
   disabled: false
 });
 const checkAgeNumber = (rule: any, value: any, callback: any) => {
-  if (value === "") callback("请输入年龄");
-  if (value > 100 || value < 0) {
+  if (value && (value > 100 || value <= 0)) {
     callback(new Error("请输入正确的年龄(年龄范围1-100岁)"));
   } else {
     return callback();

SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue

@@ -44,8 +44,7 @@ const sysUserProps = reactive<FormProps.Base<SysUserPersonnel.SysUserPerInfo>>({
   disabled: false
 });
 const checkAgeNumber = (rule: any, value: any, callback: any) => {
-  if (value === "") callback("请输入年龄");
-  if (value > 100 || value < 0) {
+  if (value && (value > 100 || value <= 0)) {
     callback(new Error("请输入正确的年龄(年龄范围1-100岁)"));
   } else {
     return callback();

SafeCampus.WEB/src/views/userManage/personnel/index.vue

@@ -71,7 +71,7 @@ const columns: ColumnProps<SysUserPersonnel.SysUserPerInfo>[] = [
   {
     prop: "name",
     label: "姓名",
-    search: {el:'input',span:1,}
+    search: {el:'input',span:1,key:'personName'}
   },
   {
     prop: "personSetName",

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

@@ -6,7 +6,7 @@
       </div>
       <div class="topContent">
         <el-row>
-          <el-col :span="4" :offset="2">
+          <el-col :span="4" :offset="1">
             <div class="left">
               <el-image
                 class="avatar"
@@ -25,13 +25,13 @@
                 <Female class="gender GENDER_FEMALE" v-if="formData.gender == 'GENDER_FEMALE'"></Female>
               </span>
 
-              <span class="personId" :title="formData.personId">编号：{{ formData.personId }}</span>
+              <!-- <span class="personId" :title="formData.personId">编号：{{ formData.personId }}</span> -->
               <!-- <el-tag type="primary">学霸型</el-tag> -->
             </div></el-col
           >
-          <el-col :span="16">
+          <el-col :span="17">
             <div class="right">
-              <el-row>
+              <el-row :gutter="20">
                 <el-col :span="6">
                   <span v-if="formData.name"
                     >姓名拼音：{{ pinyin(formData.name, { toneType: "none", type: "array" }).flat().join(" ") }}</span
@@ -42,11 +42,7 @@
                 >
 
                 <el-col :span="6">
-                  <span
-                    :title="formData.personId"
-                    style="display: block; text-overflow: ellipsis; max-width: 100%; overflow: hidden; white-space: nowrap"
-                    >编号：{{ formData.personId }}</span
-                  ></el-col
+                  <span :title="formData.personId" class="ellipsis">编号：{{ formData.personId }}</span></el-col
                 >
 
                 <el-col :span="6"
@@ -57,20 +53,20 @@
                 >
 
                 <el-col :span="6"
-                  ><span>联系方式：{{ formData.phone }}</span>
+                  ><span :title="formData.phone" class="ellipsis">联系方式：{{ formData.phone }}</span>
                 </el-col>
 
                 <el-col :span="6"
-                  ><span>所属院系：{{ formData.depName }}</span>
+                  ><span :title="formData.depName" class="ellipsis">所属院系：{{ formData.depName }}</span>
                 </el-col>
                 <el-col :span="6"
-                  ><span>所属专业：{{ formData.majorName }}</span>
+                  ><span :title="formData.majorName" class="ellipsis">所属专业：{{ formData.majorName }}</span>
                 </el-col>
                 <el-col :span="6"
-                  ><span>所属班级：{{ formData.personSetName }}</span>
+                  ><span :title="formData.personSetName" class="ellipsis">所属班级：{{ formData.personSetName }}</span>
                 </el-col>
                 <el-col :span="6"
-                  ><span>寝室名称：{{ formData.dormitoryName }}</span>
+                  ><span :title="formData.dormitoryName" class="ellipsis">寝室名称：{{ formData.dormitoryName }}</span>
                 </el-col>
               </el-row>
             </div></el-col
@@ -631,13 +627,13 @@ onMounted(() => {
           }
         }
         .personId {
+          display: block;
+          max-width: 90%;
           margin-bottom: 10px;
+          overflow: hidden;
           font-size: 14px;
-          display: block;
           text-overflow: ellipsis;
-          overflow: hidden;
           white-space: nowrap;
-          max-width: 90%;
         }
       }
       .right {
@@ -647,6 +643,13 @@ onMounted(() => {
           .el-col {
             height: 50px;
             line-height: 50px;
+            .ellipsis {
+              display: block;
+              max-width: 100%;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
           }
         }
       }