From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
index 3de28ea..c0ee1c0 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
@@ -470,7 +470,8 @@
data.inspectTaskForm.points.push(data.inspectPointForm);
data.inspectPointDialog = false;
} else if (data.title === '新增巡检任务' && data.pointTitle === '修改巡检点') {
- let result = data.inspectTaskForm.points.findIndex((item) => item.id === data.inspectPointForm.id);
+ debugger;
+ let result = data.inspectTaskForm.points.findIndex((item) => item.execSequence === data.inspectPointForm.execSequence);
data.inspectTaskForm.points[result] = data.inspectPointForm;
data.inspectPointDialog = false;
} else if (data.title === '修改巡检任务' && data.pointTitle === '新增巡检点') {
@@ -504,7 +505,7 @@
message: '巡检点修改成功',
duration: 2000
});
- let result = data.inspectTaskForm.points.findIndex((item) => item.id === data.inspectPointForm.id);
+ let result = data.inspectTaskForm.points.findIndex((item) => item.execSequence === data.inspectPointForm.execSequence);
data.inspectTaskForm.points[result] = data.inspectPointForm;
data.inspectPointDialog = false;
} else {
@@ -613,7 +614,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
--
Gitblit v1.9.2