From 448ff2dd7df630e781152326dd5c6c04a5e903a1 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期四, 21 七月 2022 15:26:15 +0800
Subject: [PATCH] 修改巡检点的提交校验逻辑

---
 src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue b/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
index 378c311..fe2c82e 100644
--- a/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
+++ b/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
@@ -4,8 +4,7 @@
 		<el-row class="homeCard">
 			<el-col :span="12">
 				<div class="grid-content topInfo">
-					<el-select v-model="searchType" @change="changeSearch">
-						<el-option label="任务名称" value="任务名称" />
+					<el-select v-model="searchType" @change="changeSearch" placeholder="任务名称">
 						<el-option label="巡检任务类型" value="巡检任务类型" />
 						<el-option label="创建人" value="创建人" />
 						<el-option label="巡检人" value="巡检人" />
@@ -172,12 +171,7 @@
 										</div>
 									</template>
 									<div>
-										<el-table
-												:data="item.inspectorData"
-												style="width: 100%"
-												:default-sort="{ prop: 'sort', order: 'ascending' }"
-												:header-cell-style="{background: '#fafafa',padding: '5px'}"
-										>
+										<el-table :data="item.inspectorData" style="width: 100%" :default-sort="{ prop: 'sort', order: 'ascending'}" :header-cell-style="{background: '#fafafa',padding: '5px'}">
 											<el-table-column property="sort" sortable label="排序"/>
 											<el-table-column property="name" label="巡检点名称"/>
 											<el-table-column property="section" label="所属设备区域"/>
@@ -603,6 +597,17 @@
 									type: 'warning',
 								})
 								return
+							// 判断每个区域是否都设置了至少一个巡检点,没有的话提示设置
+							}else if(addRecord.value.shiftSteps.some(i => !i.inspectorData || i.inspectorData.length==0)){
+								for(let i =0;i<addRecord.value.shiftSteps.length;i++){
+									if(!addRecord.value.shiftSteps[i].inspectorData||addRecord.value.shiftSteps[i].inspectorData.length==0){
+										ElMessage({
+											message: '请为'+ addRecord.value.shiftSteps[i].name +'设置巡检点',
+											type: 'warning',
+										})
+									}
+								}
+								return
 							}else{
 								addRecord.value.createTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
 								addRecord.value.chainLength = addRecord.value.shiftSteps.length
@@ -616,6 +621,17 @@
 									type: 'warning',
 								})
 								return
+							// 判断每个区域是否都设置了至少一个巡检点,没有的话提示设置
+							}else if(addRecord.value.shiftSteps.some(i => !i.inspectorData || i.inspectorData.length==0)){
+								for(let i =0;i<addRecord.value.shiftSteps.length;i++){
+									if(!addRecord.value.shiftSteps[i].inspectorData||addRecord.value.shiftSteps[i].inspectorData.length==0){
+										ElMessage({
+											message: '请为'+ addRecord.value.shiftSteps[i].name +'设置巡检点',
+											type: 'warning',
+										})
+									}
+								}
+								return
 							}else{
 								tableData[chosenIndex.value] = addRecord.value
 							}

--
Gitblit v1.9.2