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,