diff --git a/src/store/index.js b/src/store/index.js index a39de886..609672d1 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -60,11 +60,11 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 - // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 - // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 + UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 + FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - // WORKFLOWURL: "http://192.168.34.131:88/#/workspace/forms", //罗峰工作流地址(本地) + WORKFLOWURL: "http://192.168.34.133:88/#/workspace/forms", //罗峰工作流地址(本地) CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.131:88/#/workspace/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 @@ -79,9 +79,9 @@ export default new Vuex.Store({ // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 - UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工 - FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工 - WORKFLOWURL: 'http://jxj.zhgdyun.com:18003/#/workspace/forms', //包头化工工作流地址 + // UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工 + // FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工 + // WORKFLOWURL: 'http://jxj.zhgdyun.com:18003/#/workspace/forms', //包头化工工作流地址 // BASEURL: baseUrl // ? baseUrl // : window.location.protocol + "//" + window.location.host + "/", //正式环境 diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index 6069d073..8e67ed1f 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -346,6 +346,68 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

违章人员：{{ personList.find(ele => ele.id == item.violatorId).workerName }} + >{{ + personList + .filter(ele => item.violatorId.includes(ele.id)) + .map(ele => ele.workerName) + .join('、') + }}

整改状态：{{ item.status == 2 ? '已整改' : '未整改' }} @@ -1714,6 +1781,7 @@ import { backSafeRectifyRecordListApi } from '@/assets/js/api/quality.js'; import { getProjectChilderSystemUserListApi, getEnterpriseInfoListApi, getLaborManagementInfoListApi } from '@/assets/js/api/configManage.js'; +import { getDeviceUnitPage, getProjectGroupPage, getProjectGroupEnterpriseList } from '@/assets/js/api/project'; import { VueCropper } from 'vue-cropper'; import { getSubdivisionProjectApi //所有分部分项工程， 以父子节点形式呈现 @@ -1778,6 +1846,12 @@ export default { addDialog: false, addTitle: this.$t('message.quality.new') + this.$t('message.quality.inspectionRecord'), addForm1: { + deviceUnitId: '', + projectGroupId: '', + supervisingUnitId: '', + epcContractorId: '', + constructionUnitId: '', + regionId: '', regionName: '', dangerItemContent: '', @@ -1876,7 +1950,15 @@ export default { videoName: '', unitEnterpriseId: '', unitRegionId: '', - enterpriseList: [] + enterpriseList: [], + + deviceUnitList: [], // 装置列表 + enterpriseTypeList: [], // 项目组 + cooperatorList: [], // 所有企业信息 + projectGroupUnitList: [], // 项目组下的所有承包商 + supervisingUnitList: [], // 当前项目组下的监理单位 + epcContractorList: [], // 当前项目组下的承包商 + constructionUnitList: [] // 当前epc承包商下的施工承包商 }; }, created() { @@ -1891,53 +1973,92 @@ export default { this.getPositionList(); this.getDescribeClassifyList(); this.getUpdateUnitListFn(); - }, - computed: { - isJSON() { - return function (str) { - if (typeof str == 'string') { - try { - var obj = JSON.parse(str); - if (typeof obj == 'object' && obj) { - return true; - } else { - return false; - } - } catch (e) { - return false; - } - } - }; - } - }, - watch: { - 'addForm1.regionId': { - handler(newVal) { - console.log(newVal); - if (newVal.length == 0) { - this.addForm1.reviewId = ''; // 先清空复查人 - this.reviewList = []; - } else { - this.getReviewPeopleList(newVal); - } - // this.addForm1.reviewId = "" - }, - deep: true - }, - 'addForm2.regionId': { - handler(newVal) { - if (newVal.length == 0) { - this.reviewList = []; - } else { - this.getReviewPeopleList(newVal); - } - // this.addForm2.reviewId = "" - }, - deep: true - } + this.getDeviceUnitList(); + this.getCooperatorList(); }, mounted() {}, methods: { + getDeviceUnitList() { + let param = { + projectSn: this.$store.state.projectSn, + pageNo: 1, + pageSize: -1 + }; + getDeviceUnitPage(param).then(res => { + this.deviceUnitList = res.result.records; + }); + }, + // 项目组承包商信息 + projectGroupFn(type) { + if (type != 2) { + this.addForm1.epcContractorId = ''; + this.addForm1.constructionUnitId = ''; + this.addForm1.supervisingUnitId = ''; + } + getProjectGroupEnterpriseList({ + projectGroupIds: this.addForm1.projectGroupId, + deviceUnitId: this.addForm1.deviceUnitId, + projectSn: this.$store.state.projectSn + }).then(res => { + if (res.code == 200) { + // this.projectGroupUnitList = res.result.projectGroupUnitList; + this.supervisingUnitList = res.result.supervisingUnitIds.reduce((prev, item) => { + const find = this.cooperatorList.find(ele => ele.id == item); + if (find) { + prev.push(find); + } + return prev; + }, []); + this.epcContractorList = res.result.epcContractorIds.reduce((prev, item) => { + const find = this.cooperatorList.find(ele => ele.id == item); + if (find) { + prev.push(find); + } + return prev; + }, []); + this.constructionUnitList = res.result.constructionUnitIds.reduce((prev, item) => { + const find = this.cooperatorList.find(ele => ele.id == item); + if (find) { + prev.push(find); + } + return prev; + }, []); + console.log(1111, this.epcContractorList, this.constructionUnitList); + // if(type == 2) { + // this.epcContractorFn(2); + // } + } + }); + }, + deviceUnitListFn() { + const find = this.deviceUnitList.find(item => item.id == this.addForm1.deviceUnitId); + if (find) { + this.projectGroupListFn(find.projectGroupIds); + } + }, + projectGroupListFn(projectGroupIds) { + getProjectGroupPage({ + projectSn: this.$store.state.projectSn, + pageNo: 1, + pageSize: -1 + }).then(res => { + this.enterpriseTypeList = res.result.records.filter(item => (projectGroupIds ? projectGroupIds.includes(item.id) : true)); + }); + }, + //获取列表数据 + getCooperatorList() { + let data = { + projectSn: this.$store.state.projectSn, + pageNo: 1, + pageSize: -1 + // enterpriseTypeId: this.enterpriseTypeSelectId, + }; + getCooperatorListApi(data).then(res => { + if (res.code == 200) { + this.cooperatorList = res.result.records; + } + }); + }, //获取人员列表 getViolationList() { let data = { @@ -3441,6 +3562,50 @@ export default { submit() {}, handleExceed() {} + }, + computed: { + isJSON() { + return function (str) { + if (typeof str == 'string') { + try { + var obj = JSON.parse(str); + if (typeof obj == 'object' && obj) { + return true; + } else { + return false; + } + } catch (e) { + return false; + } + } + }; + } + }, + watch: { + 'addForm1.regionId': { + handler(newVal) { + console.log(newVal); + if (newVal.length == 0) { + this.addForm1.reviewId = ''; // 先清空复查人 + this.reviewList = []; + } else { + this.getReviewPeopleList(newVal); + } + // this.addForm1.reviewId = "" + }, + deep: true + }, + 'addForm2.regionId': { + handler(newVal) { + if (newVal.length == 0) { + this.reviewList = []; + } else { + this.getReviewPeopleList(newVal); + } + // this.addForm2.reviewId = "" + }, + deep: true + } } }; diff --git a/src/views/projectFront/scheduleManage/projectMasterPlan.vue b/src/views/projectFront/scheduleManage/projectMasterPlan.vue index b0a24e60..9ee02d4b 100644 --- a/src/views/projectFront/scheduleManage/projectMasterPlan.vue +++ b/src/views/projectFront/scheduleManage/projectMasterPlan.vue @@ -1,21 +1,9 @@