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

SafeCampus.WEB/src/App.vue

@@ -21,3 +21,10 @@ const assemblySize = computed(() => globalStore.assemblySize);
 // element button config
 const buttonConfig = reactive({ autoInsertSpace: false });
 </script>
+<style>
+.el-button:focus:not(:hover) {
+  color: var(--el-button-text-color);
+  background-color: var(--el-button-bg-color);
+  border-color: var(--el-button-border-color);
+}
+</style>

SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue

@@ -23,7 +23,7 @@
               </s-form-item>
             </el-col>
             <el-col :span="22">
-              <s-form-item label="性别" prop="gender">
+              <s-form-item label="宿舍类型" prop="gender">
                 <s-radio-group v-model="sysDormitoryProps.record.gender" :options="genderOptions" />
               </s-form-item>
             </el-col>
@@ -71,11 +71,11 @@ const visibleDormitory = ref(false); //是否显示表单
 const creamaData = ref<any>([]);
 const genderOptions = [
   {
-    label: "男",
+    label: "男生宿舍",
     value: true
   },
   {
-    label: "女",
+    label: "女生宿舍",
     value: false
   }
 ];
@@ -88,7 +88,7 @@ const sysDormitoryProps = reactive<FormProps.Base<SysDormitory.DormitoryInfo>>({
 // 表单验证规则
 const rules = reactive({
   name: [required("请输入宿舍楼名称")],
-  gender: [required("请选择性别")],
+  gender: [required("请选择宿舍类型")],
   insCameraId: [required("请选择进楼摄像头")],
   outCameraId: [required("请选择出楼摄像头")]
 });