Merge branch 'xinyan' into dev

src/views/computer-information/components/ComputerDetail.vue

@@ -191,7 +191,11 @@ onMounted(async () => {
 					</div>
 				</template>
 			</el-image>
-      <el-button :icon="Edit" link type="warning" @click="editItem"></el-button>
+      <el-tooltip content="编辑" placement="top">
+        <el-button link type="warning" @click="editItem">
+          <Edit style="width: 1.5em; height: 1.5em; margin-right: 8px" />
+        </el-button>
+      </el-tooltip>
 			<el-col :span="18">
 				<div class="info-container text-lg">
 					<div class="info-column">

src/views/employee-information/components/CreateEmployee.vue

@@ -23,9 +23,9 @@ interface RuleForm {
 	department: string;
 	phone: string;
 	email: string;
-	user: string;
-	macaddress: string;
-	ipaddress: string;
+	// user: string;
+	// macaddress: string;
+	// ipaddress: string;
 	images: UploadFile[];
 }
 
@@ -42,11 +42,11 @@ const rules = reactive<FormRules<RuleForm>>({
 	name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
 	department: [{ required: true, message: '请输入部门', trigger: 'blur' }],
 	phone: [
-		{ required: true, message: '请输入电话号码', trigger: 'blur' },
+		// { required: true, message: '请输入电话号码', trigger: 'blur' },
 		{ pattern: /^[0-9]{11}$/, message: '请输入正确的手机号码', trigger: 'blur' },
 	],
 	email: [
-		{ required: true, message: '请输入邮箱', trigger: 'blur' },
+		// { required: true, message: '请输入邮箱', trigger: 'blur' },
 		{ type: 'email', message: '请输入正确的邮箱格式', trigger: 'blur' },
 	],
 });

src/views/employee-information/components/EditEmployeeInfo.vue

@@ -27,9 +27,9 @@ interface RuleForm {
 	department: string;
 	phone: string;
 	email: string;
-	user: string;
-	macaddress: string;
-	ipaddress: string;
+	// user: string;
+	// macaddress: string;
+	// ipaddress: string;
 	images: UploadFile[];
 }
 
@@ -45,10 +45,12 @@ const formData = reactive<RuleForm>({
 const rules = reactive<FormRules<RuleForm>>({
 	name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
 	department: [{ required: true, message: '请输入部门', trigger: 'blur' }],
-  phone: [{ required: true, message: '请输入电话号码', trigger: 'blur' },
+  phone: [
+      // { required: true, message: '请输入电话号码', trigger: 'blur' },
     { pattern: /^[0-9]{11}$/, message: '请输入正确的手机号码', trigger: 'blur' },
 ],
-  email: [{ required: true, message: '请输入邮箱', trigger: 'blur' },
+  email: [
+      // { required: true, message: '请输入邮箱', trigger: 'blur' },
     { type: 'email', message: '请输入正确的邮箱格式', trigger: 'blur' }],
 });
 

src/views/employee-information/components/EmployeeDetail.vue

@@ -144,7 +144,11 @@ onMounted(() => {
           </div>
         </template>
       </el-image>
-      <el-button :icon="Edit" link type="warning" @click="editItem"></el-button>
+      <el-tooltip content="编辑" placement="top">
+        <el-button link type="warning" @click="editItem">
+          <Edit style="width: 1.5em; height: 1.5em; margin-right: 8px" />
+        </el-button>
+      </el-tooltip>
       <el-col :span="18">
         <div class="info-container text-lg">
           <div class="info-column">