From e04c8dab8e435cabf1360bbcd6936e5ac9e77906 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Mon, 08 Aug 2022 16:46:47 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/emergencyPlanStartRecord/index.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue b/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
index fee0f3a..29f589c 100644
--- a/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
+++ b/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
@@ -9,7 +9,7 @@
>
<el-form-item prop="telephone" >
<el-input
- v-model="listQuery.searchParams.planId"
+ v-model="listQuery.searchParams.planName"
placeholder="请选择应急预案"
class="input-with-select"
>
@@ -61,8 +61,8 @@
type="selection"
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="planName" 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">
@@ -128,8 +128,8 @@
} from '@element-plus/icons-vue'
import OpenSee from '/@/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue';
import SelectEmergencyPlan from '/@/views/contingencyManagement/emergencyPlanStartRecord/component/selectEmergencyPlan.vue'
-import {emergencyPlanLogApi} from "/@/api/emergencyPlanLog";
-import {contingencyApi} from "/@/api/contingency";
+import {emergencyPlanLogApi} from "/@/api/contingencyManagement/emergencyPlanLog";
+import {contingencyApi} from "/@/api/contingencyManagement/contingency";
export default defineComponent({
name: 'systemUser',
@@ -170,6 +170,7 @@
//重置
const submitReset = () => {
listQuery.searchParams.planId = '';
+ listQuery.searchParams.planName = '';
onSubmit();
};
const warning = ref(true);
@@ -181,7 +182,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deleteAll.value = arr.toString();
+ deleteAll.value = arr;
if (val.length == 1) {
warning.value = false;
danger.value = false;
@@ -217,7 +218,9 @@
showRef.value.openDailog()
}
const onUser = (e:any) => {
+ console.log(e)
listQuery.searchParams.planId=e.id
+ listQuery.searchParams.planName=e.name
};
// 删除用户
const onRowDel = (data: any) => {
@@ -227,7 +230,7 @@
type: 'warning',
}).then(() => {
emergencyPlanLogApi()
- .deleteEmergencyPlanLog(data)
+ .deleteEmergencyPlanLog([data])
.then((res) => {
if (res.data.code == 200) {
ElMessage({
--
Gitblit v1.9.2