diff --git a/public/js/config.js b/public/js/config.js index b5d0e08e..615b32d9 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,6 +18,7 @@ var COMPANY = '' //通用 // COMPANY = 'jlw'//金林湾 // COMPANY = 'shzj'//上海张江 // COMPANY = 'shjg'//上海优益（上海建工） +COMPANY = 'agjt'//鞍钢集团 var PROJECT = { local_test: 'common', // 普通版 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 55018dc1..da1ac94e 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/'//测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 diff --git a/src/assets/js/util.js b/src/assets/js/util.js index a934ca47..6670b208 100644 --- a/src/assets/js/util.js +++ b/src/assets/js/util.js @@ -84,31 +84,32 @@ export function IdentityCodeValid(code) { tip = "地址编码错误"; pass = false; } - else{ - //18位身份证需要验证最后一位校验位 - if(code.length == 18){ - code = code.split(''); - //∑(ai×Wi)(mod 11) - //加权因子 - var factor = [ 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 ]; - //校验位 - var parity = [ 1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2 ]; - var sum = 0; - var ai = 0; - var wi = 0; - for (var i = 0; i < 17; i++) - { - ai = code[i]; - wi = factor[i]; - sum += ai * wi; - } - var last = parity[sum % 11]; - if(parity[sum % 11] != code[17]){ - tip = "校验位错误"; - pass =false; - } - } - } + // else{ + // //18位身份证需要验证最后一位校验位 + // if(code.length == 18){ + // code = code.split(''); + // //∑(ai×Wi)(mod 11) + // //加权因子 + // var factor = [ 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 ]; + // //校验位 + // var parity = [ 1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2 ]; + // var sum = 0; + // var ai = 0; + // var wi = 0; + // for (var i = 0; i < 17; i++) + // { + // ai = code[i]; + // wi = factor[i]; + // sum += ai * wi; + // } + // var last = parity[sum % 11]; + // if(parity[sum % 11] != code[17]){ + // tip = "校验位错误"; + // pass =false; + // } + // } + // } + console.log(tip) return pass; } diff --git a/src/store/index.js b/src/store/index.js index a2289373..ecca6ff8 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.34.138: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/", //正式环境 + 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',//鞍钢平台工作流地址 + WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/equipmentCenter/laborManage/accessGroup.vue b/src/views/equipmentCenter/laborManage/accessGroup.vue index 5c107a60..82474889 100644 --- a/src/views/equipmentCenter/laborManage/accessGroup.vue +++ b/src/views/equipmentCenter/laborManage/accessGroup.vue @@ -113,8 +113,8 @@ --> - - + + 0) { // this.selectCompanyName = "已选择"; // } - this.selectVal = devInfo.ufaceDevList.map((item) => { - return item.id; - }); + if(devInfo.ufaceDevList){ + this.addEditForm.ufaceDevList = devInfo.ufaceDevList.map((item) => { + return item.id; + }); + } // this.devList.map((item) => { // devInfo.ufaceDevList.map((item2) => { // if (item.id == item2.id) { @@ -316,7 +325,7 @@ export default { // } // }); this.devList.map((item) => { - if (this.selectVal.includes(item.id)) { + if (this.addEditForm.ufaceDevList.includes(item.id)) { console.log(item, 777888); arr.push({ id: item.id }); } @@ -349,9 +358,10 @@ export default { }); }, resetForm() { - this.selectVal = []; this.selectCompanyName = "请选择"; + this.selectVal = []; this.addEditForm.name = ""; + this.addEditForm.ufaceDevList = []; this.devList.map((item) => { item.checked = false; }); diff --git a/src/views/projectFront/dangerousBigProject/addPlan.vue b/src/views/projectFront/dangerousBigProject/addPlan.vue index 5e9b9d07..f52b756a 100644 --- a/src/views/projectFront/dangerousBigProject/addPlan.vue +++ b/src/views/projectFront/dangerousBigProject/addPlan.vue @@ -348,9 +348,9 @@ export default { }, created(){ this.company = COMPANY - this.headquartersSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.headquartersSn - this.projectSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.sn - this.styleType = this.styleType = this.$store.state.userInfo.styleType; + this.headquartersSn = this.$store.state.userInfo.headquartersSn + this.projectSn = this.$store.state.projectSn + this.styleType = this.$store.state.userInfo.styleType; this.fileUrl = this.$store.state.FILEURL; this.queryTypeList() this.getCooperatorList() @@ -870,7 +870,7 @@ export default { } .button-box{ display: flex; - justify-content: flex-end; + justify-content: center; align-items: center; // padding-top: 8px; height: 60px; diff --git a/src/views/projectFront/dangerousBigProject/detail.vue b/src/views/projectFront/dangerousBigProject/detail.vue index 4dc6dcd4..2edee40f 100644 --- a/src/views/projectFront/dangerousBigProject/detail.vue +++ b/src/views/projectFront/dangerousBigProject/detail.vue @@ -105,6 +105,21 @@ 历史进度记录 +
+
+ 现场照片： +
+ + +
+
+
@@ -224,7 +239,7 @@ v-model="detailData.technicalDisclosureType" :active-value="2" active-color="#13ce66" - inactive-color="#f9f9f9" + inactive-color="#909399" disabled>
{{detailData.technicalDisclosureType == 2 ? '已完成':'未完成'}}
@@ -271,7 +286,7 @@ v-model="detailData.specialConstructionSchemeType" :active-value="2" active-color="#13ce66" - inactive-color="#f9f9f9" + inactive-color="#909399" disabled>
{{detailData.specialConstructionSchemeType == 2 ? '已完成':'未完成'}}
@@ -874,8 +889,8 @@ export default { }, created(){ this.COMPANY = COMPANY - this.headquartersSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.headquartersSn - this.projectSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.sn + this.headquartersSn = this.$store.state.userInfo.headquartersSn + this.projectSn = this.$store.state.projectSn this.fileUrl = this.$store.state.FILEURL; this.queryDetail() this.selectClassControlContentList() @@ -1012,7 +1027,8 @@ export default { recordType: type, projectSn: this.projectSn, pageNo: 1, - pageSize: 1000 + pageSize: 1000, + engineeringId: this.id } selectHiddenDangerInspectRecordApi(data).then(res=>{ console.log(res, type) diff --git a/src/views/projectFront/dangerousBigProject/dictionary.vue b/src/views/projectFront/dangerousBigProject/dictionary.vue index 460cae6a..927c9acb 100644 --- a/src/views/projectFront/dangerousBigProject/dictionary.vue +++ b/src/views/projectFront/dangerousBigProject/dictionary.vue @@ -563,16 +563,16 @@ {{$t('message.dangerousBigDictionary.cancel')}} - - + 删除绑定 {{$t('message.dangerousBigDictionary.remove')+$t('message.dangerousBigDictionary.bind')}} + > --> -

+

{{ scope.row.progressrecord.createUserName }}{{ $t('message.dangerousBigProject.record') }}{{ scope.row.progressrecord.createTime }} @@ -409,7 +409,7 @@ @back="goBack" :content="dialogTitle" class="backText" - :class="{ dark: styletype == 2 }" + :class="{ dark: styleType == 2 }" > @@ -506,8 +506,8 @@ export default { } }, mounted() { - this.projectSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.sn - this.styleType = this.styleType = this.$store.state.userInfo.styleType; + this.projectSn = this.$store.state.projectSn + this.styleType = this.$store.state.userInfo.styleType; // this.getCooperatorList() // this.getType() this.initData(); @@ -524,7 +524,7 @@ export default { this.isEdit = false this.isAdd = true // "新增" - this.dialogTitle = $t('message.dangerousBigProject.add') + this.dialogTitle = this.$t('message.dangerousBigProject.add') // this.clearData() // if(this.isDisabled){ // this.isDisabled = false @@ -569,7 +569,7 @@ export default { editData(index, val) { this.viewData(index, val) // "编辑" - this.dialogTitle = $t('message.dangerousBigProject.edit') + this.dialogTitle = this.$t('message.dangerousBigProject.edit') this.editParms = val[index] if (this.file1) { let obj = { @@ -600,7 +600,7 @@ export default { this.clearData() this.dialogFormVisible = true // "查看" - this.dialogTitle = $t('message.dangerousBigProject.view') + this.dialogTitle = this.$t('message.dangerousBigProject.view') this.isDisabled = true this.isEditDisabled = true this.addForm = { @@ -701,15 +701,15 @@ export default { addData() { if (this.addForm.name == "") { // 请输入危大工程名称 - this.$message.error($t('message.dangerousBigProject.verifyMessage1')) + this.$message.error(this.$t('message.dangerousBigProject.verifyMessage1')) return } else if (this.addForm.category == "") { // 请选择危大工程类别 - this.$message.error($t('message.dangerousBigProject.verifyMessage2')) + this.$message.error(this.$t('message.dangerousBigProject.verifyMessage2')) return } else if (this.addForm.describe == "") { // 请选择类别描述 - this.$message.error($t('message.dangerousBigProject.verifyMessage3')) + this.$message.error(this.$t('message.dangerousBigProject.verifyMessage3')) return } // console.log(this.addForm) @@ -734,17 +734,17 @@ export default { addForm: this.addForm } // "新增" - if (this.dialogTitle == $t('message.dangerousBigProject.add')) { + if (this.dialogTitle == this.$t('message.dangerousBigProject.add')) { console.log(data) data.responsibilityCompany = this.addForm.unit ? this.addForm.unit.join(',') : "" addDangerousEngineeringRecordApi(data).then((res) => { if (res.code = 200) { - this.$message.success($t('message.dangerousBigProject.add') + $t('message.dangerousBigProject.success') + "！") + this.$message.success(this.$t('message.dangerousBigProject.add') + this.$t('message.dangerousBigProject.success') + "！") this.initData() } console.log(res) }) - } else if (this.dialogTitle == $t('message.dangerousBigProject.edit')) { + } else if (this.dialogTitle == this.$t('message.dangerousBigProject.edit')) { // "编辑" data.id = this.editParms.id data.typeDescribeId = this.editParms.typeDescribeId @@ -756,7 +756,7 @@ export default { editDangerousEngineeringRecordApi(data).then((res) => { if (res.code = 200) { // "修改成功！" - this.$message.success($t('message.dangerousBigProject.editSuccess')) + this.$message.success(this.$t('message.dangerousBigProject.editSuccess')) this.initData() } console.log(res) @@ -797,7 +797,7 @@ export default { }, beforeRemove(file, fileList) { // 确定移除 - return this.$confirm($t('message.dangerousBigProject.confirmRemove') + ` ${file.name}？`); + return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + ` ${file.name}？`); }, uploadSuccess(response, file, fileList) { console.log('fileList') @@ -807,7 +807,7 @@ export default { }, uploadError(err, file, fileList) { // 上传失败！ - this.$message.error($t('message.dangerousBigProject.uploadFail')); + this.$message.error(this.$t('message.dangerousBigProject.uploadFail')); }, handleRemove2(file, fileList) { console.log(fileList); @@ -818,7 +818,7 @@ export default { }, beforeRemove2(file, fileList) { // 确定移除 - return this.$confirm($t('message.dangerousBigProject.confirmRemove') + `${file.name}？`); + return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + `${file.name}？`); }, uploadSuccess2(response, file, fileList) { console.log('fileList') @@ -828,7 +828,7 @@ export default { }, uploadError2(err, file, fileList) { // 上传失败！ - this.$message.error($t('message.dangerousBigProject.uploadFail')); + this.$message.error(this.$t('message.dangerousBigProject.uploadFail')); }, handleRemove3(file, fileList) { console.log(fileList); @@ -839,7 +839,7 @@ export default { }, beforeRemove3(file, fileList) { // 确定移除 - return this.$confirm($t('message.dangerousBigProject.confirmRemove') + `${file.name}？`); + return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + `${file.name}？`); }, uploadSuccess3(response, file, fileList) { console.log('fileList') @@ -849,7 +849,7 @@ export default { }, uploadError3(err, file, fileList) { // 上传失败！ - this.$message.error($t('message.dangerousBigProject.uploadFail')); + this.$message.error(this.$t('message.dangerousBigProject.uploadFail')); }, previewDetail(val) { console.log(val) diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue index 832558a5..0ae7cf88 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/src/views/projectFront/laborManage/personDetails.vue @@ -2758,6 +2758,14 @@ export default { } else { data.ufaceDevId = ""; } + if ( + this.workerInfo.ufaceDevGroupId && + this.workerInfo.ufaceDevGroupId.length > 0 + ) { + data.ufaceDevGroupId = this.workerInfo.ufaceDevGroupId.join(","); + } else { + data.ufaceDevGroupId = ""; + } delete data.addTime; editWorkerInfo(data).then((res) => { if (res.code == 200) { diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index c7391c49..16e92605 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -1553,7 +1553,7 @@ > { - this.personForm.uGroupId.push(item.id); + this.personForm.ufaceDevGroupId.push(item.id); }); } else { - this.personForm.uGroupId = []; + this.personForm.ufaceDevGroupId = []; } this.isIndeterminate2 = false; }, @@ -2302,7 +2302,7 @@ export default { if (res.code == 200) { this.uGroupAllList = res.result; console.log(this.uGroupAllList,777888999) - this.personForm.uGroupId = [...this.personForm.uGroupId]; + this.personForm.ufaceDevGroupId = [...this.personForm.ufaceDevGroupId]; if (this.$store.state.userInfo.accountType == 6) { this.uGroupAllList.forEach((item) => { item.disabled = true; @@ -2646,7 +2646,7 @@ export default { jobName: '', personType: 2, ufaceDevId: [], - uGroupId: [], + ufaceDevGroupId: [], personSerial: '' } if (this.attendRulesList.length > 0) { @@ -2667,6 +2667,7 @@ export default { }, 120) // 默认全选设备 this.checkAllFaceDev = true; + this.checkAllGroupDev = false; this.ufaceDevAllList.map(item => { this.personForm.ufaceDevId.push(item.id) }) @@ -2784,18 +2785,20 @@ export default { } //新增 if (!this.personForm.id) { - let data = JSON.parse(JSON.stringify(this.personForm)) + let data = {...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) { + if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) { data.ufaceDevId = this.personForm.ufaceDevId.join(',') + data.ufaceDevGroupId = ""; } else { data.ufaceDevId = '' } - if (this.personForm.uGroupId.length > 0) { - data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) { + data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(","); + data.ufaceDevId = ""; } else { data.ufaceDevGroupId = ""; } @@ -2809,16 +2812,18 @@ export default { }) //编辑 } else { - let data = this.personForm + let data = {...this.personForm} data.devType = this.typeRadio; console.log('dadadaa', data) - if (this.personForm.ufaceDevId.length > 0) { + if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) { data.ufaceDevId = this.personForm.ufaceDevId.join(',') + data.ufaceDevGroupId = ""; } else { data.ufaceDevId = '' } - if (this.personForm.uGroupId.length > 0) { - data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) { + data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(","); + data.ufaceDevId = ""; } else { data.ufaceDevGroupId = ""; } @@ -2883,7 +2888,7 @@ export default { jobName: '', personType: 2, ufaceDevId: [], - uGroupId: [], + ufaceDevGroupId: [], personSerial: '' } this.getUfaceDevList() @@ -2893,6 +2898,20 @@ export default { this.personForm.sex = Number(value.sex) this.personForm.inserviceType = type == 2 ? 1 : value.inserviceType this.personForm.longTerm = value.longTerm == 1 ? true : false + if(value.ufaceDevId){ + this.personForm.ufaceDevId = value.ufaceDevId.split(',') + this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否 + } else { + this.personForm.ufaceDevId = [] + this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否 + } + if(value.ufaceDevGroupId){ + this.personForm.ufaceDevGroupId = value.ufaceDevGroupId.split(',') + this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否 + } else { + this.personForm.ufaceDevGroupId = [] + this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否 + } if (this.personForm.ruleId == 0) { this.personForm.ruleId = '' } diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 415a5ab8..8bb3b389 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -1561,7 +1561,7 @@ > { - this.personForm.uGroupId.push(item.id); + this.personForm.ufaceDevGroupId.push(item.id); }); } else { - this.personForm.uGroupId = []; + this.personForm.ufaceDevGroupId = []; } this.isIndeterminate2 = false; }, @@ -2570,8 +2570,8 @@ export default { console.log(res); if (res.code == 200) { this.uGroupAllList = res.result; - console.log(this.uGroupAllList,777888999) - this.personForm.uGroupId = [...this.personForm.uGroupId]; + console.log(this.uGroupAllList,123456) + this.personForm.ufaceDevGroupId = [...this.personForm.ufaceDevGroupId]; if (this.$store.state.userInfo.accountType == 6) { this.uGroupAllList.forEach((item) => { item.disabled = true; @@ -3176,7 +3176,7 @@ export default { idCardUpPhotoUrl: "", idCardDownPhotoUrl: "", ufaceDevId: [], - uGroupId: [], + ufaceDevGroupId: [], personSerial: "", }; if (this.attendRulesList.length > 0) { @@ -3198,6 +3198,7 @@ export default { this.idCardDownPhotoUrlFile = []; // 身份证人像面 // 默认全选设备 this.checkAllFaceDev = true; + this.checkAllGroupDev = false; this.ufaceDevAllList.map(item => { this.personForm.ufaceDevId.push(item.id) }) @@ -3217,6 +3218,7 @@ export default { savePersonFn(formName) { this.personForm.isUploadHousing = this.personForm.isUploadHousing ? 1 : 0; console.log("进场确定参数", this.personForm); + console.log("进场确定参数", IdentityCodeValid(this.personForm.idCard)); // 身份证校验 if (!IdentityCodeValid(this.personForm.idCard)) { this.$message.error(this.$t("message.laborMange.correctCellIdCard")); @@ -3278,7 +3280,7 @@ export default { } //新增 if (!this.personForm.id) { - let data = this.personForm; + let data = {...this.personForm}; data.projectSn = this.projectSn; data.teamId = this.checkedTeamId; data.enterpriseId = this.checkedId; @@ -3291,13 +3293,15 @@ export default { } else { data.accountType = 1; } - if (this.personForm.ufaceDevId.length > 0) { + if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) { data.ufaceDevId = this.personForm.ufaceDevId.join(","); + data.ufaceDevGroupId = ""; } else { data.ufaceDevId = ""; } - if (this.personForm.uGroupId.length > 0) { - data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) { + data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(","); + data.ufaceDevId = ""; } else { data.ufaceDevGroupId = ""; } @@ -3318,28 +3322,22 @@ export default { }); //编辑 } else { - let data = this.personForm; + 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; - if (this.personForm.ufaceDevId.length > 0) { - console.log( - "this.personForm.ufaceDevId", - this.personForm.ufaceDevId - ); + if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) { data.ufaceDevId = this.personForm.ufaceDevId.join(","); + data.ufaceDevGroupId = ""; } else { data.ufaceDevId = ""; } - if (this.personForm.uGroupId.length > 0) { - console.log( - "this.personForm.uGroupId", - this.personForm.uGroupId - ); - data.ufaceDevGroupId = this.personForm.uGroupId.join(","); + if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) { + data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(","); + data.ufaceDevId = ""; } else { data.ufaceDevGroupId = ""; } @@ -3422,7 +3420,7 @@ export default { idCardUpPhotoUrl: "", idCardDownPhotoUrl: "", ufaceDevId: [], - uGroupId: [], + ufaceDevGroupId: [], personSerial: "", }; this.getUfaceDevList(); @@ -3432,6 +3430,20 @@ export default { }, 120); this.addPersonDialog = true; this.personForm = JSON.parse(JSON.stringify(value)); + if(value.ufaceDevId){ + this.personForm.ufaceDevId = value.ufaceDevId.split(',') + this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否 + } else { + this.personForm.ufaceDevId = [] + this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否 + } + if(value.ufaceDevGroupId){ + this.personForm.ufaceDevGroupId = value.ufaceDevGroupId.split(',') + this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否 + } else { + this.personForm.ufaceDevGroupId = [] + this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否 + } if (this.personForm.ruleId == 0) { this.personForm.ruleId = ""; } diff --git a/src/views/projectFront/laborManage/personnelOverview.vue b/src/views/projectFront/laborManage/personnelOverview.vue index bcad0cea..d7e86ce9 100644 --- a/src/views/projectFront/laborManage/personnelOverview.vue +++ b/src/views/projectFront/laborManage/personnelOverview.vue @@ -1158,28 +1158,30 @@ export default { radius: [60, 65], x: '0%', // for funnel data: [ - { - name: 'other', - value: this.totalPersonNum - this.totalEducationPerson, - label: { - normal: { - show: false - } - }, - labelLine: { - normal: { - show: false - } - }, - itemStyle: { - normal: { - color: '#e0e0e4' - } - } - }, + // { + // name: 'other', + // // value: this.totalPersonNum - this.totalEducationPerson, + // value: this.totalPersonNum, + // label: { + // normal: { + // show: false + // } + // }, + // labelLine: { + // normal: { + // show: false + // } + // }, + // itemStyle: { + // normal: { + // color: '#e0e0e4' + // } + // } + // }, { name: that.$t('message.POverview.numberTrainees'), - value: this.totalEducationPerson, + // value: this.totalEducationPerson, + value: this.totalPersonNum, label: { normal: { position: 'center', @@ -1244,7 +1246,8 @@ export default { }, { name: that.$t('message.POverview.untrainedNumber'), - value: this.totalPersonNum - this.totalEducationPerson, + // value: this.totalPersonNum - this.totalEducationPerson, + value: 0, label: { normal: { position: 'center', diff --git a/src/views/projectFront/safeManage/v2/checkStandingBook.vue b/src/views/projectFront/safeManage/v2/checkStandingBook.vue index edcca6de..4afae0ad 100644 --- a/src/views/projectFront/safeManage/v2/checkStandingBook.vue +++ b/src/views/projectFront/safeManage/v2/checkStandingBook.vue @@ -11,59 +11,59 @@

{{ - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.total') + - '：' + $t("message.safeMangeCheck.checked") + + $t("message.safeMangeCheck.total") + + "：" }} {{ statictisData.totalNum }}

{{ - $t('message.safeMangeCheck.alreadyClose') + - $t('message.safeMangeCheck.num') + - '：' + $t("message.safeMangeCheck.alreadyClose") + + $t("message.safeMangeCheck.num") + + "：" }} {{ statictisData.closeNum }}

{{ - $t('message.safeMangeCheck.awaitChange') + - $t('message.safeMangeCheck.num') + - '：' + $t("message.safeMangeCheck.awaitChange") + + $t("message.safeMangeCheck.num") + + "：" }} {{ statictisData.rectificationNum }}

{{ - $t('message.safeMangeCheck.awaitExamine') + - $t('message.safeMangeCheck.num') + - '：' + $t("message.safeMangeCheck.awaitExamine") + + $t("message.safeMangeCheck.num") + + "：" }} {{ statictisData.reviewNum }}

{{ - $t('message.safeMangeCheck.deleyNotClose') + - $t('message.safeMangeCheck.num') + - '：' + $t("message.safeMangeCheck.deleyNotClose") + + $t("message.safeMangeCheck.num") + + "：" }} {{ statictisData.overdueNotCloseNum }}

{{ - $t('message.safeMangeCheck.changeRate') + '：' + $t("message.safeMangeCheck.changeRate") + "：" }} {{ statictisData.completeRatio }}%

{{ - $t('message.safeMangeCheck.closeRate') + '：' + $t("message.safeMangeCheck.closeRate") + "：" }} {{ statictisData.closeRatio }}%

@@ -74,8 +74,8 @@ v-model="searchForm.status" :placeholder=" $t('message.safeMangeCheck.pleaseChoose') + - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.result') + $t('message.safeMangeCheck.checked') + + $t('message.safeMangeCheck.result') " size="medium" > @@ -105,16 +105,16 @@ {{ - $t('message.safeMangeCheck.query') + $t("message.safeMangeCheck.query") }} {{ - $t('message.safeMangeCheck.add') + $t("message.safeMangeCheck.add") }} {{ - $t('message.safeMangeCheck.out') + $t("message.safeMangeCheck.out") }} {{ - $t('message.safeMangeCheck.fresh') + $t("message.safeMangeCheck.fresh") }}
@@ -130,14 +130,14 @@ prop="id" :label=" $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.result') + $t('message.safeMangeCheck.result') " > @@ -159,7 +159,7 @@ align="center" :label=" $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.people') + $t('message.safeMangeCheck.people') " > @@ -293,7 +293,7 @@ :modal-append-to-body="false" :title=" $t('message.safeMangeCheck.dialog.look') + - $t('message.safeMangeCheck.dialog.detail') + $t('message.safeMangeCheck.dialog.detail') " :visible.sync="dialogVisible" width="867px" @@ -304,8 +304,8 @@
{{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.dialog.records') + $t("message.safeMangeCheck.hiddenDanger") + + $t("message.safeMangeCheck.dialog.records") }} {{ - $t('message.safeMangeCheck.delay') + - $t('message.safeMangeCheck.dialog.change') + $t("message.safeMangeCheck.delay") + + $t("message.safeMangeCheck.dialog.change") }}
{{ - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.result') + - '：' + $t("message.safeMangeCheck.checked") + + $t("message.safeMangeCheck.result") + + "：" }} {{ - detailData.status ? statusArr[detailData.status - 1] : '' + detailData.status ? statusArr[detailData.status - 1] : "" }}
@@ -359,9 +359,9 @@
{{ - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.people') + - '：' + $t("message.safeMangeCheck.checked") + + $t("message.safeMangeCheck.people") + + "：" }} {{ detailData.createUserName }}
@@ -369,9 +369,9 @@
{{ - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.time') + - '：' + $t("message.safeMangeCheck.checked") + + $t("message.safeMangeCheck.time") + + "：" }} {{ detailData.inspectTime }}
@@ -383,9 +383,9 @@
{{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.level') + - '：' + $t("message.safeMangeCheck.hiddenDanger") + + $t("message.safeMangeCheck.level") + + "：" }} {{ detailData.checkItem }}/{{ @@ -398,9 +398,9 @@
{{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.list') + - '：' + $t("message.safeMangeCheck.hiddenDanger") + + $t("message.safeMangeCheck.list") + + "：" }} {{ detailData.checkContent }}
@@ -411,9 +411,9 @@
{{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.level2') + - '：' + $t("message.safeMangeCheck.hiddenDanger") + + $t("message.safeMangeCheck.level2") + + "：" }} {{ detailData.hiddenDangerLevel @@ -424,8 +424,8 @@
{{ - $t('message.safeMangeCheck.dialog.allInstruction') + - '：' + $t("message.safeMangeCheck.dialog.allInstruction") + + "：" }} {{ detailData.dangerDesc }}
@@ -436,7 +436,7 @@
{{ - $t('message.safeMangeCheck.changeCompany') + '：' + $t("message.safeMangeCheck.changeCompany") + "：" }} {{ detailData.enterpriseName }}
@@ -445,7 +445,7 @@
{{ - $t('message.safeMangeCheck.changePeople') + '：' + $t("message.safeMangeCheck.changePeople") + "：" }} {{ detailData.changeUserName }}
@@ -456,9 +456,9 @@
{{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.timeLimit') + - '：' + $t("message.safeMangeCheck.dialog.change") + + $t("message.safeMangeCheck.dialog.timeLimit") + + "：" }} {{ detailData.changeLimitTime @@ -469,14 +469,14 @@
{{ - $t('message.safeMangeCheck.dialog.event') + - $t('message.safeMangeCheck.hiddenDanger') + - '：' + $t("message.safeMangeCheck.dialog.event") + + $t("message.safeMangeCheck.hiddenDanger") + + "：" }} {{ detailData.faultLevel == 1 - ? $t('message.safeMangeCheck.common') - : $t('message.safeMangeCheck.great') + ? $t("message.safeMangeCheck.common") + : $t("message.safeMangeCheck.great") }}
@@ -486,9 +486,9 @@
{{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.ask') + - '：' + $t("message.safeMangeCheck.dialog.change") + + $t("message.safeMangeCheck.dialog.ask") + + "：" }} {{ detailData.rectifyRequire }}
@@ -497,7 +497,9 @@
责任区域： - {{ detailData.hiddenDangerInspectRegionName }} + {{ + detailData.hiddenDangerInspectRegionName + }}
@@ -507,9 +509,9 @@
{{ - $t('message.safeMangeCheck.dialog.about') + - $t('message.safeMangeCheck.dialog.photo') + - '：' + $t("message.safeMangeCheck.dialog.about") + + $t("message.safeMangeCheck.dialog.photo") + + "：" }} {{ - $t('message.safeMangeCheck.dialog.change') + - '&' + - $t('message.safeMangeCheck.dialog.examin') + - $t('message.safeMangeCheck.dialog.records') + $t("message.safeMangeCheck.dialog.change") + + "&" + + $t("message.safeMangeCheck.dialog.examin") + + $t("message.safeMangeCheck.dialog.records") }} @@ -551,53 +553,53 @@ {{ item.type == 1 - ? $t('message.safeMangeCheck.changePeople') - : $t('message.safeMangeCheck.examinePeople') + ? $t("message.safeMangeCheck.changePeople") + : $t("message.safeMangeCheck.examinePeople") }}：{{ item.createUserName }}

{{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.status') + - '：' + $t("message.safeMangeCheck.dialog.change") + + $t("message.safeMangeCheck.status") + + "：" }}{{ item.status == 2 - ? $t('message.safeMangeCheck.alreadyChange') - : $t('message.safeMangeCheck.unChange') + ? $t("message.safeMangeCheck.alreadyChange") + : $t("message.safeMangeCheck.unChange") }}

{{ - $t('message.safeMangeCheck.dialog.examin') + - $t('message.safeMangeCheck.status') + - '：' + $t("message.safeMangeCheck.dialog.examin") + + $t("message.safeMangeCheck.status") + + "：" }}{{ item.status == 2 - ? $t('message.safeMangeCheck.upToStandard') - : $t('message.safeMangeCheck.not') + - $t('message.safeMangeCheck.upToStandard') + ? $t("message.safeMangeCheck.upToStandard") + : $t("message.safeMangeCheck.not") + + $t("message.safeMangeCheck.upToStandard") }}

{{ - $t('message.safeMangeCheck.dialog.about') + - $t('message.safeMangeCheck.dialog.explain') + - '：' + $t("message.safeMangeCheck.dialog.about") + + $t("message.safeMangeCheck.dialog.explain") + + "：" }}{{ item.additionalRemarks }}

{{ - $t('message.safeMangeCheck.dialog.about') + - $t('message.safeMangeCheck.dialog.photo') + - '：' + $t("message.safeMangeCheck.dialog.about") + + $t("message.safeMangeCheck.dialog.photo") + + "：" }} {{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.anser') + - '：' + $t("message.safeMangeCheck.dialog.change") + + $t("message.safeMangeCheck.dialog.anser") + + "：" }} @@ -631,12 +633,12 @@ content-position="left" v-if=" detailData.reviewId == $store.state.userInfo.userId && - detailData.status == 3 + detailData.status == 3 " >{{ - $t('message.safeMangeCheck.dialog.examin') + - $t('message.safeMangeCheck.dialog.anser') + - '：' + $t("message.safeMangeCheck.dialog.examin") + + $t("message.safeMangeCheck.dialog.anser") + + "：" }} @@ -649,11 +651,11 @@ @@ -663,8 +665,8 @@ :rows="3" :placeholder=" $t('message.safeManage.placeholder') + - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.content') + $t('message.safeMangeCheck.dialog.change') + + $t('message.safeMangeCheck.dialog.content') " v-model="replyData.additionalRemarks" > @@ -674,11 +676,11 @@ @@ -688,8 +690,8 @@ :rows="3" :placeholder=" $t('message.safeManage.placeholder') + - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.content') + $t('message.safeMangeCheck.dialog.change') + + $t('message.safeMangeCheck.dialog.content') " v-model="replyData.additionalRemarks" > @@ -700,7 +702,7 @@ :label="$t('message.safeMangeCheck.dialog.photo')" v-if=" detailData.changeUser == $store.state.userInfo.userId && - detailData.status == 2 + detailData.status == 2 " >
-
+
{{ detailData.reviewId == $store.state.userInfo.userId && detailData.status == 3 - ? $t('message.safeMangeCheck.dialog.pass') - : $t('message.safeMangeCheck.dialog.confirm') + ? $t("message.safeMangeCheck.dialog.pass") + : $t("message.safeMangeCheck.dialog.confirm") }} {{ $t('message.safeMangeCheck.dialog.back') }}{{ $t("message.safeMangeCheck.dialog.back") }} {{ - $t('message.safeMangeCheck.dialog.cancel') + $t("message.safeMangeCheck.dialog.cancel") }}
@@ -768,7 +772,7 @@ - + + v-model="formData.hiddenDangerInspectRegionId" + style="width: 100%" + clearable + ref="formRegion1" + :options="checkPointList" + :props="checkPointProps" + @change="changeRegion" + > @@ -887,7 +888,7 @@ v-if="formData.status == 2" :label=" $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.dialog.content') + $t('message.safeMangeCheck.dialog.content') " > @@ -906,8 +907,8 @@ v-if="formData.status == 2" :label=" $t('message.safeMangeCheck.dialog.event') + - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.dialog.content') + $t('message.safeMangeCheck.hiddenDanger') + + $t('message.safeMangeCheck.dialog.content') " prop="faultLevel" required @@ -933,7 +934,7 @@ v-if="formData.status == 2" :label=" $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.ask') + $t('message.safeMangeCheck.dialog.ask') " > @@ -951,13 +952,13 @@ @@ -968,8 +969,8 @@ v-if="formData.status == 2" :label=" $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.duty') + - $t('message.safeMangeCheck.people') + $t('message.safeMangeCheck.dialog.duty') + + $t('message.safeMangeCheck.people') " prop="changeUser" required @@ -1019,7 +1020,7 @@ > - + @@ -1057,10 +1058,10 @@
{{ - $t('message.safeMangeCheck.dialog.confirm') + $t("message.safeMangeCheck.dialog.confirm") }} {{ - $t('message.safeMangeCheck.dialog.cancel') + $t("message.safeMangeCheck.dialog.cancel") }}
@@ -1093,112 +1094,112 @@ import { getinspectHiddenDangerItemRecordListApi, addHiddenDangerInspectRecordApi, addHiddenDangerRectifyRecordApi, - getSafeRegionListApi -} from '@/assets/js/api/safeManage.js' -import { getSubcontractListApi } from '@/assets/js/api/quality.js' -import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage.js' + getSafeRegionListApi, +} from "@/assets/js/api/safeManage.js"; +import { getSubcontractListApi } from "@/assets/js/api/quality.js"; +import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage.js"; export default { data() { - let that = this + let that = this; return { hiddenDangerInspectRegionName: "", checkPointList: [], checkPointProps: { - value: 'id', - label: 'regionName', - children: 'children', - checkStrictly: true + value: "id", + label: "regionName", + children: "children", + checkStrictly: true, }, replyData: { - additionalRemarks: '', - fileList: [] + additionalRemarks: "", + fileList: [], }, fileList1: [], - COMPANY: '', + COMPANY: "", inspectOptions: [], inspectOptions2: [], inspectOptions3: [], - uploadUrl: '', + uploadUrl: "", formData: { - hiddenDangerInspectRegionId: '', - inspectTypeId: '', + hiddenDangerInspectRegionId: "", + inspectTypeId: "", status: 2, - checkSubitem: '', - checkSubitem2: '', - hiddenDangerLevel: '', - checkContent: '', - faultLevel: '', - rectifyRequire: '', - rectifyRequire2: '', - dutyRegion: '', - checkItem: '', - checkItem2: '', - changeUser: '', - enterpriseSn: '', - changeLimitTime: '', - inspectTime: '' + checkSubitem: "", + checkSubitem2: "", + hiddenDangerLevel: "", + checkContent: "", + faultLevel: "", + rectifyRequire: "", + rectifyRequire2: "", + dutyRegion: "", + checkItem: "", + checkItem2: "", + changeUser: "", + enterpriseSn: "", + changeLimitTime: "", + inspectTime: "", }, opts: { - value: 'id', - label: 'hiddenDangerName', + value: "id", + label: "hiddenDangerName", // children: 'children', checkStrictly: true, lazy: true, lazyLoad(node, resolve) { - console.log(node, that) + console.log(node, that); if (node.level == 0) { - resolve(that.inspectOptions3) + resolve(that.inspectOptions3); } if (node.level == 1) { getinspectHiddenDangerItemRecordListApi({ - libraryId: node.data.id + libraryId: node.data.id, }).then((res) => { - console.log(res) + console.log(res); if (res.code == 200) { - let arr = [] + let arr = []; res.result.forEach((item) => { arr.push({ id: item.id, hiddenDangerName: - item.rectifyRequire.split('').length > 50 - ? item.rectifyRequire.substring(0, 50) + '...' + item.rectifyRequire.split("").length > 50 + ? item.rectifyRequire.substring(0, 50) + "..." : item.rectifyRequire, checkSubitem: item.hiddenDangerName, checkContent: item.checkContent, val: item.rectifyRequire, hiddenDangerLevel: item.hiddenDangerLevel, - leaf: node.level >= 2 - }) - }) - resolve(arr) + leaf: node.level >= 2, + }); + }); + resolve(arr); } - }) + }); } else if (node.level == 2) { - resolve([]) + resolve([]); } - } + }, }, dialogVisible2: false, searchForm: { - status: '', - inspectStartTime: '', - inspectEndTime: '', + status: "", + inspectStartTime: "", + inspectEndTime: "", pageNo: 1, pageSize: 10, projectSn: this.$store.state.projectSn, - itemId: '' + itemId: "", }, daterange: [], // checkType:[], recordList: [], pageTotal: 0, statusArr: [ - this.$t('message.safeMangeCheck.notChange'), - this.$t('message.safeMangeCheck.awaitChange'), - this.$t('message.safeMangeCheck.awaitExamine'), - this.$t('message.safeMangeCheck.upToStandard'), - this.$t('message.safeMangeCheck.not') + - this.$t('message.safeMangeCheck.upToStandard') + this.$t("message.safeMangeCheck.notChange"), + this.$t("message.safeMangeCheck.awaitChange"), + this.$t("message.safeMangeCheck.awaitExamine"), + this.$t("message.safeMangeCheck.upToStandard"), + this.$t("message.safeMangeCheck.not") + + this.$t("message.safeMangeCheck.upToStandard"), ], dialogVisible: false, detailData: {}, @@ -1215,196 +1216,196 @@ export default { rectificationNum: 0, rectifyCompleteNum: 0, reviewNum: 0, - totalNum: 0 + totalNum: 0, }, - projectSn: '', - userInfo: '', - fileUrl: '', - crewList: '', //整改负责人 - subcontractList: '', //整改单位 + projectSn: "", + userInfo: "", + fileUrl: "", + crewList: "", //整改负责人 + subcontractList: "", //整改单位 rules: { hiddenDangerInspectRegionId: [ { // 请选择责任区域 required: true, - message:"请选择责任区域", - trigger: 'change' - } + message: "请选择责任区域", + trigger: "change", + }, ], inspectTime: [ { // 请选择检查时间 required: true, - message:"请选择检查时间", - trigger: 'change' - } + message: "请选择检查时间", + trigger: "change", + }, ], inspectTypeId: [ { // 请选择检查类型 required: true, message: - this.$t('message.safeMangeCheck.pleaseChoose') + - this.$t('message.safeMangeCheck.checked') + - this.$t('message.safeMangeCheck.type'), - trigger: 'change' - } + this.$t("message.safeMangeCheck.pleaseChoose") + + this.$t("message.safeMangeCheck.checked") + + this.$t("message.safeMangeCheck.type"), + trigger: "change", + }, ], checkItem: [ { // 请选择隐患类型 required: true, message: - this.$t('message.safeMangeCheck.pleaseChoose') + - this.$t('message.safeMangeCheck.hiddenDanger') + - this.$t('message.safeMangeCheck.type'), - trigger: 'change' - } + this.$t("message.safeMangeCheck.pleaseChoose") + + this.$t("message.safeMangeCheck.hiddenDanger") + + this.$t("message.safeMangeCheck.type"), + trigger: "change", + }, ], checkSubitem: [ { // 请选择检查项目 required: true, message: - this.$t('message.safeMangeCheck.pleaseChoose') + - this.$t('message.safeMangeCheck.checked') + - this.$t('message.safeMangeCheck.project'), - trigger: 'change' - } + this.$t("message.safeMangeCheck.pleaseChoose") + + this.$t("message.safeMangeCheck.checked") + + this.$t("message.safeMangeCheck.project"), + trigger: "change", + }, ], faultLevel: [ { // 请选择事故隐患等级 required: true, message: - this.$t('message.safeMangeCheck.pleaseChoose') + - this.$t('message.safeMangeCheck.dialog.event') + - this.$t('message.safeMangeCheck.hiddenDanger') + - this.$t('message.safeMangeCheck.level3'), - trigger: 'change' - } + this.$t("message.safeMangeCheck.pleaseChoose") + + this.$t("message.safeMangeCheck.dialog.event") + + this.$t("message.safeMangeCheck.hiddenDanger") + + this.$t("message.safeMangeCheck.level3"), + trigger: "change", + }, ], changeUser: [ { // 请选择整改责任人 required: true, message: - this.$t('message.safeMangeCheck.pleaseChoose') + - this.$t('message.safeMangeCheck.dialog.change') + - this.$t('message.safeMangeCheck.dialog.duty') + - this.$t('message.safeMangeCheck.people'), - trigger: 'change' - } - ] - } - } + this.$t("message.safeMangeCheck.pleaseChoose") + + this.$t("message.safeMangeCheck.dialog.change") + + this.$t("message.safeMangeCheck.dialog.duty") + + this.$t("message.safeMangeCheck.people"), + trigger: "change", + }, + ], + }, + }; }, created() { // console.log(this.statusArr) - this.COMPANY = COMPANY - this.projectSn = this.$store.state.projectSn - this.userInfo = this.$store.state.userInfo - this.uploadUrl = this.$store.state.UPLOADURL - this.fileUrl = this.$store.state.FILEURL - this.getInspectTypeList() - this.getinspectHiddenDangerLibraryList() - this.getEnterprise() - this.getPeopleList() - this.getPositionList() + this.COMPANY = COMPANY; + this.projectSn = this.$store.state.projectSn; + this.userInfo = this.$store.state.userInfo; + this.uploadUrl = this.$store.state.UPLOADURL; + this.fileUrl = this.$store.state.FILEURL; + this.getInspectTypeList(); + this.getinspectHiddenDangerLibraryList(); + this.getEnterprise(); + this.getPeopleList(); + this.getPositionList(); }, mounted() { if (this.$route.query.id) { - this.searchForm.itemId = this.$route.query.id + this.searchForm.itemId = this.$route.query.id; } else { - this.getStatictisData() + this.getStatictisData(); } - this.loadList() + this.loadList(); }, watch: { $route(to, from) { // console.log('watch') // console.log(from.path); //从哪来 if (this.$route.query.id) { - this.searchForm.itemId = this.$route.query.id + this.searchForm.itemId = this.$route.query.id; } else { - this.searchForm.itemId = '' - this.getStatictisData() + this.searchForm.itemId = ""; + this.getStatictisData(); } - this.loadList() - } + this.loadList(); + }, }, methods: { //获取新增弹窗-- 检查部位下拉 getPositionList() { let data = { - projectSn: this.projectSn - } + projectSn: this.projectSn, + }; getSafeRegionListApi(data).then((res) => { - console.log('责任区域级联选择器', res); + console.log("责任区域级联选择器", res); if (res.code == 200) { - this.checkPointList = res.result + this.checkPointList = res.result; } - }) + }); }, //导出 exportData() { window.location.href = this.$http.defaults.baseURL + - 'xmgl/download/exporExcelHiddenDangerInspectRecord?projectSn=' + + "xmgl/download/exporExcelHiddenDangerInspectRecord?projectSn=" + this.$store.state.projectSn + - '&status=' + + "&status=" + this.searchForm.status + - '&inspectStartTime=' + + "&inspectStartTime=" + this.searchForm.inspectStartTime + - '&inspectEndTime=' + + "&inspectEndTime=" + this.searchForm.inspectEndTime + - '&pageNo=' + + "&pageNo=" + this.searchForm.pageNo + - '&pageSize=' + + "&pageSize=" + this.searchForm.pageSize + - '&itemId=' + - this.searchForm.itemId + "&itemId=" + + this.searchForm.itemId; }, //提交 submitForm() { - this.$refs['formData'].validate((valid) => { + this.$refs["formData"].validate((valid) => { // console.log(this.formData.status); if (!valid) { - return + return; } else { - this.addHiddenDangerInspectRecord() + this.addHiddenDangerInspectRecord(); } - }) + }); // this.dialogVisible2 = false }, submitForm2() { - let data = {} + let data = {}; if ( this.detailData.changeUser == this.$store.state.userInfo.userId && this.detailData.status == 2 ) { - let arr = [] + let arr = []; this.replyData.fileList.forEach((item) => { - arr.push(item.name) - }) + arr.push(item.name); + }); data = { additionalRemarks: this.replyData.additionalRemarks, - fileUrl: arr.join(','), + fileUrl: arr.join(","), createUser: this.$store.state.userInfo.userId, inspectId: this.detailData.id, type: 1, - status: 2 - } + status: 2, + }; addHiddenDangerRectifyRecordApi(data).then((res) => { if (res.code == 200) { // 回复成功 this.$message.success( - this.$t('message.safeMangeCheck.dialog.answerSuccess') + '！' - ) - this.getRectifyRecordList(this.detailData.id) - this.loadList() + this.$t("message.safeMangeCheck.dialog.answerSuccess") + "！" + ); + this.getRectifyRecordList(this.detailData.id); + this.loadList(); } - }) + }); } else if ( this.detailData.reviewId == this.$store.state.userInfo.userId && this.detailData.status == 3 @@ -1414,27 +1415,27 @@ export default { createUser: this.$store.state.userInfo.userId, inspectId: this.detailData.id, type: 2, - status: 2 - } + status: 2, + }; addHiddenDangerRectifyRecordApi(data).then((res) => { if (res.code == 200) { this.$message.success( - this.$t('message.safeMangeCheck.dialog.answerSuccess') + '！' - ) - this.getRectifyRecordList(this.detailData.id) - this.loadList() + this.$t("message.safeMangeCheck.dialog.answerSuccess") + "！" + ); + this.getRectifyRecordList(this.detailData.id); + this.loadList(); } - }) + }); } - console.log(data) - this.dialogVisible = false + console.log(data); + this.dialogVisible = false; }, addHiddenDangerInspectRecord() { - console.log(this.fileList1) - let imgList = [] + console.log(this.fileList1); + let imgList = []; this.fileList1.forEach((item) => { - imgList.push(item.name) - }) + imgList.push(item.name); + }); let data = { inspectTime: this.formData.inspectTime, changeLimitTime: this.formData.changeLimitTime, @@ -1448,27 +1449,28 @@ export default { enterpriseSn: this.formData.enterpriseSn, faultLevel: this.formData.faultLevel, hiddenDangerLevel: this.formData.hiddenDangerLevel, - imageUrl: imgList.join(','), + imageUrl: imgList.join(","), inspectTypeId: this.formData.inspectTypeId, projectSn: this.projectSn, - recordType: this.formData.status == 1?2:1, + recordType: this.formData.status == 1 ? 2 : 1, rectifyRequire: this.formData.rectifyRequire, reviewId: this.$store.state.userInfo.userId, status: this.formData.status, - hiddenDangerInspectRegionId: this.formData.hiddenDangerInspectRegionId[0], + hiddenDangerInspectRegionId: this.formData + .hiddenDangerInspectRegionId[0], hiddenDangerInspectRegionName: this.hiddenDangerInspectRegionName, - } - console.log(data) + }; + console.log(data); addHiddenDangerInspectRecordApi(data).then((res) => { if (res.code == 200) { - console.log(res) - this.dialogVisible2 = false - this.loadList() + console.log(res); + this.dialogVisible2 = false; + this.loadList(); } - }) + }); }, closeDialog() { - this.dialogVisible2 = false + this.dialogVisible2 = false; }, closeDialog2() { if ( @@ -1480,34 +1482,34 @@ export default { createUser: this.$store.state.userInfo.userId, inspectId: this.detailData.id, type: 2, - status: 1 - } + status: 1, + }; addHiddenDangerRectifyRecordApi(data).then((res) => { if (res.code == 200) { this.$message.success( - this.$t('message.safeMangeCheck.dialog.answerSuccess') + '！' - ) - this.getRectifyRecordList(this.detailData.id) - this.loadList() + this.$t("message.safeMangeCheck.dialog.answerSuccess") + "！" + ); + this.getRectifyRecordList(this.detailData.id); + this.loadList(); } - }) + }); } - this.dialogVisible = false + this.dialogVisible = false; }, close() { this.formData = { - inspectTypeId: '', + inspectTypeId: "", status: 2, - checkSubitem: '', - checkContent: '', - faultLevel: '', - rectifyRequire: '', - dutyRegion: '', - changeUser: '', - enterpriseSn: '', - changeLimitTime: new Date() - } - this.fileList1 = [] + checkSubitem: "", + checkContent: "", + faultLevel: "", + rectifyRequire: "", + dutyRegion: "", + changeUser: "", + enterpriseSn: "", + changeLimitTime: new Date(), + }; + this.fileList1 = []; }, //整改单位 getEnterprise() { @@ -1515,75 +1517,79 @@ export default { enterpriseTypeId: this.subcontractType, pageNo: 1, pageSize: 999, - projectSn: this.projectSn - } + projectSn: this.projectSn, + }; getSubcontractListApi(data).then((res) => { if (res.code == 200) { - this.subcontractList = res.result.records - console.log(res.result.records) + this.subcontractList = res.result.records; + console.log(res.result.records); } - }) + }); }, //获取去整改人 通知人 检查人 核查人下拉 getPeopleList() { let data = { - projectSn: this.projectSn - } + projectSn: this.projectSn, + }; getProjectChilderSystemUserListApi(data).then((res) => { if (res.code == 200) { - this.crewList = res.result + this.crewList = res.result; } - }) + }); }, showSecondTree(val) { - console.log(val) + console.log(val); getinspectHiddenDangerItemRecordListApi({ libraryId: val[0] }).then( (res) => { - console.log(res) + console.log(res); if (res.code == 200) { - let arr = [] + let arr = []; res.result.forEach((item) => { arr.push({ id: item.id, - hiddenDangerName: item.rectifyRequire.substring(0, 20) - }) - }) + hiddenDangerName: item.rectifyRequire.substring(0, 20), + }); + }); // console.log(this.inspectOptions3) - let arr3 = [...this.inspectOptions3] + let arr3 = [...this.inspectOptions3]; arr3.forEach((item) => { if (item.id == val[0]) { if (item.children.length == 0) { - item.children = arr + item.children = arr; } } - }) - this.inspectOptions3 = arr3 + }); + this.inspectOptions3 = arr3; // this.$forceUpdate() - console.log(this.inspectOptions3) + console.log(this.inspectOptions3); } } - ) + ); }, handleChange(val) { - console.log(val) - console.log(this.$refs['cascaderAddr'].getCheckedNodes()[0]) - if (this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkContent) { - this.formData.checkContent = - this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkContent + console.log(val); + console.log(this.$refs["cascaderAddr"].getCheckedNodes()[0]); + if (this.$refs["cascaderAddr"].getCheckedNodes()[0].data.checkContent) { + this.formData.checkContent = this.$refs[ + "cascaderAddr" + ].getCheckedNodes()[0].data.checkContent; } - if (this.$refs['cascaderAddr'].getCheckedNodes()[0].data.val) { - this.formData.rectifyRequire = - this.$refs['cascaderAddr'].getCheckedNodes()[0].data.val + if (this.$refs["cascaderAddr"].getCheckedNodes()[0].data.val) { + this.formData.rectifyRequire = this.$refs[ + "cascaderAddr" + ].getCheckedNodes()[0].data.val; } - if (this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkSubitem) { - this.formData.checkSubitem2 = - this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkSubitem + if (this.$refs["cascaderAddr"].getCheckedNodes()[0].data.checkSubitem) { + this.formData.checkSubitem2 = this.$refs[ + "cascaderAddr" + ].getCheckedNodes()[0].data.checkSubitem; } if ( - this.$refs['cascaderAddr'].getCheckedNodes()[0].data.hiddenDangerLevel + this.$refs["cascaderAddr"].getCheckedNodes()[0].data.hiddenDangerLevel ) { - this.formData.hiddenDangerLevel = - this.$refs['cascaderAddr'].getCheckedNodes()[0].data.hiddenDangerLevel + this.formData.hiddenDangerLevel = this.$refs[ + "cascaderAddr" + ].getCheckedNodes()[0].data.hiddenDangerLevel; } // getinspectHiddenDangerItemRecordListApi({libraryId: val[0]}).then(res=>{ // console.log(res) @@ -1606,65 +1612,65 @@ export default { // }) }, checkOptions(val) { - console.log(val) + console.log(val); this.inspectOptions2.forEach((item) => { if (item.id == val) { - this.formData.checkItem2 = item.hiddenDangerName + this.formData.checkItem2 = item.hiddenDangerName; // console.log(item.hiddenDangerName); item.children.forEach((item) => { - item.children = [] - }) - this.inspectOptions3 = item.children + item.children = []; + }); + this.inspectOptions3 = item.children; } - }) + }); }, getinspectHiddenDangerLibraryList() { getinspectHiddenDangerLibraryListApi({ - sn: this.userInfo.headquartersSn + sn: this.userInfo.headquartersSn, }).then((res) => { - console.log(res.result) - this.inspectOptions2 = res.result - }) + console.log(res.result); + this.inspectOptions2 = res.result; + }); }, getInspectTypeList() { getInspectTypeListApi({ sn: this.userInfo.headquartersSn }).then( (res) => { - this.inspectOptions = res.result + this.inspectOptions = res.result; } - ) + ); }, handleRemove(file, fileList, type) { if (type == 1) { - this.replyData.fileList = fileList + this.replyData.fileList = fileList; } else { - this.fileList1 = fileList + this.fileList1 = fileList; } }, handleSuccess(file) { - console.log(file) + console.log(file); let data = { name: file.data[0].filename, - url: this.fileUrl + file.data[0].imageUrl - } - this.fileList1.push(data) + url: this.fileUrl + file.data[0].imageUrl, + }; + this.fileList1.push(data); }, handleSuccess2(file) { - console.log(file) + console.log(file); let data = { name: file.data[0].filename, - url: this.fileUrl + file.data[0].imageUrl - } - this.replyData.fileList.push(data) + url: this.fileUrl + file.data[0].imageUrl, + }; + this.replyData.fileList.push(data); }, //查看图片 handlePreview(file) { - this.dialogImageUrl = file.url - window.open(file.url) - var filename = file.name - var index1 = filename.lastIndexOf('.') - var index2 = filename.length - var type = filename.substring(index1, index2) - console.log(type) + this.dialogImageUrl = file.url; + window.open(file.url); + var filename = file.name; + var index1 = filename.lastIndexOf("."); + var index2 = filename.length; + var type = filename.substring(index1, index2); + console.log(type); // if (type == '.mp4' || type == '.mp3'){ // // }else { @@ -1673,137 +1679,138 @@ export default { }, // 添加检查记录 addData() { - this.dialogVisible2 = true + this.dialogVisible2 = true; }, //获取检查统计 getStatictisData() { getProjectInspectRecordCountApi({ - projectSn: this.searchForm.projectSn + projectSn: this.searchForm.projectSn, }).then((res) => { - this.statictisData = res.result - }) + this.statictisData = res.result; + }); }, refreshFn() { - this.searchForm.status = '' - this.daterange = [] - this.searchForm.inspectStartTime = '' - this.searchForm.inspectEndTime = '' - this.searchForm.pageNo = 1 - this.searchForm.pageSize = 10 - this.loadList() + this.searchForm.status = ""; + this.daterange = []; + this.searchForm.inspectStartTime = ""; + this.searchForm.inspectEndTime = ""; + this.searchForm.pageNo = 1; + this.searchForm.pageSize = 10; + this.loadList(); if (this.$route.query.id) { - this.searchForm.itemId = this.$route.query.id + this.searchForm.itemId = this.$route.query.id; } else { - this.getStatictisData() + this.getStatictisData(); } }, //获取整改和复查记录 getRectifyRecordList(inspectId) { getselectHiddenDangerRectifyRecordListApi({ inspectId: inspectId }).then( (res) => { - console.log(res.result) - this.rectifyRecordList = res.result + console.log(res.result); + this.rectifyRecordList = res.result; } - ) + ); }, //显示检查详细弹框 showDetailFn(row) { - console.log(row) - this.getRectifyRecordList(row.id) + console.log(row); + this.getRectifyRecordList(row.id); this.replyData = { - additionalRemarks: '', - fileList: [] - } - this.detailData = row - this.dialogVisible = true + additionalRemarks: "", + fileList: [], + }; + this.detailData = row; + this.dialogVisible = true; }, changeDate2() { if (this.daterange) { - this.searchForm.inspectStartTime = this.daterange[0] - this.searchForm.inspectEndTime = this.daterange[1] + this.searchForm.inspectStartTime = this.daterange[0]; + this.searchForm.inspectEndTime = this.daterange[1]; } else { - this.searchForm.inspectStartTime = '' - this.searchForm.inspectEndTime = '' + this.searchForm.inspectStartTime = ""; + this.searchForm.inspectEndTime = ""; } }, detailsPoint(item) {}, loadList(val) { if (val && val == 1) { - this.searchForm.pageNo = 1 + this.searchForm.pageNo = 1; } gethiddenDangerInspectRecordApi(this.searchForm).then((result) => { - console.log('表格数据', result) - this.recordList = result.result.records - this.pageTotal = result.result.total - }) + console.log("表格数据", result); + this.recordList = result.result.records; + this.pageTotal = result.result.total; + }); }, goBack() { - this.$router.back() + this.$router.back(); }, handleSizeChange(val) { - this.searchForm.pageSize = val - this.loadList() + this.searchForm.pageSize = val; + this.loadList(); }, handleCurrentChange(val) { - this.searchForm.pageNo = val - this.loadList() + this.searchForm.pageNo = val; + this.loadList(); }, parseImage2(urls) { - let arr = [] + let arr = []; if (urls) { - arr = urls.split(',') + arr = urls.split(","); } arr.forEach((element, index) => { - arr[index] = this.$store.state.FILEURL + element - }) - return arr + arr[index] = this.$store.state.FILEURL + element; + }); + return arr; }, deleteTaskFn(item) { this.$confirm( - this.$t('message.safeMangeCheck.dialog.confirmDeleteRecords'), - this.$t('message.safeMangeCheck.dialog.tip'), + this.$t("message.safeMangeCheck.dialog.confirmDeleteRecords"), + this.$t("message.safeMangeCheck.dialog.tip"), { - confirmButtonText: this.$t('message.safeMangeCheck.dialog.confirm'), - cancelButtonText: this.$t('message.safeMangeCheck.dialog.cancel'), - type: 'warning' + confirmButtonText: this.$t("message.safeMangeCheck.dialog.confirm"), + cancelButtonText: this.$t("message.safeMangeCheck.dialog.cancel"), + type: "warning", } ) .then(() => { let data = { - id: item.id - } + id: item.id, + }; deletehiddenDangerInspectRecordApi(data).then((res) => { if (res.code == 200) { - this.loadList() + this.loadList(); this.$message({ - type: 'success', + type: "success", message: - this.$t('message.safeMangeCheck.dialog.deleteSuccess') + '!' - }) - this.getStatictisData() + this.$t("message.safeMangeCheck.dialog.deleteSuccess") + "!", + }); + this.getStatictisData(); } else { - this.$message.error(res.message) + this.$message.error(res.message); } - }) + }); }) .catch(() => { this.$message({ - type: 'info', + type: "info", message: - this.$t('message.safeMangeCheck.dialog.cancelDeleteSuccess') + '!' - }) - }) + this.$t("message.safeMangeCheck.dialog.cancelDeleteSuccess") + + "!", + }); + }); }, changeRegion(val) { // console.log(val) // console.log(this.checkPointList) - let currentNode = this.$refs['formRegion1'].getCheckedNodes()[0].data - console.log(this.$refs['formRegion1'].getCheckedNodes()[0].data) - this.formData.changeUser = currentNode.dutyId - this.hiddenDangerInspectRegionName = currentNode.regionName + let currentNode = this.$refs["formRegion1"].getCheckedNodes()[0].data; + console.log(this.$refs["formRegion1"].getCheckedNodes()[0].data); + this.formData.changeUser = currentNode.dutyId; + this.hiddenDangerInspectRegionName = currentNode.regionName; }, - } -} + }, +};