diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue index 25638f0c0..d99ea2f25 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue @@ -47,7 +47,7 @@ = 8000) { this.$message.error(msg); } @@ -301,7 +298,7 @@ export default { }, // 地图初始化函数,本例取名为init,开发者可根据实际情况定义 initMap() { let { latitude, longitude } = this.$store.state.user; - + if (this.formData.latitude && this.formData.longitude) { latitude = this.formData.latitude; longitude = this.formData.longitude; @@ -310,7 +307,7 @@ export default { latitude = 39.9088810666821; longitude = 116.39743841556731; } - + this.$nextTick(() => { map = new daiMap( document.getElementById('app_event'), @@ -325,7 +322,7 @@ export default { map.on('dragend', e => { this.handleMoveCenter(e); }); - + map.setCenter(latitude, longitude); if (this.formData.latitude) { map.setMarker(latitude, longitude); @@ -357,7 +354,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.name}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue index 52359d082..0538b2db5 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue @@ -382,8 +382,9 @@ export default { }, async del(row) { - const url = `/actual/base/safetyEquipmentInspectRecord/delete/${this.id}`; - const { data, code, msg } = await requestPost(url); + let arr=[row.id] + const url = `/actual/base/safetyEquipmentInspectRecord/delete`; + const { data, code, msg } = await requestPost(url,arr); if (code === 0) { this.$message.success('删除成功'); diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue index 21a2eabea..739841898 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue @@ -132,7 +132,7 @@ 确 定 - +
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue index 349e08457..90eae254b 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue @@ -106,7 +106,7 @@ export default { isEdit: false, tableData: [], tempRow: {}, - + optionResult: [ { label: '待处理', @@ -250,22 +250,17 @@ export default { const item = { isEdit: true, - id: this.id, - inspectTime: '', - inspectStaffId: '', - inspectStaffName: '', - inspectStaffMobile: '', - inspectResult: '', - imgList: [], - nextInspectTime: '' + hiddenDangerRecordId: this.id, + remark: '', + handleState: '', + handleTime: '' }; - this.computeImgShowList(item); + // this.computeImgShowList(item); this.tableData.push(item); }, async save(row) { const params = { - hiddenDangerRecordId: this.id, ...row }; const url = `/actual/base/hiddenDangerRecord/saveProcess`; @@ -298,8 +293,9 @@ export default { }, async del(row) { - const url = `/actual/base/hiddenDangerRecord/deleteProcess/${row.hiddenDangerRecordId}`; - const { data, code, msg } = await requestPost(url); + const url = `/actual/base/hiddenDangerRecord/deleteProcess`; + let arr=[row.id] + const { data, code, msg } = await requestPost(url,arr); if (code === 0) { this.$message.success('删除成功'); @@ -311,14 +307,16 @@ export default { async getList() { const params = { - hiddenDangerRecordId: this.id + hiddenDangerRecordId: this.id, + pageNo: 1, + pageSize: 10000 }; const url = `/actual/base/hiddenDangerRecord/queryProcess`; const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.tableData = data.list.map(item => { - this.computeImgShowList(item); + // this.computeImgShowList(item); return { ...item, isEdit: false