From 40a7b54169edc01e95a3fdcf85dbc15e664a4a12 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 16 Apr 2024 14:13:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- equipmentCenter.js | 4 + src/assets/js/http.js | 4 +- src/router/equipmentCenter.js | 4 + src/router/index.js | 12 + src/store/index.js | 28 +- .../equipmentCenter/equipmentCenterIndex.vue | 7 + .../laborManage/accessGroup.vue | 1009 +++++++++++++++++ .../personModule/administration.vue | 250 +++- .../personModule/laborComponent.vue | 42 +- .../safeManage/v2/checkStandingBook.vue | 2 +- 10 files changed, 1336 insertions(+), 26 deletions(-) create mode 100644 src/views/equipmentCenter/laborManage/accessGroup.vue 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/http.js b/src/assets/js/http.js index f842ac40..baf85454 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,7 +84,7 @@ 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.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/' //沈阳和盈 @@ -93,7 +93,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // 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://47.93.215.234:9809/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { 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..36cf0bf0 --- /dev/null +++ b/src/views/equipmentCenter/laborManage/accessGroup.vue @@ -0,0 +1,1009 @@ + + + diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 2e201378..8eda773e 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.devName }} + + + + + + + {{ $t('message.laborMange.checkAll') }} + { + 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 // 压缩图片 @@ -3513,6 +3661,9 @@ export default { .addPerson_content { height: 617px; padding-top: 10px; + .type-change{ + margin: 5px 0px; + } } .custom-tree-node { display: flex; @@ -3556,4 +3707,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..00e69fb4 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" @@ -1515,7 +1515,13 @@ - +
+ + 设备 + 分组 + +
+ + + + {{ $t("message.laborMange.checkAll") }} + + + {{ item.devName }} + + + + @@ -2122,6 +2154,7 @@ export default { }, data() { return { + typeRadio: 1, refreshPage: true, //静默刷新 radio: "", key: false, //判断是否显示一件下发按钮 @@ -2349,7 +2382,7 @@ export default { this.imgFileList = fileList; console.log(this.imgFileList); }, - handleExceed(files, fileList) { + handleImportExceed(files, fileList) { /*this.$message.warning( `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${ files.length + fileList.length @@ -4434,6 +4467,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/safeManage/v2/checkStandingBook.vue b/src/views/projectFront/safeManage/v2/checkStandingBook.vue index 458947d6..edcca6de 100644 --- a/src/views/projectFront/safeManage/v2/checkStandingBook.vue +++ b/src/views/projectFront/safeManage/v2/checkStandingBook.vue @@ -1451,7 +1451,7 @@ export default { imageUrl: imgList.join(','), inspectTypeId: this.formData.inspectTypeId, projectSn: this.projectSn, - recordType: 1, + recordType: this.formData.status == 1?2:1, rectifyRequire: this.formData.rectifyRequire, reviewId: this.$store.state.userInfo.userId, status: this.formData.status, From 6f1539326d6a22276b98cdbf63233834644e9534 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 16 Apr 2024 23:10:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/laborPerson.js | 7 + src/assets/js/http.js | 1 + src/components/header.vue | 4 +- .../laborManage/accessGroup.vue | 859 +-- .../dangerousBigProject/index.vue | 2 +- .../laborManage/components/comboForm.vue | 5411 +++++++++++++++++ .../components/laborPersonCommon.less | 207 + .../personModule/administration.vue | 125 +- .../personModule/laborComponent.vue | 105 +- .../laborManage/personModule/temporary.vue | 4 +- src/views/projectFront/laborManage/roster.vue | 12 + 11 files changed, 6020 insertions(+), 717 deletions(-) create mode 100644 src/views/projectFront/laborManage/components/comboForm.vue create mode 100644 src/views/projectFront/laborManage/components/laborPersonCommon.less 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 baf85454..55018dc1 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -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/views/equipmentCenter/laborManage/accessGroup.vue b/src/views/equipmentCenter/laborManage/accessGroup.vue index 36cf0bf0..8ac4b3a9 100644 --- a/src/views/equipmentCenter/laborManage/accessGroup.vue +++ b/src/views/equipmentCenter/laborManage/accessGroup.vue @@ -2,20 +2,26 @@
- 新增 + 新增
- + + > + + +
- + -
- - - - - - - - {{ $t("message.laborDev.openPlatform") }} - - - - - - - - - - - - - - - - - - - - {{ $t("message.laborDev.whetherList")[0] }} - - {{ $t("message.laborDev.whetherList")[1] }} - - - - {{ item.serviceName }} - - -
- - 取消 - - {{ $t("message.personnelPosition.determine") }} - -
- -
- - -
- - - - - -
-
- {{selectCompanyName}} - - + + + + + +
+
+ {{ selectCompanyName }} + + +
+
+ +
+ {{ item.devName }} + +
-
- -
- {{item.name}} - -
- -
-
- - + +
+
+ +
import tag from "@/components/tag"; import { - getProjectUfaceConfigInfo, - projectUfaceConfigEdit, - ufaceDevAdd, - ufaceDevEdit, - ufaceDevDelete, + getGroupPageApi, + addGroupApi, + editGroupApi, + deleteGroupApi, ufaceDevList, - selectHousingListApi, } from "../../../assets/js/api/laborPerson"; export default { @@ -308,319 +150,112 @@ export default { }, data() { return { + checkList: [], checkAllEnter: false, isIndeterminate: false, checkAllOut: false, isIndeterminate2: false, - noEdit: true, //不允许配置信息 record: [], //用于储存选择前的 - devIcon: { - active: require("../../../assets/images/switch_active.png"), - grey: require("../../../assets/images/switch.png"), - }, - current: -1, - // selectDev: '', - tagArr: ["info", "success"], enableInList: [], //入场时间 enableOutList: [], //出场时间 - pointList: [], - initDialog: false, - beaconForm: { - supplierType: "", - appId: "", - appSecret: "", - appKey: "", - projectSn: this.$store.state.projectSn, - housing: "", - issueDev: "", - serviceUrl: "", - }, - beaconFormRules: { - supplierType: [ - { - required: true, - message: this.$t("message.personnelPosition.required"), - trigger: "blur", - }, - ], - issueDev: [ - { - required: true, - message: this.$t("message.personnelPosition.required"), - trigger: "change", - }, - ], - }, + tableList: [], addEditDialog: false, addEditDialogTitle: "", addEditForm: { - devName: "", - devSn: "", - isEnter: "", - isOut: "", - devGroupType: 1, + name: "", + ufaceDevList: true, }, addEditFormRules: { - devName: [ + name: [ { required: true, message: this.$t("message.personnelPosition.required"), trigger: "blur", - } - ], - devSn: [ - { - required: true, - message: this.$t("message.personnelPosition.required"), - trigger: "blur", - } + }, ] }, - devTypeList: this.$t("message.laborDev.devTypeList"), - // devTypeList:[{name:'杭州宇泛智能科技',id:1},{name:'芊熠智能',id:4},{name:'佳信捷',id:6}], - devGroupTypeList: this.$t("message.laborDev.devGroupTypeList"), - canCloseInitDialog: false, - timeList: [ - { id: 0, name: "00:01~01:00" }, - { id: 1, name: "01:01~02:00" }, - { id: 2, name: "02:01~03:00" }, - { id: 3, name: "03:01~04:00" }, - { id: 4, name: "04:01~05:00" }, - { id: 5, name: "05:01~06:00" }, - { id: 6, name: "06:01~07:00" }, - { id: 7, name: "07:01~08:00" }, - { id: 8, name: "08:01~09:00" }, - { id: 9, name: "09:01~10:00" }, - { id: 10, name: "10:01~11:00" }, - { id: 11, name: "11:01~12:00" }, - { id: 12, name: "12:01~13:00" }, - { id: 13, name: "13:01~14:00" }, - { id: 14, name: "14:01~15:00" }, - { id: 15, name: "15:01~16:00" }, - { id: 16, name: "16:01~17:00" }, - { id: 17, name: "17:01~18:00" }, - { id: 18, name: "18:01~19:00" }, - { id: 19, name: "19:01~20:00" }, - { id: 20, name: "20:01~22:00" }, - { id: 21, name: "21:01~23:00" }, - { id: 22, name: "22:01~24:00" }, - { id: 23, name: "23:01~00:00" }, - ], - housingList: [], - selectedHousingList: [], isSelectCompany: false, - selectCompanyName: '请选择', - companyList: [{ - name: "门禁", checked: false - }], + selectCompanyName: "请选择", + devList: [], + pageInfo: { + pageNo: 1, //页数 + pageSize: 10, //条数 + total: 1, //总条数 + }, }; }, created() { this.company = COMPANY; console.log(this.company); - }, - mounted() { - this.getConfig(); - this.selectHousingList(); + this.getDevList(); this.getList(); }, + mounted() {}, methods: { - changeSelectCompany(obj,index){ - let findIndex = this.companyList.findIndex(item => { - return obj.checked; - }) - if(findIndex != -1){ - this.selectCompanyName = "请选择" - } else { - this.selectCompanyName = "已选择" - } - this.companyList[index].checked = !this.companyList[index].checked - this.isSelectCompany = false; - }, - handleCheckAllChange(val, type) { - if (type == "enter") { - this.enableInList = val - ? [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - ] - : []; - this.isIndeterminate = false; - } else if (type == "out") { - this.enableOutList = val - ? [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - ] - : []; - this.isIndeterminate2 = false; - } - }, - handleCheckedChange(val, type) { - let checkedCount = val.length; - if (type == "enter") { - this.checkAllEnter = checkedCount === this.timeList.length; - this.isIndeterminate = - checkedCount > 0 && checkedCount < this.timeList.length; - } else if (type == "out") { - this.checkAllOut = checkedCount === this.timeList.length; - this.isIndeterminate2 = - checkedCount > 0 && checkedCount < this.timeList.length; - } - }, - changRadio(val, type) { - console.log(val, type); - if (type == "enter") { - this.isIndeterminate = false; - this.checkAllEnter = false; - this.enableInList = []; - } else if (type == "out") { - this.enableOutList = []; - this.checkAllOut = false; - this.isIndeterminate2 = false; - } - }, - downloadFn() { - // HTTP人脸设备对接协议 - window.open( - "/doc/" + this.$t("message.laborDev.faceDockingProtocol") + ".docx" - ); - }, - openPlat() { - window.open("http://scenario.qy-rgs.com:9000/auth/page"); - }, - selectHousingList() { - selectHousingListApi({}).then((res) => { - console.log("=======", res); - this.housingList = res.result; - }); - }, - getConfig() { - getProjectUfaceConfigInfo({ - projectSn: this.$store.state.projectSn, - }).then((result) => { - if (result.success) { - if (!result.result) { - console.log("弹窗"); - // this.canCloseInitDialog = true; - this.noEdit = false; - this.initDialog = true; - } else { - this.beaconForm = result.result; - if (this.beaconForm.housing) { - if (this.beaconForm.housing.indexOf(",") != -1) { - this.selectedHousingList = this.beaconForm.housing.split(","); - } else { - this.selectedHousingList = [this.beaconForm.housing]; - } - } - // console.log("配置", result.result); - // this.selectDev = result.result.supplierType; - this.getList(); - } + checkBoxChange(e, index) { + console.log(e, index); + this.devList[index].checked = e; + this.selectCompanyName = "请选择"; + this.devList.map((item) => { + if (item.checked) { + this.selectCompanyName = "已选择"; } }); }, + SizeChange(val) { + this.pageInfo.pageSize = val; + this.getList(); + }, + CurrentChange(val) { + this.pageInfo.pageNo = val; + this.getList(); + }, getList() { - ufaceDevList({ projectSn: this.$store.state.projectSn }).then((list) => { - console.log("列表", list); - this.pointList = list.result; + let requestData = { + projectSn: this.$store.state.projectSn, + pageNo: this.pageInfo.pageNo, + pageSize: this.pageInfo.pageSize, + }; + getGroupPageApi(requestData).then((res) => { + console.log("门禁分组列表", res); + this.tableList = res.result.records; + this.pageInfo.total = res.result.total; }); }, - setEnableIn(i, id) { - // this.enableOutList=[]; - i.type = !i.type; - // this.enableOutList.push(id); - // this.timeList[index]=id; - console.log( - "a入厂时间", - this.enableInList, - "出厂时间", - this.enableOutList - ); - }, - setEnableOut(i, id) { - // this.enableInList=[]; - i.type = !i.type; - /*this.enableInList.map(value => { - if (value === id) { - console.log('val', value) - } - })*/ - console.log(id); - // this.enableInList.forEach((item,index)=>{ - // if(item != id){ - // this.enableInList.push(id); - // return; - // }else{ - // this.enableInList.splice(index,1) - // return; - // } - // }) - console.log( - "b入厂时间", - this.enableInList, - "出厂时间", - this.enableOutList - ); + getDevList() { + ufaceDevList({ projectSn: this.$store.state.projectSn }).then((list) => { + this.devList = list.result; + this.devList.map((item) => { + item.checked = false; + }); + }); }, addGroup() { this.addEditDialogTitle = "新增"; + this.resetForm(); this.addEditDialog = true; }, editPoint(devInfo) { this.addEditDialogTitle = "编辑"; + this.resetForm(); + this.addEditForm = {...devInfo}; + if (devInfo.ufaceDevList.length > 0) { + this.selectCompanyName = "已选择"; + } + this.devList.map((item) => { + devInfo.ufaceDevList.map((item2) => { + if (item.id == item2.id) { + item.checked = true; + } + }); + }); this.addEditDialog = true; }, removePoint(item) { this.$confirm( this.$t("message.personnelPosition.beaconManage.table.confirmText") + "【" + - item.devName + + item.name + "】?", this.$t("message.personnelPosition.beaconManage.table.Tips"), { @@ -633,7 +268,7 @@ export default { type: "warning", } ).then(() => { - ufaceDevDelete({ id: item.id }).then((res) => { + deleteGroupApi({ id: item.id }).then((res) => { this.$message.success( this.$t("message.personnelPosition.delete_success") ); //删除成功! @@ -641,125 +276,48 @@ export default { }); }); }, - // 取消 - cancelBeaconFn() { - this.initDialog = false; - this.beaconForm = { - supplierType: "", - appId: "", - appSecret: "", - appKey: "", - projectSn: this.$store.state.projectSn, - housing: "", - issueDev: "", - serviceUrl: "", - }; - }, - saveBeaconFn() { - this.$refs["beaconForm"].validate((valid) => { - if (valid) { - if (this.selectedHousingList.length > 0) { - this.beaconForm.housing = this.selectedHousingList.join(","); - } else { - this.beaconForm.housing = 0; - } - projectUfaceConfigEdit(this.beaconForm).then((res) => { - console.log("初始化设备", res); - this.getConfig(); //???获取配置 - // this.getList(); - this.$message.success( - this.$t("message.personnelPosition.add_success") - ); //添加成功！ - this.beaconDialog = false; - this.initDialog = false; - }); - } else { - console.log("error submit!!"); - return false; - } - }); - }, - isRepeat(arr) { - let obj = {}; - for (var i in arr) { - if (obj[arr[i]]) { - return true; - } - obj[arr[i]] = true; - } - return false; - }, - //添加或编辑设备 + //添加或编辑分组 saveDevFn() { + let findIndex = this.devList.findIndex((item) => { + return item.checked == true; + }); + console.log(findIndex,111222333) + if (findIndex == -1) { + this.$message.error("请选择门禁点数"); + return; + } this.$refs["addEditForm"].validate((valid) => { if (valid) { - if ( - (this.addEditForm.isEnter === 0 || - this.addEditForm.isEnter === "") && - (this.addEditForm.isOut === 0 || this.addEditForm.isOut === "") - ) { - this.$message.error(this.$t("message.laborDev.error")); - return; - } + let requestData = { + projectSn: this.$store.state.projectSn, + name: this.addEditForm.name, + }; let arr = []; - this.enableInList.forEach((item) => { - arr.push(item); + this.devList.map((item) => { + if (item.checked) { + console.log(item, 777888); + arr.push({ id: item.id }); + } }); - this.enableOutList.forEach((item) => { - arr.push(item); - }); - console.log(arr); - if (this.isRepeat(arr)) { - this.$message.error(this.$t("message.laborDev.error1")); // 同一时间段内无法同时选择进出！ - return; - } - - if (this.isAdd) { - // if (this.enableInList.length + this.enableOutList.length === 24) { - console.log( - "$入厂时间", - this.enableInList, - "出厂时间", - this.enableOutList - ); - - this.addEditForm.enterTime = this.enableInList.join(","); - this.addEditForm.outTime = this.enableOutList.join(","); - this.addEditForm.projectSn = this.$store.state.projectSn; - console.log("信息", this.addEditForm); - - ufaceDevAdd(this.addEditForm).then((result) => { - console.log("设备添加成功", result); - this.$message.success(result.message); - this.addEditDialog = false; - this.getList(); - this.resetForm(); + requestData.ufaceDevList = arr; + if (this.addEditDialogTitle == "新增") { + addGroupApi(requestData).then((result) => { + if (result.success) { + this.$message.success(result.message); + this.addEditDialog = false; + this.getList(); + this.resetForm(); + } }); - - // } else { - // console.log('入场出场时间不完整', this.enableInList, this.enableOutList) - // } - /*addPositionBeaconApi(this.addEditForm).then((res) => { - this.beaconDialog = false; - this.loadBeaconData(); - this.$message.success( - this.$t("message.personnelPosition.add_success") - ); //添加成功！ - });*/ } else { - //editPositionBeaconApi - this.addEditForm.enterTime = this.enableInList.join(","); - this.addEditForm.outTime = this.enableOutList.join(","); - console.log("信息", this.addEditForm); - delete this.addEditForm.heartBeatTime; - ufaceDevEdit(this.addEditForm).then((res) => { - this.beaconDialog = false; - this.getList(); - this.$message.success( - this.$t("message.personnelPosition.edit_success") - ); //编辑成功！ - this.resetForm(); - this.addEditDialog = false; + requestData.id = this.addEditForm.id; + editGroupApi(requestData).then((result) => { + if (result.success) { + this.$message.success(result.message); + this.addEditDialog = false; + this.getList(); + this.resetForm(); + } }); } } else { @@ -769,71 +327,12 @@ export default { }); }, resetForm() { - this.addEditForm.enterTime = []; - this.addEditForm.outTime = []; - this.checkAllEnter = false; - this.isIndeterminate = false; - this.checkAllOut = false; - this.isIndeterminate2 = false; - }, - DevClose() { - // Object.assign(this.$data.enableInList, this.$options.data().enableInList) - this.enableInList = [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - ]; - this.enableOutList = []; - this.addEditForm = { - devName: "", - devSn: "", - isEnter: "", - isOut: "", - devGroupType: 1, - }; - this.$nextTick(() => { - this.$refs.addEditForm.clearValidate(); + this.selectCompanyName = "请选择"; + this.addEditForm.name = ""; + this.devList.map((item) => { + item.checked = false; }); }, - choiceDevice(index) { - if (this.beaconForm.supplierType !== index) { - this.record = []; - this.record.push(this.beaconForm.supplierType); - console.log( - "this.beaconForm.supplierType", - this.beaconForm.supplierType - ); - this.canCloseInitDialog = true; - this.initDialog = true; - this.beaconForm.supplierType = index; - // this.beaconForm.selectDev = index; - console.log("历史记录", this.record); - } - }, - CloseChoiceDevice() { - // this.beaconForm.supplierType = this.record[0]; - }, }, }; @@ -947,22 +446,22 @@ export default { .dialogFormBox { /*width: 840px;*/ - .select-content{ + .select-content { box-sizing: border-box; width: 100%; height: 34px; line-height: 34px !important; border-radius: 3px; - border: 1px solid #D7DBE9; + border: 1px solid #d7dbe9; padding: 0 15px; position: relative; - .tip-text{ + .tip-text { display: flex; align-items: center; justify-content: space-between; cursor: pointer; } - .select-list{ + .select-list { width: 100%; height: 200px; position: absolute; @@ -974,28 +473,28 @@ export default { box-shadow: 0 4px 6px 0px #606e9a; padding: 10px 8px; box-sizing: border-box; - &-item{ + &-item { display: flex; align-items: center; justify-content: space-between; cursor: pointer; - span{ + span { margin-left: 10px; } - /deep/.el-checkbox__label{ - display: none; + /deep/.el-checkbox__label { + display: none; } } - &-item:hover{ - background-color: #DEE7FF; + &-item:hover { + background-color: #dee7ff; } } } } -.operation-style{ +.operation-style { .flex(); justify-content: center; - .operationText:not(:last-child){ + .operationText:not(:last-child) { margin-right: 10px; } } 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 8eda773e..85739173 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -1542,30 +1542,30 @@ - {{ $t('message.laborMange.checkAll') }} - - - - {{ item.devName }} - - - + {{ $t("message.laborMange.checkAll") }} + + + {{ item.name }} + + +
@@ -1873,6 +1873,7 @@ import { getEnterpriseTypeList, selectHierarchyEnterpriseListApi, ufaceDevList, + getGroupListApi, checkImgLibraryApi, batchSendWorkerInfoApi, sendWorkerInfoByIdApi, @@ -1903,8 +1904,11 @@ export default { isCheckeedData: true, //判断一键下发是否有数据选中 COMPANY: COMPANY, isIndeterminate2: false, + isIndeterminate3: false, checkAllFaceDev: false, + checkAllGroupDev: false, ufaceDevAllList: [], + uGroupAllList: [], //所有分组 enterpriseTreeData: [], projectSn: null, //projectSn 项目sn uploadUrl: '', //文件上传地址 @@ -1983,6 +1987,7 @@ export default { personType: 2, ruleId: '', ufaceDevId: [], + uGroupId: [], personSerial: '', payRollBankName: '', payRollBankNumber: '', @@ -2064,6 +2069,7 @@ export default { this.getAttendRuleList() this.getHierarchyEnterpriseList() this.getUfaceDevList() + this.getUGroupDevList(); this.getProjectConfig() }, mounted() { @@ -2251,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 = [] @@ -2263,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) => { @@ -2575,6 +2640,7 @@ export default { jobName: '', personType: 2, ufaceDevId: [], + uGroupId: [], personSerial: '' } if (this.attendRulesList.length > 0) { @@ -2709,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) { @@ -2716,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')) @@ -2727,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) => { @@ -2794,6 +2872,7 @@ export default { jobName: '', personType: 2, ufaceDevId: [], + uGroupId: [], personSerial: '' } this.getUfaceDevList() diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 00e69fb4..0c5f0e28 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -568,7 +568,7 @@
{{ $t("message.laborMange.cancel") }}{{ $t("message.laborMange.checkAll") }} @@ -1549,26 +1550,27 @@ {{ $t("message.laborMange.checkAll") }} - {{ item.devName }} + {{ item.name }} @@ -1722,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 = []; @@ -2531,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) => { @@ -3107,6 +3176,7 @@ export default { idCardUpPhotoUrl: "", idCardDownPhotoUrl: "", ufaceDevId: [], + uGroupId: [], personSerial: "", }; if (this.attendRulesList.length > 0) { @@ -3209,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; @@ -3220,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( @@ -3240,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; @@ -3252,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 { @@ -3331,6 +3417,7 @@ export default { idCardUpPhotoUrl: "", idCardDownPhotoUrl: "", ufaceDevId: [], + uGroupId: [], personSerial: "", }; this.getUfaceDevList(); 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 @@
+ +