diff --git a/equipmentCenter.js b/equipmentCenter.js index 3fe86772..098918c7 100644 --- a/equipmentCenter.js +++ b/equipmentCenter.js @@ -34,6 +34,10 @@ const routes = [{ path: 'laborDevManage', name: '劳务管理_设备管理', component: () => import('../views/equipmentCenter/laborManage/devConfig.vue'), + }, { + path: 'accessGroup', + name: '劳务管理_门禁分组', + component: () => import('../views/equipmentCenter/laborManage/accessGroup.vue'), }, { path: 'markingRoomDevManage', name: '标养室_设备管理', diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index a0446a26..bf76aecd 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -64,6 +64,13 @@ export const ufaceDevDelete = data => post('xmgl/ufaceDev/delete', data); // export const ufaceDevList = data => post('xmgl/ufaceDev/list', data); //列表查询人脸设备信息 export const selectHousingListApi = data => get('xmgl/thirdPartyPlatformService/list', data); //查询住建列表 +//劳务管理 --- 门禁分组 +export const getGroupPageApi = data => get('xmgl/ufaceDevGroup/page', data);//门禁分组分页列表 +export const getGroupListApi = data => get('xmgl/ufaceDevGroup/list', data);//门禁分组分页列表 +export const addGroupApi = data => post('xmgl/ufaceDevGroup/add', data);//门禁分组添加 +export const editGroupApi = data => post('xmgl/ufaceDevGroup/edit', data);//门禁分组编辑 +export const deleteGroupApi = data => post('xmgl/ufaceDevGroup/delete', data);//门禁分组删除 + //工种信息 export const workerTypeAdd = data => post('xmgl/workerType/add', data);//添加工种信息 export const workerTypeEdit = data => post('xmgl/workerType/edit', data);//添加工种信息 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 81bde093..55018dc1 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 @@ -94,6 +94,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/components/header.vue b/src/components/header.vue index 30e498e5..dbc563d1 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -471,8 +471,8 @@ export default { console.log("当前跳转链接", this.newBigScreen); //-------------------- 跳转新版七参数 this.jumpToken = localStorage.getItem("jumpToken"); - window.open(this.newBigScreen + "?token=" + this.jumpToken, "_self"); - // window.open('http://192.168.34.226:8081/#/large?token=' + this.jumpToken, "_self")//这里是后台跳到大屏的操作，携带token过去 + // window.open(this.newBigScreen + "?token=" + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self"); + window.open('http://192.168.34.138:8081/#/large?token=' + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self")//这里是后台跳到大屏的操作，携带token过去 } // if (this.newBigScreen != null) { // console.log("当前跳转链接",this.newBigScreen) diff --git a/src/router/equipmentCenter.js b/src/router/equipmentCenter.js index e6bc3c33..d268adb6 100644 --- a/src/router/equipmentCenter.js +++ b/src/router/equipmentCenter.js @@ -34,6 +34,10 @@ const routes = [{ path: 'laborDevManage', name: '劳务管理_设备管理', component: () => import('../views/equipmentCenter/laborManage/devConfig.vue'), + }, { + path: 'accessGroup', + name: '劳务管理_门禁分组', + component: () => import('../views/equipmentCenter/laborManage/accessGroup.vue'), }, { path: 'markingRoomDevManage', name: '标养室_设备管理', diff --git a/src/router/index.js b/src/router/index.js index 1d313a93..531e9869 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3598,6 +3598,12 @@ const routes2 = [ component: () => import("../views/equipmentCenter/laborManage/devConfig.vue"), }, + { + path: "accessGroup", + name: "劳务管理_门禁分组", + component: () => + import("../views/equipmentCenter/laborManage/accessGroup.vue"), + }, { path: "carCameraDev", name: "车辆管理_车辆相机管理", @@ -4789,6 +4795,12 @@ var devRoutes = { component: () => import("../views/equipmentCenter/laborManage/devConfig.vue"), }, + { + path: "accessGroup", + name: "劳务管理_门禁分组", + component: () => + import("../views/equipmentCenter/laborManage/accessGroup.vue"), + }, { path: "markingRoomDevManage", name: "标养室_设备管理", diff --git a/src/store/index.js b/src/store/index.js index 6f07d085..a2289373 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,23 +48,23 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 - // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 - // WORKFLOWURL: 'http://192.168.181.67:88/#/workspace/forms',//测试工作流地址(本地) + UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 - BASEURL: baseUrl - ? baseUrl - : window.location.protocol + "//" + window.location.host + "/", //正式环境 - UPLOADURL: - window.location.protocol + - "//" + - window.location.host + - "/upload/image", //正式环境 - FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 - // WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址 - WORKFLOWURL: 'http://jxj.zhgdyun.com:9814/#/workspace/forms',//正式工作流地址 + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/", //正式环境 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/upload/image", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + // WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址 + // WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/equipmentCenter/equipmentCenterIndex.vue b/src/views/equipmentCenter/equipmentCenterIndex.vue index 255b35c6..e6b8b7e3 100644 --- a/src/views/equipmentCenter/equipmentCenterIndex.vue +++ b/src/views/equipmentCenter/equipmentCenterIndex.vue @@ -112,6 +112,13 @@ export default { id: 21, path: "/equipmentCenter/laborDevManage", }, + { + menuName: "门禁分组", // 门禁分组 + subhead: "门禁分组", // 门禁分组 + operation: true, + id: 21, + path: "/equipmentCenter/accessGroup", + }, ], }, { diff --git a/src/views/equipmentCenter/laborManage/accessGroup.vue b/src/views/equipmentCenter/laborManage/accessGroup.vue new file mode 100644 index 00000000..8ac4b3a9 --- /dev/null +++ b/src/views/equipmentCenter/laborManage/accessGroup.vue @@ -0,0 +1,508 @@ + + + diff --git a/src/views/projectFront/dangerousBigProject/index.vue b/src/views/projectFront/dangerousBigProject/index.vue index 84af7fc5..cc187ff3 100644 --- a/src/views/projectFront/dangerousBigProject/index.vue +++ b/src/views/projectFront/dangerousBigProject/index.vue @@ -857,7 +857,7 @@ export default { this.isEdit = true this.isAdd = false // 详细 - this.dialogTitle = $t('message.dangerousBigProject.detailed') + this.dialogTitle = this.$t('message.dangerousBigProject.detailed') this.detailId = val.id } } diff --git a/src/views/projectFront/laborManage/components/comboForm.vue b/src/views/projectFront/laborManage/components/comboForm.vue new file mode 100644 index 00000000..fbc11c50 --- /dev/null +++ b/src/views/projectFront/laborManage/components/comboForm.vue @@ -0,0 +1,5411 @@ + + + + diff --git a/src/views/projectFront/laborManage/components/laborPersonCommon.less b/src/views/projectFront/laborManage/components/laborPersonCommon.less new file mode 100644 index 00000000..28c9cc6e --- /dev/null +++ b/src/views/projectFront/laborManage/components/laborPersonCommon.less @@ -0,0 +1,207 @@ +.flex { + display: flex; + align-items: center; + justify-content: space-between; +} +.flex2 { + display: flex; + align-items: center; +} +.flex3 { + display: flex; + justify-content: space-between; +} +.flex4 { + display: flex; + justify-content: space-between; +} +.flex5 { + display: flex; + align-items: center; + justify-content: center; +} +.right2 { + margin-left: 11px; + width: calc(100% - 380px); + height: 100%; + box-sizing: border-box; + .title { + padding: 0 22px; + height: 41px; + line-height: 41px; + // background: #fff; + border-bottom: 1px solid #e6e6e6; + .team_number { + opacity: 0.7; + font-size: 14px; + text-align: left; + font-family: PingFangSC-Regular; + .number { + color: @--color-primary; + opacity: 1; + } + } + } + .team_list { + padding: 20px 22px; + // background: #fff; + margin-bottom: 8px; + position: relative; + height: 79px; + .team_addBtn { + display: grid; + padding: 10px 0; + width: 79px; + height: 79px; + border-radius: 3px; + /deep/ i { + font-size: 30px; + } + /deep/ span { + opacity: 0.7; + display: block; + width: 100%; + margin: 0; + } + } + .team_addBtn:hover { + /deep/ span { + color: #fff; + } + } + .list_wrap { + flex-grow: 22; + flex-wrap: wrap; + overflow: hidden; + cursor: pointer; + .list { + width: 88px; + height: 79px; + margin-left: 12px; + box-sizing: border-box; + padding: 14px 0; + margin-bottom: 12px; + font-size: 14px; + text-align: center; + border-radius: 3px; + background-color: #dce0ec; + div { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + padding: 0 5px; + } + } + .checkedTeam { + background-color: #3390ff !important; + } + } + } + .laborComponent_table_wrap { + box-sizing: border-box; + // background: #fff; + height: calc(100% - 170px); + position: relative; + padding-bottom: 60px; + .search_wrap { + padding: 25px 13px 13px 13px; + border-bottom: 2px solid #e5ecfe; + .el-button + .el-button { + margin-left: 5px; + } + } + .values { + opacity: 0.9; + } + } + .table_wrap_bottom { + padding: 0 13px; + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 46px; + .table_wrap_btn { + margin-left: 20px; + } + } + /deep/ .el-form-item { + margin-bottom: 0; + } + + .show_teamList { + width: calc(100% - 128px); + flex-grow: 22; + flex-wrap: wrap; + cursor: pointer; + float: left; + z-index: 1000; + position: absolute; + left: 110px; + top: 7px; + background: #fff; + border: 1px solid #e5ecfe; + border-radius: 5px; + padding-top: 12px; + padding-right: 12px; + } + .height_79 { + height: 79px; + } +} + +.hint { + opacity: 0.5; + color: rgba(42, 46, 63, 1); + font-size: 12px; + text-align: left; + font-family: PingFangSC-Regular; +} + +.bigImageDialog { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.5); + text-align: center; + z-index: 1000000; + overflow-y: auto; + // padding-bottom: 50px; + height: 100%; + .bigImageContent { + height: 100%; + margin: 0 auto; + text-align: center; + } + img { + // margin-top: 10%; + position: relative; + top: 10%; + max-height: 80%; + max-width: 80%; + } +} + +.margin_top35 { + margin-top: -35px; +} + +/deep/ .identity_card .el-upload-list__item-name { + width: 100px; +} + +.upload_btn_wrap { + position: relative; + width: 100%; + .High_btn { + position: absolute; + right: 70px; + top: 2px; + height: 28px; + } +} +.personItemBottom { + margin-top: 10px; +} diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 2e201378..85739173 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -229,7 +229,7 @@ $t('message.laborMange.export') + $t('message.laborMange.template') }} 导入照片 下发通行设备
@@ -557,7 +564,75 @@ - + + +
+
+ +
+ 向目标组织下批量导入人员正面免冠照，导入前建议使用人脸照片预处理工具进行质量清洗，并确认照片对应的人员信息是否存在。 +
+
+
+ 导入文件： +
+ + + +
+ 将文件拖到此处，或点击上传 +
+ +
+
+
+ 支持导入200MB以内的ZIP文件，建议文件中包含照片的数量在1000张以内； + 照片命名规则为姓名_证件号码jpg，需露出眉毛和眼睛；单张照片文件大小10 + KB~200 KB。 +
+
+ 选择文件后将自动上传并进行数据校验 +
+
+ {{ $t("message.laborMange.cancel") }} + 导入 +
+
+ - +
+ + 设备 + 分组 + +
+ + + + {{ $t("message.laborMange.checkAll") }} + + + {{ item.name }} + + + +
{ + if (res.success) { + this.$message.success("操作成功"); + this.imgImportDialog = false; + this.getTableData(); + } + }); + }, + handleImportSuccess(response, file, fileList) { + console.log(response, file, fileList); + this.imgFileList = fileList; + console.log(this.imgFileList); + }, + handleImportExceed(files, fileList) { + /*this.$message.warning( + `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${ + files.length + fileList.length + } 个文件` + );*/ + this.$message.warning( + this.$t("message.docManage.dialog_upload_files.limitingChoice") + ); //当前限制选择 1 个文件 + }, + // 导入照片弹窗 + importImgOpen() { + this.imgImportDialog = true; + }, handleUpload(fileData, type) { const file = fileData.file // 压缩图片 @@ -2103,6 +2257,18 @@ export default { checkedCount > 0 && checkedCount < allCheckList.length console.log('--------------------------', this.personForm.ufaceDevId) }, + handleUGroupChange(val) { + let checkedCount = val.length; + let allCheckList = []; + for (let i = 0; i < this.uGroupAllList.length; i++) { + if (!this.uGroupAllList[i].disabled) { + allCheckList.push(this.uGroupAllList[i]); + } + } + this.checkAllGroupDev = checkedCount === allCheckList.length; + this.isIndeterminate3 = + checkedCount > 0 && checkedCount < allCheckList.length; + }, handleCheckAllChangeFace(val) { if (val) { this.personForm.ufaceDevId = [] @@ -2115,6 +2281,53 @@ export default { console.log(val) this.isIndeterminate2 = false }, + handleCheckAllChangeGroup(val){ + if (val) { + this.personForm.uGroupId = []; + this.uGroupAllList.forEach((item) => { + this.personForm.uGroupId.push(item.id); + }); + } else { + this.personForm.uGroupId = []; + } + this.isIndeterminate2 = false; + }, + // 获取所有分组 + getUGroupDevList() { + getGroupListApi({ projectSn: this.projectSn }).then((res) => { + console.log(res); + if (res.code == 200) { + this.uGroupAllList = res.result; + console.log(this.uGroupAllList,777888999) + this.personForm.uGroupId = [...this.personForm.uGroupId]; + if (this.$store.state.userInfo.accountType == 6) { + this.uGroupAllList.forEach((item) => { + item.disabled = true; + }); + // selectUserDevAuthorityByUserIdApi({ + // userId: this.$store.state.userInfo.userId, + // devType: "1", + // }).then((res) => { + // if (res.code == 200) { + // let arr = res.result.devId.split(","); + // let id = ""; + // this.personForm.ufaceDevId = []; + // for (let i = 0; i < arr.length; i++) { + // console.log(parseInt(arr[i])); + // this.personForm.ufaceDevId.push(parseInt(arr[i])); + // id = parseInt(arr[i]); + // for (let j = 0; j < this.ufaceDevAllList.length; j++) { + // if (this.ufaceDevAllList[j].id == id) { + // this.ufaceDevAllList[j].disabled = false; + // } + // } + // } + // } + // }); + } + } + }); + }, // 获取所有人脸设备 getUfaceDevList() { ufaceDevList({ projectSn: this.projectSn }).then((res) => { @@ -2427,6 +2640,7 @@ export default { jobName: '', personType: 2, ufaceDevId: [], + uGroupId: [], personSerial: '' } if (this.attendRulesList.length > 0) { @@ -2561,6 +2775,7 @@ export default { if (!this.personForm.id) { let data = JSON.parse(JSON.stringify(this.personForm)) data.projectSn = this.projectSn + data.devType = this.typeRadio; data.departmentId = this.checkedTeamId data.longTerm = data.longTerm ? 1 : 0 if (this.personForm.ufaceDevId.length > 0) { @@ -2568,6 +2783,11 @@ export default { } else { data.ufaceDevId = '' } + if (this.personForm.uGroupId.length > 0) { + data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + } else { + data.ufaceDevGroupId = ""; + } addWorkerInfo(data).then((res) => { if (res.code == 200) { this.$message.success(this.$t('message.laborMange.addSuccess')) @@ -2579,12 +2799,18 @@ export default { //编辑 } else { let data = this.personForm + data.devType = this.typeRadio; console.log('dadadaa', data) if (this.personForm.ufaceDevId.length > 0) { data.ufaceDevId = this.personForm.ufaceDevId.join(',') } else { data.ufaceDevId = '' } + if (this.personForm.uGroupId.length > 0) { + data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + } else { + data.ufaceDevGroupId = ""; + } data.longTerm = data.longTerm ? 1 : 0 delete data.addTime editWorkerInfo(data).then((res) => { @@ -2646,6 +2872,7 @@ export default { jobName: '', personType: 2, ufaceDevId: [], + uGroupId: [], personSerial: '' } this.getUfaceDevList() @@ -3513,6 +3740,9 @@ export default { .addPerson_content { height: 617px; padding-top: 10px; + .type-change{ + margin: 5px 0px; + } } .custom-tree-node { display: flex; @@ -3556,4 +3786,91 @@ export default { justify-content: space-around; } } +// 照片导入 +.importImgDialog { + /deep/.el-dialog__body { + padding: 15px 20px; + } +} +.import-content { + .alarm-content { + display: flex; + align-items: center; + margin-left: 104px; + .el-icon-warning-outline { + color: #ea3941; + font-size: 23px; + } + div { + width: 405px; + line-height: 18px; + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + font-size: 12px; + color: #ea3941; + margin: 5px; + } + } + .import-operation { + display: flex; + margin-top: 5px; + margin-left: 136px; + span { + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #272d45; + margin-right: 10px; + } + > div { + .upload-demo { + width: 321px; + height: 45px; + /deep/.el-upload { + width: 100%; + height: 100%; + .el-upload-dragger { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + .el-icon-upload { + color: #a2a4af; + font-size: 20px; + margin: 0px; + margin-right: 5px; + } + .el-upload__text { + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #a2a4af; + } + } + } + } + } + } + .upload-tip { + width: 321px; + margin-left: 215px; + margin-top: 5px; + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + font-size: 12px; + line-height: 18px; + color: #a2a4af; + } + .upload-tip-sub { + width: 321px; + margin-left: 215px; + margin-top: 5px; + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + font-size: 14px; + color: #5181f6; + line-height: 16px; + } +} diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 16e7b012..0c5f0e28 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -542,7 +542,7 @@ name="files" :action="$store.state.UPLOADURL" :multiple="false" - :on-exceed="handleExceed" + :on-exceed="handleImportExceed" :on-success="handleImportSuccess" :file-list="imgFileList" accept=".zip" @@ -568,7 +568,7 @@
{{ $t("message.laborMange.cancel") }} - +
+ + 设备 + 分组 + +
+ {{ $t("message.laborMange.checkAll") }} @@ -1541,6 +1548,33 @@ + + + {{ $t("message.laborMange.checkAll") }} + + + {{ item.name }} + + + + @@ -1690,6 +1724,7 @@
0 && checkedCount < allCheckList.length; }, + handleUGroupChange(val) { + let checkedCount = val.length; + let allCheckList = []; + for (let i = 0; i < this.uGroupAllList.length; i++) { + if (!this.uGroupAllList[i].disabled) { + allCheckList.push(this.uGroupAllList[i]); + } + } + this.checkAllGroupDev = checkedCount === allCheckList.length; + this.isIndeterminate3 = + checkedCount > 0 && checkedCount < allCheckList.length; + }, handleCheckAllChangeFace(val) { if (val) { this.personForm.ufaceDevId = []; @@ -2498,6 +2553,53 @@ export default { } this.isIndeterminate2 = false; }, + handleCheckAllChangeGroup(val){ + if (val) { + this.personForm.uGroupId = []; + this.uGroupAllList.forEach((item) => { + this.personForm.uGroupId.push(item.id); + }); + } else { + this.personForm.uGroupId = []; + } + this.isIndeterminate2 = false; + }, + // 获取所有分组 + getUGroupDevList() { + getGroupListApi({ projectSn: this.projectSn }).then((res) => { + console.log(res); + if (res.code == 200) { + this.uGroupAllList = res.result; + console.log(this.uGroupAllList,777888999) + this.personForm.uGroupId = [...this.personForm.uGroupId]; + if (this.$store.state.userInfo.accountType == 6) { + this.uGroupAllList.forEach((item) => { + item.disabled = true; + }); + // selectUserDevAuthorityByUserIdApi({ + // userId: this.$store.state.userInfo.userId, + // devType: "1", + // }).then((res) => { + // if (res.code == 200) { + // let arr = res.result.devId.split(","); + // let id = ""; + // this.personForm.ufaceDevId = []; + // for (let i = 0; i < arr.length; i++) { + // console.log(parseInt(arr[i])); + // this.personForm.ufaceDevId.push(parseInt(arr[i])); + // id = parseInt(arr[i]); + // for (let j = 0; j < this.ufaceDevAllList.length; j++) { + // if (this.ufaceDevAllList[j].id == id) { + // this.ufaceDevAllList[j].disabled = false; + // } + // } + // } + // } + // }); + } + } + }); + }, // 获取所有人脸设备 getUfaceDevList() { ufaceDevList({ projectSn: this.projectSn }).then((res) => { @@ -3074,6 +3176,7 @@ export default { idCardUpPhotoUrl: "", idCardDownPhotoUrl: "", ufaceDevId: [], + uGroupId: [], personSerial: "", }; if (this.attendRulesList.length > 0) { @@ -3176,6 +3279,7 @@ export default { data.enterpriseId = this.checkedId; data.longTerm = this.personForm.longTerm ? 1 : 0; data.registerType = 1; + data.devType = this.typeRadio; data.userId = this.$store.state.userInfo.userId; if (this.$store.state.userInfo.accountType == 6) { data.accountType = 2; @@ -3187,6 +3291,11 @@ export default { } else { data.ufaceDevId = ""; } + if (this.personForm.uGroupId.length > 0) { + data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + } else { + data.ufaceDevGroupId = ""; + } addWorkerInfo(data).then((res) => { if (res.code == 200) { this.$message.success( @@ -3207,6 +3316,7 @@ export default { let data = this.personForm; data.longTerm = this.personForm.longTerm ? 1 : 0; data.registerType = 1; + data.devType = this.typeRadio; // 跟杨珊对接需要再再次进场时多传入一个新的字段 data.reEntry = 1; data.userId = this.$store.state.userInfo.userId; @@ -3219,6 +3329,15 @@ export default { } else { data.ufaceDevId = ""; } + if (this.personForm.uGroupId.length > 0) { + console.log( + "this.personForm.uGroupId", + this.personForm.uGroupId + ); + data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + } else { + data.ufaceDevGroupId = ""; + } if (this.$store.state.userInfo.accountType == 6) { data.accountType = 2; } else { @@ -3298,6 +3417,7 @@ export default { idCardUpPhotoUrl: "", idCardDownPhotoUrl: "", ufaceDevId: [], + uGroupId: [], personSerial: "", }; this.getUfaceDevList(); @@ -4434,6 +4554,9 @@ export default { .el-form-item--small.el-form-item { margin-bottom: 10px; } + .type-change{ + margin: 5px 0px; + } } .shut_icon { diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue index 973564cf..350cae29 100644 --- a/src/views/projectFront/laborManage/personModule/temporary.vue +++ b/src/views/projectFront/laborManage/personModule/temporary.vue @@ -1076,8 +1076,8 @@ export default { justify-content: center; } .temporary { - width: 100%; - height: 100%; + // width: 100%; + height: auto; .placeholder { width: 100%; height: 41px; diff --git a/src/views/projectFront/laborManage/roster.vue b/src/views/projectFront/laborManage/roster.vue index 406c7d70..60188872 100644 --- a/src/views/projectFront/laborManage/roster.vue +++ b/src/views/projectFront/laborManage/roster.vue @@ -139,6 +139,7 @@ {{ $t("message.laborMange.crew") + $t("message.laborMange.export") }} +
@@ -791,6 +792,8 @@ + +