diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue index 92c0f3115..059207b81 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue @@ -266,7 +266,8 @@ export default { }, async del(id) { const url = '/actual/base/hiddenDangerRecord/delete'; - const { data, code, msg } = await requestPost(url, id); + let idArr=[id] + const { data, code, msg } = await requestPost(url, idArr); if (code === 0) { this.$message.success('删除成功！'); this.getTableData(); diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue index 5cbee9000..bae7c23a4 100644 --- a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue +++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue @@ -276,7 +276,8 @@ export default { }, async del(id) { const url = '/actual/base/cityManagement/delete'; - const { data, code, msg } = await requestPost(url, id); + let idArr=[id] + const { data, code, msg } = await requestPost(url, idArr); if (code === 0) { this.$message.success('删除成功！'); this.getTableData(); diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue index 7f9bec0ba..1c3768974 100644 --- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue @@ -201,14 +201,13 @@ export default { }, //场所类型 async loadplaceType() { - const url = '/gov/org/coverage/dict-select-list/enterprise_patrol'; + const url = '/sys/dict/data/dictlist'; let params = { - // agencyId: this.agencyId, - // purpose: 'query' + dict_type: 'common_service_equipment_category' }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { - this.placeTypeList = data; + this.equipmentCategoryCodeArray = data; } else { this.$message.error(msg); } diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue index 4bedef63c..179f7575a 100644 --- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue +++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue @@ -15,7 +15,6 @@ - @@ -72,8 +71,10 @@ @@ -135,7 +136,7 @@ export default { placeTypeList: [], //场所类型 tableData: [], resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }], - equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }], + equipmentCategoryCodeArray: [], pageNo: 1, pageSize: window.localStorage.getItem('pageSize') || 20, total: 1, @@ -157,7 +158,7 @@ export default { mounted() { this.user = this.$store.state.user; this.agencyId = this.user.agencyId; - console.log("this.agencyId",this.agencyId) + console.log('this.agencyId', this.agencyId); this.loadGrid(); this.loadplaceType(); this.getTableData(); @@ -189,14 +190,14 @@ export default { }, //场所类型 async loadplaceType() { - const url = '/gov/org/coverage/dict-select-list/enterprise_patrol'; + const url = '/sys/dict/data/dictlist'; let params = { - // agencyId: this.agencyId, - // purpose: 'query' + dict_type: 'common_service_equipment_category' }; + const { data, code, msg } = await requestPost(url, params); if (code === 0) { - this.placeTypeList = data; + this.equipmentCategoryCodeArray = data; } else { this.$message.error(msg); } @@ -239,7 +240,7 @@ export default { }); }, handleAdd(row, type) { - console.log(row) + console.log(row); if (row.id) { this.detailId = row.id; } @@ -279,7 +280,8 @@ export default { }, async del(id) { const url = '/actual/base/commonServiceEquipment/delete'; - const { data, code, msg } = await requestPost(url, id); + let idArr=[id] + const { data, code, msg } = await requestPost(url, idArr); if (code === 0) { this.$message.success('删除成功！'); this.getTableData(); diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue index 48a185fe3..e54ad5e01 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue @@ -12,7 +12,7 @@ - + @@ -146,7 +146,7 @@ export default { dataRule: { name: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }], category: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }], - + location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }] // content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }] }, @@ -191,10 +191,9 @@ export default { }, //场所类型 async loadplaceType() { - const url = '/gov/org/coverage/dict-select-list/enterprise_patrol'; + const url = '/sys/dict/data/dictlist'; let params = { - // agencyId: this.agencyId, - // purpose: 'query' + dict_type: 'emergency_site_type' }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { @@ -258,7 +257,7 @@ export default { if (code === 0) { this.$message.success('添加成功'); this.resetData(); - this.$emit('handleComfirm'); + this.handleCancle(); } else if (code >= 8000) { this.$message.error(msg); } diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue index d22b7d855..daf7c0c15 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/index.vue @@ -110,15 +110,10 @@ export default { user: '', agencyId: '', formData: { - equipmentName: '', - gridId: '', - equipmentCategoryCode: '', - placeType: '', - result: '', - scaleTotal: '', - contactNum: '', + name: '', + category: '', address: '', - principalName: '' + }, pageType: 'list', // 列表list 新增add 处理dispose 详情info gridList: [], //所属网格list--场所区域 @@ -268,7 +263,8 @@ export default { }, async del(id) { const url = '/actual/base/emergencySites/delete'; - const { data, code, msg } = await requestPost(url, id); + let idArr=[id] + const { data, code, msg } = await requestPost(url, idArr); if (code === 0) { this.$message.success('删除成功！'); this.getTableData(); @@ -307,15 +303,9 @@ export default { }, resetSearch() { this.formData = { - equipmentName: '', - gridId: '', - equipmentCategoryCode: '', - placeType: '', - result: '', - scaleTotal: '', - contactNum: '', + name: '', + category: '', address: '', - principalName: '' }; this.pageNo = 1; this.getTableData(); diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue index 1567f1cd2..4ef05e105 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue @@ -216,7 +216,7 @@ export default { const url = '/sys/dict/data/dictlist'; let params = { dict_type: 'emergency_site_type' - + // purpose: 'query' }; const { data, code, msg } = await requestPost(url, params); @@ -227,7 +227,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/safetyEquipment/detail/${this.detailId}`; + const url = `/actual/base/emergencyEquipment/detail/${this.detailId}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); @@ -281,7 +281,7 @@ export default { if (code === 0) { this.$message.success('添加成功'); this.resetData(); - this.$emit('handleComfirm'); + this.handleCancle(); } else if (code >= 8000) { this.$message.error(msg); } diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue index 38955542b..3ce92e052 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/index.vue @@ -261,8 +261,8 @@ export default { }); }, handleAdd(row, type) { - if (row.equipmentId) { - this.detailId = row.equipmentId; + if (row.id) { + this.detailId = row.id; } this.pageType = type; if (type == 'view') { @@ -294,13 +294,14 @@ export default { type: 'warning' }) .then(() => { - this.del(rowData.equipmentId); + this.del(rowData.id); }) .catch(err => {}); }, async del(id) { const url = '/actual/base/emergencyEquipment/delete'; - const { data, code, msg } = await requestPost(url, id); + let idArr=[id] + const { data, code, msg } = await requestPost(url, idArr); if (code === 0) { this.$message.success('删除成功！'); this.getTableData();