diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
index dae1056..c98a3e9 100644
--- a/src/api/alarm/dangerAssessment/manage.ts
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -21,6 +21,15 @@
})
}
+// 删除
+export function delDangerAssessmentManage(data: { id: string }) {
+ return request({
+ url: 'risk/delete',
+ method: 'get',
+ params: data,
+ })
+}
+
// 新增
export function addDangerAssessmentManage(data: object) {
return request({
@@ -42,7 +51,7 @@
// 批量导入
export function batchImport(data: object) {
return request({
- url: 'risk/batchImport',
+ url: 'risk/import',
method: 'post',
data,
})
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
index dae1056..c98a3e9 100644
--- a/src/api/alarm/dangerAssessment/manage.ts
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -21,6 +21,15 @@
})
}
+// 删除
+export function delDangerAssessmentManage(data: { id: string }) {
+ return request({
+ url: 'risk/delete',
+ method: 'get',
+ params: data,
+ })
+}
+
// 新增
export function addDangerAssessmentManage(data: object) {
return request({
@@ -42,7 +51,7 @@
// 批量导入
export function batchImport(data: object) {
return request({
- url: 'risk/batchImport',
+ url: 'risk/import',
method: 'post',
data,
})
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
index db4b29f..a86a3a2 100644
--- a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -1,4 +1,4 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/alarm/dangerAssessment/manage.ts b/src/api/alarm/dangerAssessment/manage.ts
index dae1056..c98a3e9 100644
--- a/src/api/alarm/dangerAssessment/manage.ts
+++ b/src/api/alarm/dangerAssessment/manage.ts
@@ -21,6 +21,15 @@
})
}
+// 删除
+export function delDangerAssessmentManage(data: { id: string }) {
+ return request({
+ url: 'risk/delete',
+ method: 'get',
+ params: data,
+ })
+}
+
// 新增
export function addDangerAssessmentManage(data: object) {
return request({
@@ -42,7 +51,7 @@
// 批量导入
export function batchImport(data: object) {
return request({
- url: 'risk/batchImport',
+ url: 'risk/import',
method: 'post',
data,
})
diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
index db4b29f..a86a3a2 100644
--- a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue
@@ -1,4 +1,4 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 3e27450..3a0e5b6 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -7,12 +7,11 @@
// import EditDialog from './editDialog.vue'
import editPointDialog from './editPointDialog.vue'
import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { uploadApi } from '@/api/monitor/dev'
import { getDictByCode } from '@/api/system/dict'
import ButtonBox from '@/components/buttonBox/buttonBox.vue'
import type { IMenu } from '@/components/buttonBox/buttonBox'
import type { dictType } from '@/global'
-import { getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
+import { batchImport, delDangerAssessmentManage, getDangerAssessmentManageList } from '@/api/alarm/dangerAssessment/manage'
const { proxy } = getCurrentInstance() as any
const editDialogRef = ref() // 组件
const router = useRouter()
@@ -113,9 +112,8 @@
}
// -----------------------------------文件上传-------------------------------------------
// 点击批量导入
-const batchImport = () => {
- ElMessage.info('敬请期待')
- // fileRef.value.click()
+const handleBatchImport = () => {
+ fileRef.value.click()
}
// 模板下载
@@ -131,7 +129,7 @@
// 创建formdata对象
const fd = new FormData()
fd.append('file', event.target.files[0])
- uploadApi(fd).then((res: any) => {
+ batchImport(fd).then((res: any) => {
if (res.code === 200) {
ElMessage.success('上传成功')
event.target.value = null
@@ -183,7 +181,7 @@
const add = (row: IList) => {
switch (active.value) {
case '1': // 危险点
- editPointDialogRef.value.initDialog('add')
+ editPointDialogRef.value.initDialog('add', active.value)
break
case '2': // 重大危险源
break
@@ -200,7 +198,7 @@
const detail = (row: IList) => {
switch (active.value) {
case '1': // 危险点
- editPointDialogRef.value.initDialog('detail', row)
+ editPointDialogRef.value.initDialog('detail', active.value, row)
break
case '2': // 重大危险源
break
@@ -216,7 +214,7 @@
const edit = (row: IList) => {
switch (active.value) {
case '1': // 危险点
- editPointDialogRef.value.initDialog('edit', row)
+ editPointDialogRef.value.initDialog('edit', active.value, row)
break
case '2': // 重大危险源
break
@@ -239,11 +237,10 @@
type: 'warning',
},
).then(() => {
- // delDev(row.id).then(() => {
- // ElMessage.success('删除成功')
- // fetchData()
- // })
- ElMessage.info('敬请期待')
+ delDangerAssessmentManage({ id: row.id }).then(() => {
+ ElMessage.success('删除成功')
+ fetchData()
+ })
})
}
@@ -308,7 +305,7 @@
-
+
@@ -338,7 +335,7 @@
-
+