haozq
/
ah_jjzhgd_webservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改人员管理、边带设备管理字段

This commit is contained in:
cool 2024-04-03 09:54:22 +08:00
parent dc709b895a
commit 881d8f3efd
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ah-jjzhgd-web/src/views/device/sidebandDevice/components/SidebandDetailTable.vue
View File

@ -47,6 +47,7 @@
<el-table-column label="最大阈值" align="center" prop="maxValueData" />
<el-table-column label="最小阈值" align="center" prop="minValueData" />
<el-table-column label="采集值类型" align="center" prop="dataType" />
<el-table-column label="采集值单位" align="center" prop="unit" />
<el-table-column label="设备级联编码" align="center" prop="deviceCode" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template slot-scope="{ row, $index }">
@ -84,6 +85,9 @@
<el-form-item label="采集值类型：" prop="dataType">
<el-input v-model="temp.dataType" placeholder="采集值类型" :maxlength="50" />
</el-form-item>
<el-form-item label="采集值单位：" prop="unit">
<el-input v-model="temp.unit" placeholder="采集值单位" :maxlength="50" />
</el-form-item>
<el-form-item label="设备级联编码：" prop="deviceCode">
<el-input v-model="temp.deviceCode" placeholder="设备级联编码" :maxlength="50" />
</el-form-item>
@ -115,6 +119,7 @@ const defaultTmp = {
maxValueData: '',
minValueData: '',
dataType: '',
unit: '',
deviceCode: ''
}
export default {
@ -152,6 +157,7 @@ export default {
maxValueData: [{ required: true, message: '不能为空', trigger: 'blur' }],
minValueData: [{ required: true, message: '不能为空', trigger: 'blur' }],
dataType: [{ required: true, message: '不能为空', trigger: 'blur' }],
unit: [{ required: true, message: '不能为空', trigger: 'blur' }],
deviceCode: [{ required: true, message: '不能为空', trigger: 'blur' }]
}
}

37
ah-jjzhgd-web/src/views/man-car/staff/index.vue
View File

@ -46,7 +46,10 @@
<el-table-column label="性别" align="center" prop="sex" />
<el-table-column label="工种" align="center" prop="userType" />
<el-table-column label="性别" align="center" prop="sex" />
<el-table-column label="年龄" align="center" prop="age" />
<!-- <el-table-column label="年龄" align="center" prop="age" />-->
<el-table-column label="人员类型" align="center" prop="personType" />
<el-table-column label="项目部名称" align="center" prop="projectDepName" />
<el-table-column label="单位名称" align="center" prop="deptName" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="班组名称" align="center" prop="teamName" />
<el-table-column label="班组长" align="center" prop="teamLeader" />
@ -103,12 +106,6 @@
<el-form-item label="姓名：" prop="userName">
<el-input v-model="temp.userName" placeholder="姓名" :maxlength="50" />
</el-form-item>
<!-- <el-form-item label="性别：" prop="sex">-->
<!-- <el-input v-model="temp.sex" placeholder="性别" :maxlength="50" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="年龄：" prop="age">-->
<!-- <el-input v-model="temp.age" placeholder="年龄" :maxlength="50" />-->
<!-- </el-form-item>-->
<el-form-item label="身份证号：" prop="idNumber">
<el-input v-model="temp.idNumber" placeholder="身份证号" :maxlength="50" />
</el-form-item>
@ -118,6 +115,22 @@
<el-form-item label="工种：" prop="userType">
<ProfessionSelect :bind-value.sync="temp.userType" />
</el-form-item>
<el-form-item label="人员类型：" prop="personType">
<el-input v-model="temp.personType" placeholder="人员类型" :maxlength="50" />
</el-form-item>
<el-form-item label="项目部名称：" prop="projectDepName">
<el-input v-model="temp.projectDepName" placeholder="项目部名称" :maxlength="50" />
</el-form-item>
<el-form-item label="单位名称：" prop="deptName">
<el-input v-model="temp.deptName" placeholder="单位名称" :maxlength="50" />
</el-form-item>
<el-form-item label="性别：" prop="sex">
<el-select v-model="temp.sex" style="width: 100%" placeholder="性别">
<el-option key="男" value="男" label="男" />
<el-option key="女" value="女" label="女" />
</el-select>
</el-form-item>
<el-form-item label="照片：" prop="imageList">
<el-upload
ref="pictureUpload"
@ -208,7 +221,11 @@ const defaultTmp = {
idNumber: '',
phone: '',
userType: '',
userId: ''
userId: '',
personType: '',
projectDepName: '',
deptName: '',
sex: ''
}
const defaultTmp2 = {
@ -255,6 +272,10 @@ export default {
idNumber: [{ required: true, message: '不能为空', trigger: 'blur' }],
phone: [{ required: true, message: '不能为空', trigger: 'blur' }],
userType: [{ required: true, message: '不能为空', trigger: 'blur' }],
personType: [{ required: true, message: '不能为空', trigger: 'blur' }],
projectDepName: [{ required: true, message: '不能为空', trigger: 'blur' }],
deptName: [{ required: true, message: '不能为空', trigger: 'blur' }],
sex: [{ required: true, message: '请选择', trigger: 'change' }],
imageList: [{ required: true, validator: this.validateImageNum, message: '不能为空', trigger: 'change' }]
},
rules2: {