diff --git a/src/store/index.js b/src/store/index.js index 91bda8df..3de891fa 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -76,16 +76,16 @@ export default new Vuex.Store({ // FILEURL: 'http://8.136.222.164:8808/image/', // 中科安信 // UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色 // FILEURL: 'http://101.43.164.214:11111/image/', // 百色 - // WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色 + WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', - UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 - FILEURL: "http://192.168.34.155:19111/image/", //洁本地 + // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "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:19112/upload/image/', // 郭圣雄本地 // FILEURL: 'http://192.168.34.221:19112/image/', //郭圣雄本地 - WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.129:5174/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) diff --git a/src/views/projectFront/quality/businessModule/checkPoint.vue b/src/views/projectFront/quality/businessModule/checkPoint.vue index f0090946..a6517d3a 100644 --- a/src/views/projectFront/quality/businessModule/checkPoint.vue +++ b/src/views/projectFront/quality/businessModule/checkPoint.vue @@ -273,6 +273,23 @@ + + + + + + @@ -318,6 +335,9 @@ import { deleteBatchQualityRegionListApi, getQualityRegionTreePageApi, } from "@/assets/js/api/quality.js"; +import { + ufaceDevList +} from "@/assets/js/api/laborPerson"; import { getProjectChilderSystemUserListApi, getEnterpriseInfoListApi, @@ -339,6 +359,8 @@ export default { regionName: "", dutyId: "", aiDeviceId: "", + ufaceDevIds: [], + ufaceDevList: [], personId: null, intendanceIds: [], intendanceNames: "", @@ -377,6 +399,7 @@ export default { regionName: "", }, total: 0, + allUfaceDev: [] }; }, created() { @@ -384,6 +407,7 @@ export default { this.getQualityRegionList(); this.getUpdateUnitListFn(); this.getAIDeviceFn(); + this.getMachineList(); }, methods: { handleQuery() { @@ -433,6 +457,12 @@ export default { if (item.children instanceof Array && item.children.length > 0) { this.toggleSelectionAll(item.children, isExpandAll); } + }) + }, + //获取所有的闸机设备 + getMachineList() { + ufaceDevList({ projectSn: this.$store.state.projectSn }).then((list) => { + this.allUfaceDev = list.result; }); }, // 获取AI设备 @@ -471,6 +501,8 @@ export default { dutyId: [], personId: [], aiDeviceId: "", + ufaceDevIds: [], + ufaceDevList: [], intendanceIds: [], intendanceNames: "", remark: "", @@ -548,6 +580,13 @@ export default { } else { this.form.aiDeviceId = []; } + if (value.ufaceDevList && value.ufaceDevList.length > 0) { + this.form.ufaceDevIds = value.ufaceDevList.map((item) => { + return item.id; + }); + } else { + this.form.ufaceDevIds = [] + } this.form.remark = value.remark; this.form.id = value.id; this.title = "编辑区域"; @@ -564,6 +603,8 @@ export default { regionName: "", dutyId: "", aiDeviceId: "", + ufaceDevIds: [], + ufaceDevList: [], intendanceIds: [], intendanceNames: "", remark: "", @@ -640,6 +681,11 @@ export default { return { id: item }; }); } + if (this.form.ufaceDevIds && this.form.ufaceDevIds.length > 0) { + data.ufaceDevList = this.form.ufaceDevIds.map((item) => { + return { id: item }; + }); + } if (this.form.dutyId && this.form.dutyId.length > 0) { data.enterpriseInfos = this.form.dutyId.map((item) => { return { id: item };