From 6c4df8fb750e58528ebae1289026934ed21a4cb1 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期三, 03 八月 2022 18:01:33 +0800
Subject: [PATCH] 数据对接
---
src/api/emergencyDrillExecute/index.ts | 2 +-
src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue | 36 ++++++++++++++++++------------------
src/api/emergencyResources/index.ts | 5 +++--
src/views/contingencyManagement/emergencyPlanStartRecord/index.vue | 2 +-
src/views/contingencyManagement/panManagement/component/openAdd.vue | 2 +-
src/views/contingencyManagement/emergencyResources/emergencySupplies/index.vue | 8 +++++---
src/components/DailogSearchUser/index.vue | 2 +-
7 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/api/emergencyDrillExecute/index.ts b/src/api/emergencyDrillExecute/index.ts
index 64d3338..a5b380a 100644
--- a/src/api/emergencyDrillExecute/index.ts
+++ b/src/api/emergencyDrillExecute/index.ts
@@ -34,7 +34,7 @@
});
},
// 应急演练实施删除
- deleteEmergencyDrillExecute: (params:object) => {
+ deleteEmergencyDrillExecute: (params:any) => {
return request({
url: `/emergencyDrillExecute/batchDelete`,
method: 'post',
diff --git a/src/api/emergencyResources/index.ts b/src/api/emergencyResources/index.ts
index fc3a9ca..15f2778 100644
--- a/src/api/emergencyResources/index.ts
+++ b/src/api/emergencyResources/index.ts
@@ -36,8 +36,9 @@
// 应急物资删除
deleteEmergencySupplies: (params:object) => {
return request({
- url: `/emergencySupplies/batchDelete/${params}`,
- method: 'get',
+ url: `/emergencySupplies/batchDelete`,
+ method: 'post',
+ data: params
});
},
}
diff --git a/src/components/DailogSearchUser/index.vue b/src/components/DailogSearchUser/index.vue
index 56a7799..0db0657 100644
--- a/src/components/DailogSearchUser/index.vue
+++ b/src/components/DailogSearchUser/index.vue
@@ -30,7 +30,7 @@
<el-table-column align="center">
<template #default="scope">
<el-radio-group v-model="radio1">
- <el-radio :label="scope.row.username" size="large">{{ null }}</el-radio>
+ <el-radio :label="scope.row.uid" size="large">{{ null }}</el-radio>
</el-radio-group>
</template>
</el-table-column>
diff --git a/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue b/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue
index 5b487e3..e410182 100644
--- a/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue
+++ b/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue
@@ -216,6 +216,23 @@
})
.catch(() => {});
};
+ const danger = ref(true);
+ const deletAll = ref();
+ const handleSelectionChange = (val: any) => {
+ let valId = JSON.parse(JSON.stringify(val));
+ let arr = [];
+ for (let i = 0; i < valId.length; i++) {
+ arr.push(valId[i].id);
+ }
+ deletAll.value = arr;
+ if (val.length == 1) {
+ danger.value = false;
+ } else if (val.length == 0) {
+ danger.value = true;
+ } else {
+ danger.value = false;
+ }
+ };
// 多选删除
const onDeleteAll = () => {
ElMessageBox.confirm('确定删除所选项吗?', '提示', {
@@ -260,24 +277,7 @@
listQuery.pageIndex = val;
listApi();
};
- const danger = ref(true);
- const deletAll = ref();
- const handleSelectionChange = (val: any) => {
- let valId = JSON.parse(JSON.stringify(val));
- let arr = [];
- for (let i = 0; i < valId.length; i++) {
- arr.push(valId[i].id);
- }
- deletAll.value = arr.toString();
- // console.log(deletAll.value);
- if (val.length == 1) {
- danger.value = false;
- } else if (val.length == 0) {
- danger.value = true;
- } else {
- danger.value = false;
- }
- };
+
onMounted(() => {
listApi();
});
diff --git a/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue b/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
index fee0f3a..f915e2a 100644
--- a/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
+++ b/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
@@ -62,7 +62,7 @@
width="55"
/>
<el-table-column prop="planId" label="应急预案" min-width="120" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="userId" label="启动人" min-width="120" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="username" label="启动人" min-width="120" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="startCreate" label="启动时间" min-width="120" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right">
diff --git a/src/views/contingencyManagement/emergencyResources/emergencySupplies/index.vue b/src/views/contingencyManagement/emergencyResources/emergencySupplies/index.vue
index 5625061..ffd427a 100644
--- a/src/views/contingencyManagement/emergencyResources/emergencySupplies/index.vue
+++ b/src/views/contingencyManagement/emergencyResources/emergencySupplies/index.vue
@@ -167,7 +167,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr;
// console.log(deletAll.value);
if (val.length == 1) {
warning.value = false;
@@ -247,7 +247,9 @@
}
};
// 删除用户
- const onRowDel = (data: any) => {
+ const onRowDel = (id: number) => {
+ let arr = [];
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
@@ -255,7 +257,7 @@
})
.then(() => {
emergencySuppliesApi()
- .deleteEmergencySupplies(data)
+ .deleteEmergencySupplies(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue
index 1ef60e1..55f0ef7 100644
--- a/src/views/contingencyManagement/panManagement/component/openAdd.vue
+++ b/src/views/contingencyManagement/panManagement/component/openAdd.vue
@@ -388,7 +388,7 @@
userRef.value.openDailog();
};
const onUser = (e:any) => {
- ruleForm.value.authorUid=e.username
+ ruleForm.value.authorUid=e.uid
};
//全屏
const full = ref(false);
--
Gitblit v1.9.2