diff --git a/src/api/base/crew.js b/src/api/base/crew.js index d12e961..ea5b4cb 100644 --- a/src/api/base/crew.js +++ b/src/api/base/crew.js @@ -27,7 +27,7 @@ export const addCrewApi = (data) => { /** 修改人员 */ export const editCrewApi = (data) => { - return request.put('/base/tbTeam', data) + return request.post('/base/tbTeam/edit', data) } /** 移出班组 */ @@ -36,8 +36,8 @@ export const removeCrewApi = (data) => { } /** 删除班组 */ -export const deleteCrewApi = (id) => { - return request.delete(`/base/tbTeam/${id}`) +export const deleteCrewApi = (data) => { + return request.post('/base/tbTeam/deleteById',data) } /** 删除班组 */ diff --git a/src/api/base/device.js b/src/api/base/device.js index fdc8eb2..879c163 100644 --- a/src/api/base/device.js +++ b/src/api/base/device.js @@ -38,10 +38,10 @@ export const addDeviceApi = (data) => { /** 修改设备 */ export const editDeviceApi = (data) => { - return request.put('/base/tbDevice', data) + return request.post('/base/tbDevice/edit', data) } /** 删除设备 */ -export const deleteDeviceApi = (id) => { - return request.delete(`/base/tbDevice/${id}`) +export const deleteDeviceApi = (data) => { + return request.post('/base/tbDevice/deleteById',data) } diff --git a/src/api/base/insert.js b/src/api/base/insert.js index 6ced9b3..8e56ee9 100644 --- a/src/api/base/insert.js +++ b/src/api/base/insert.js @@ -45,7 +45,7 @@ export const addEdgeDeviceApi = (data) => { /** 修改边代设备 */ export const editEdgeDeviceApi = (data) => { - return request.put('/base/tbBdRecord', data) + return request.post('/base/tbBdRecord/edit', data) } /** 根据id查询边代设备 */ @@ -54,8 +54,8 @@ export const queryEdgeDeviceByIdApi = (id) => { } /** 删除边代设备 */ -export const deleteEdgeDeviceApi = (id) => { - return request.delete(`/base/tbBdRecord/${id}`) +export const deleteEdgeDeviceApi = (data) => { + return request.post('/base/tbBdRecord/deleteById',data) } /** 同意审核 */ diff --git a/src/api/base/person.js b/src/api/base/person.js index 26f9951..e7b7bd3 100644 --- a/src/api/base/person.js +++ b/src/api/base/person.js @@ -17,12 +17,12 @@ export const addPersonApi = (data) => { /** 修改人员 */ export const editPersonApi = (data) => { - return request.put('/base/tbPeople', data) + return request.post('/base/tbPeople/edit', data) } /** 删除人员 */ -export const deletePersonApi = (id) => { - return request.delete(`/base/tbPeople/${id}`) +export const deletePersonApi = (data) => { + return request.post('/base/tbPeople/deleteById',data) } /** 人员信息查询 */ diff --git a/src/api/base/proj.js b/src/api/base/proj.js index 39c0e09..56c551a 100644 --- a/src/api/base/proj.js +++ b/src/api/base/proj.js @@ -64,22 +64,22 @@ export const addTowerApi = (data) => { /** 修改工程 */ export const editProjApi = (data) => { - return request.put('/base/tbProject', data) + return request.post('/base/tbProject/edit', data) } /** 修改杆塔 */ export const editTowerApi = (data) => { - return request.put('/base/tbProPower', data) + return request.post('/base/tbProPower/edit', data) } /** 删除工程 */ -export const deleteProjApi = (id) => { - return request.delete(`/base/tbProject/${id}`) +export const deleteProjApi = (data) => { + return request.post('/base/tbProject/deleteById',data) } /** 删除杆塔 */ -export const deleteTowerApi = (id) => { - return request.delete(`/base/tbProPower/${id}`) +export const deleteTowerApi = (data) => { + return request.post('/base/tbProPower/deleteById',data) } /** 文件上传 */ diff --git a/src/api/base/projDept.js b/src/api/base/projDept.js index b1b2f65..7df8ad3 100644 --- a/src/api/base/projDept.js +++ b/src/api/base/projDept.js @@ -38,10 +38,10 @@ export const addProjDeptApi = (data) => { /** 修改项目部 */ export const editProjDeptApi = (data) => { - return request.put('/base/tbProDepart', data) + return request.post('/base/tbProDepart/edit', data) } /** 删除项目部 */ -export const deleteProjDeptApi = (id) => { - return request.delete(`/base/tbProDepart/${id}`) +export const deleteProjDeptApi = (data) => { + return request.post('/base/tbProDepart/deleteById',data) } diff --git a/src/api/base/warning.js b/src/api/base/warning.js index 963f273..b87ac04 100644 --- a/src/api/base/warning.js +++ b/src/api/base/warning.js @@ -45,10 +45,10 @@ export const addWarningApi = (data) => { /** 修改预警 */ export const editWarningApi = (data) => { - return request.put('/base/tbWarnConfig', data) + return request.post('/base/tbWarnConfig/edit', data) } /** 删除预警 */ -export const deleteWarningApi = (id) => { - return request.delete(`/base/tbWarnConfig/${id}`) +export const deleteWarningApi = (data) => { + return request.post('/base/tbWarnConfig/deleteById',data) } diff --git a/src/components/TableModelThree/index.vue b/src/components/TableModelThree/index.vue new file mode 100644 index 0000000..4b14826 --- /dev/null +++ b/src/components/TableModelThree/index.vue @@ -0,0 +1,560 @@ + + + + + diff --git a/src/components/TableModelTwo/index.vue b/src/components/TableModelTwo/index.vue index 49e55b5..e4c4060 100644 --- a/src/components/TableModelTwo/index.vue +++ b/src/components/TableModelTwo/index.vue @@ -196,12 +196,12 @@ - + /> --> diff --git a/src/main.js b/src/main.js index 143c294..1c8aa28 100644 --- a/src/main.js +++ b/src/main.js @@ -41,6 +41,8 @@ import DictData from '@/components/DictData' import TableModel from '@/components/TableModel' import TableModelTwo from '@/components/TableModelTwo' + +import TableModelThree from '@/components/TableModelThree' // 弹框组件 import DialogModel from '@/components/DialogModel' @@ -67,6 +69,7 @@ Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) Vue.component('TableModel', TableModel) Vue.component('TableModelTwo', TableModelTwo) +Vue.component('TableModelThree', TableModelThree) Vue.component('DialogModel', DialogModel) Vue.use(directive) diff --git a/src/views/base/crew/index.vue b/src/views/base/crew/index.vue index 646ceee..ca6a45a 100644 --- a/src/views/base/crew/index.vue +++ b/src/views/base/crew/index.vue @@ -36,7 +36,7 @@ 解散 diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue index ba8c90f..6cb6479 100644 --- a/src/views/base/device/index.vue +++ b/src/views/base/device/index.vue @@ -35,7 +35,7 @@ 删除 diff --git a/src/views/base/edgeDeviceManage/index.vue b/src/views/base/edgeDeviceManage/index.vue index bc7a495..fdbe4f7 100644 --- a/src/views/base/edgeDeviceManage/index.vue +++ b/src/views/base/edgeDeviceManage/index.vue @@ -209,6 +209,7 @@ export default { if (res.code === 200) { this.$message.success('绑定成功!') this.bindVisible = false + this.getList(); this.$refs.tableRef.getTableList() } } diff --git a/src/views/base/edgeInsert/components/form-insert.vue b/src/views/base/edgeInsert/components/form-insert.vue index 81fb416..649c2e2 100644 --- a/src/views/base/edgeInsert/components/form-insert.vue +++ b/src/views/base/edgeInsert/components/form-insert.vue @@ -79,7 +79,7 @@ - - +
确认 diff --git a/src/views/base/edgeInsert/index.vue b/src/views/base/edgeInsert/index.vue index b6e012c..456e020 100644 --- a/src/views/base/edgeInsert/index.vue +++ b/src/views/base/edgeInsert/index.vue @@ -55,7 +55,7 @@ type="danger" size="mini" v-if="data.auditStatus === 2" - @click="handleDeleteData(data.id, deleteEdgeDeviceApi)" + @click="handleDeleteData({'id':data.id}, deleteEdgeDeviceApi)" >删除 diff --git a/src/views/base/person/index.vue b/src/views/base/person/index.vue index db47de0..2c7f1a0 100644 --- a/src/views/base/person/index.vue +++ b/src/views/base/person/index.vue @@ -62,7 +62,7 @@ 删除 diff --git a/src/views/base/proj/components/table-tower.vue b/src/views/base/proj/components/table-tower.vue index 8f300c3..53cac99 100644 --- a/src/views/base/proj/components/table-tower.vue +++ b/src/views/base/proj/components/table-tower.vue @@ -64,7 +64,7 @@ 删除 diff --git a/src/views/base/proj/index.vue b/src/views/base/proj/index.vue index 01fb183..e07843b 100644 --- a/src/views/base/proj/index.vue +++ b/src/views/base/proj/index.vue @@ -35,7 +35,7 @@ 删除 diff --git a/src/views/base/projDept/index.vue b/src/views/base/projDept/index.vue index 0209d24..68379ec 100644 --- a/src/views/base/projDept/index.vue +++ b/src/views/base/projDept/index.vue @@ -35,7 +35,7 @@ 删除 diff --git a/src/views/base/warning/index.vue b/src/views/base/warning/index.vue index b4d52bf..89d8a2c 100644 --- a/src/views/base/warning/index.vue +++ b/src/views/base/warning/index.vue @@ -42,7 +42,7 @@ 删除