diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index 9f503fd..fec55ba 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -344,25 +344,11 @@
                   <el-input v-model="form.planName" placeholder="请输入计划名称"/>
                 </el-form-item>
               </el-col>
-              <el-col :span=12 :offset="1">
-                <el-form-item label-width="100px" label="巡检执行时间">
-                  <el-date-picker
-                    @change="changeArray"
-                    v-model="form.planTimeArray"
-                    type="datetimerange"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6">
+              <el-col :span="6" :offset="1">
                 <el-form-item label="循环周期">
                   <el-input v-model="form.planLoop" placeholder="请输入循环周期"/>
                 </el-form-item>
-              </el-col>
+              </el-col >
               <el-col :span="2">
                 <el-select v-model="form.planLoopType" placeholder="周期" clearable>
                   <el-option
@@ -373,7 +359,9 @@
                   />
                 </el-select>
               </el-col>
-              <el-col :span="6" :offset="1">
+            </el-row>
+            <el-row>
+              <el-col :span="6">
                 <el-form-item label-width="100px" label="计划状态">
                   <el-select v-model="form.planStatus" placeholder="计划状态" clearable>
                     <el-option
@@ -385,6 +373,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span=12 :offset="1">
+                <el-form-item label-width="100px" label="巡检执行时间">
+                  <el-date-picker
+                    @change="changeArray"
+                    v-model="form.planTimeArray"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
@@ -870,25 +870,53 @@ export default {
     // 点击编辑设备-巡检项目
     editorTheItem(e) {
 
+      console.log('e')
+      console.log(e)
+      console.log("form")
+      console.log(this.form.equipmentItem)
+      console.log("长度")
+      console.log(this.form.equipmentItem.length)
+
       // 清除缓存
       this.itemDetailList = [];
 
+      let qw = 1;
+
       for (let i = 0; i < this.form.equipmentItem.length; i++) {
-        if (e.code == this.form.equipmentItem[i].code) {
+
+        if (e.equipmentCode == this.form.equipmentItem[i].equipmentCode) {
+          console.log("一次")
+          console.log(e.equipmentCode == this.form.equipmentItem[i].equipmentCode)
+          console.log(e.equipmentCode)
+          console.log(this.form.equipmentItem[i].equipmentCode)
+
           for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
+
+            // 检查项名称
             var itemName = this.form.equipmentItem[i].equPlanDetailList[j].itemName;
+
+            console.log("长度")
+            console.log(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length)
+
             for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++){
-              this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
-              if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
-              }else {
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
+
+              if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].showFlag == true) {
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
+                if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
+                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
+                }else {
+                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
+                }
+                console.log(qw++)
+                this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
               }
 
-              this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
             }
+
           }
+
         }
+
       }
 
       this.editorItem = true;
diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index f4766a0..a3ea39b 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -382,7 +382,7 @@
                 width="180">
               </el-table-column>
               <el-table-column
-                prop="standardType"
+                prop="standardTypeName"
                 label="标准类型"
                 width="180">
               </el-table-column>
diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index fbef42d..81d8910 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -250,9 +250,9 @@
     />
 
     <!-- 添加或修改检查项维护对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-tabs type="border-card">
-        <el-tab-pane label="检查项配置">
+    <el-dialog v-loading="itemLoading" :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-tabs v-model="activePage" type="border-card">
+        <el-tab-pane name="check" label="检查项配置">
           <el-form ref="form" :model="form" :rules="rules" label-width="90px">
             <!-- 第一行 -->
             <el-row>
@@ -346,7 +346,7 @@
             </el-form-item>
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="关联设备">
+        <el-tab-pane name="equ" label="关联设备">
           <el-row>
             <el-col :span="24" :offset="1">
               <el-transfer
@@ -379,12 +379,16 @@ import {
   addItem,
   updateItem,
 } from "@/api/device/item";
+import { Loading } from 'element-ui';
 
 export default {
   name: "Item",
   dicts: ['device_item_type'],
   data() {
     return {
+      activePage: 'check',
+      // 加载
+      itemLoading: false,
       // 设备选择穿梭框
       equipmentList: [],
       selectEquipmentList: [],
@@ -578,12 +582,14 @@ export default {
     handleAdd() {
       this.reset();
       this.setTransfer();
+      this.activePage = 'check';
       this.open = true;
       this.title = "新增检查项";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.activePage = 'check';
       this.setTransfer();
       const itemId = row.itemId || this.ids
       getItem(itemId).then(response => {
@@ -677,10 +683,12 @@ export default {
 
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.itemLoading = true;
           if (this.form.itemId != null) {
             this.form.formStandard = this.formStandard;
             this.form.equipmentCodeList = this.selectEquipmentList;
             updateItem(this.form).then(response => {
+              this.itemLoading = false;
               if (response.code != 500) {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
@@ -691,6 +699,7 @@ export default {
             this.form.formStandard = this.formStandard;
             this.form.equipmentCodeList = this.selectEquipmentList;
             addItem(this.form).then(response => {
+              this.itemLoading = false;
               if (response.code != 500){
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index 3dd587a..6eaac20 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -397,7 +397,7 @@
                 width="180">
               </el-table-column>
               <el-table-column
-                prop="standardType"
+                prop="standardTypeName"
                 label="标准类型"
                 width="180">
               </el-table-column>
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 59e2ee4..49738f1 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -85,10 +85,10 @@
 					placeholder="请选择循环执行时间结束">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item v-if="false" label="巡检人员" prop="planPerson">
+			<el-form-item v-if="false" label="点检人员" prop="planPerson">
 				<el-input
 					v-model="queryParams.planPerson"
-					placeholder="请输入巡检人员"
+					placeholder="请输入点检人员"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -301,7 +301,7 @@
 					<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column v-if="false" label="巡检人员" align="center" prop="planPerson" />
+			<el-table-column v-if="false" label="点检人员" align="center" prop="planPerson" />
 			<el-table-column label="计划状态" align="center" prop="planStatus">
 				<template slot-scope="scope">
 					<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.planStatus"/>
@@ -364,7 +364,7 @@
 		/>
 
 		<!-- 添加或修改点检计划对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+		<el-dialog v-loading="planLoading" :title="title" :visible.sync="open" width="900px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 				<el-form-item v-if="false" label="计划编码" prop="planCode">
 					<el-input v-model="form.planCode" placeholder="请输入计划编码" />
@@ -383,21 +383,7 @@
                   <el-input v-model="form.planName" placeholder="请输入计划名称"/>
                 </el-form-item>
               </el-col>
-              <el-col :span=12 :offset="1">
-                <el-form-item label-width="100px" label="点检执行时间">
-                  <el-date-picker
-                    @change="changeArray"
-                    v-model="form.planTimeArray"
-                    type="datetimerange"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6">
+              <el-col :span="6" :offset="1">
                 <el-form-item label="循环周期">
                   <el-input v-model="form.planLoop" placeholder="请输入循环周期"/>
                 </el-form-item>
@@ -412,7 +398,9 @@
                   />
                 </el-select>
               </el-col>
-              <el-col :span="6" :offset="1">
+            </el-row>
+            <el-row>
+              <el-col :span="6">
                 <el-form-item label-width="100px" label="计划状态">
                   <el-select v-model="form.planStatus" placeholder="计划状态" clearable>
                     <el-option
@@ -424,6 +412,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span=12 :offset="1">
+                <el-form-item label-width="100px" label="点检执行时间">
+                  <el-date-picker
+                    @change="changeArray"
+                    v-model="form.planTimeArray"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
@@ -476,7 +476,7 @@
               </el-table-column>
               <el-table-column
                 prop="itemTempName"
-                label="巡检项"
+                label="点检项"
                 width="300">
               </el-table-column>
               <el-table-column
@@ -639,16 +639,26 @@ import {
   updateSpotCheckPlan,
   formatEquItem
 } from "@/api/device/spotCheckPlan";
-import {addPlan, getEquList, getPersonList, getWorkCenter, initUpdatePlanInfo, updatePlan} from "@/api/device/plan";
+import {
+  addPlan,
+  delPlan,
+  getEquList,
+  getPersonList,
+  getWorkCenter,
+  initUpdatePlanInfo,
+  updatePlan
+} from "@/api/device/plan";
 
 export default {
 	name: "SpotCheckPlan",
 	dicts: ['device_loop_type', 'sys_normal_disable','device_yes_no'],
 	data() {
 		return {
+      // 加载
+      planLoading: false,
       // 工作中心list
       workCenterList: [],
-      // 巡检人员选择穿梭框
+      // 点检人员选择穿梭框
       personList: [],
       selectPersonList: [],
       // 编辑检查标准list
@@ -675,7 +685,7 @@ export default {
       selectEqu: false,
       // 编辑检查项弹窗
       editorItem: false,
-      // 巡检计划步骤
+      // 点检计划步骤
       inspectionPlanStep: 0,
       // 步骤
       spotCheckStep: 0,
@@ -763,7 +773,7 @@ export default {
     changeCenter() {
 
     },
-    // 改变巡检周期事件
+    // 改变点检周期事件
     changeArray(e) {
       console.log(e)
       console.log(this.form.planTimeArray)
@@ -869,7 +879,7 @@ export default {
         }
       });
     },
-    // 巡检人员穿梭框
+    // 点检人员穿梭框
     filterMethod(query, item) {
       return item.label.indexOf(query) > -1;
     },
@@ -884,6 +894,10 @@ export default {
     },
     // 删除标准
     delStandard(e) {
+      console.log("e")
+      console.log(e)
+      console.log("this")
+      console.log(this.itemDetailList)
       e.showFlag = false;
       for (let i = 0; i < this.itemDetailList.length; i++) {
         if (this.itemDetailList[i].detailCode == e.detailCode) {
@@ -892,33 +906,61 @@ export default {
         }
       }
     },
-    // 点击编辑设备-巡检项目
+    // 点击编辑设备-点检项目
     editorTheItem(e) {
 
+      console.log('e')
+      console.log(e)
+      console.log("form")
+      console.log(this.form.equipmentItem)
+      console.log("长度")
+      console.log(this.form.equipmentItem.length)
+
       // 清除缓存
       this.itemDetailList = [];
 
+      let qw = 1;
+
       for (let i = 0; i < this.form.equipmentItem.length; i++) {
-        if (e.code == this.form.equipmentItem[i].code) {
+
+        if (e.equipmentCode == this.form.equipmentItem[i].equipmentCode) {
+          console.log("一次")
+          console.log(e.equipmentCode == this.form.equipmentItem[i].equipmentCode)
+          console.log(e.equipmentCode)
+          console.log(this.form.equipmentItem[i].equipmentCode)
+
           for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
+
+            // 检查项名称
             var itemName = this.form.equipmentItem[i].equPlanDetailList[j].itemName;
+
+            console.log("长度")
+            console.log(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length)
+
             for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++){
-              this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
-              if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
-              }else {
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
+
+              if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].showFlag == true) {
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
+                if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
+                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
+                }else {
+                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
+                }
+                console.log(qw++)
+                this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
               }
 
-              this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
             }
+
           }
+
         }
+
       }
 
       this.editorItem = true;
     },
-    // 删除设备-巡检项
+    // 删除设备-点检项
     delTheEquItem(e) {
       this.form.equipmentItem.splice(e.equipmentCode, 1)
     },
@@ -979,6 +1021,13 @@ export default {
     },
     // 下一步
     stepNext() {
+      if (this.form.planWorkshop == null) {
+        this.$message({
+          message: '请选择车间！',
+          type: 'warning'
+        })
+        return
+      }
       this.spotCheckStep++;
     },
 		/** 查询点检计划列表 */
@@ -1006,12 +1055,12 @@ export default {
 				equipmentName: null,
 				equipmentCode: null,
 				planLoop: null,
-				planLoopType: null,
+				planLoopType: 'day',
 				planLoopStart: null,
 				planLoopEnd: null,
 				planPerson: null,
-				planStatus: null,
-				planRestrict: null,
+				planStatus: '0',
+				planRestrict: '1',
         planType: "spotInspection",
 				planOutsource: null,
 				workCode: null,
@@ -1060,7 +1109,6 @@ export default {
       this.spotCheckStep = 0;
       this.selectPersonList = [];
       this.personList = [];
-
       this.setPerson();
       this.setWorkCenter();
 
@@ -1081,6 +1129,8 @@ export default {
       initUpdatePlanInfo(row).then(response => {
         this.form = response.data;
 
+        console.log(response.data)
+
         this.selectPersonList = response.data.personListVO;
 
         for (let i = 0; i < this.form.equipmentItem.length; i++) {
@@ -1100,9 +1150,11 @@ export default {
 		submitForm() {
 			this.$refs["form"].validate(valid => {
 				if (valid) {
+          this.planLoading = true;
 					if (this.form.planId != null) {
             this.form.personList = this.selectPersonList;
             updatePlan(this.form).then(response => {
+              this.planLoading = false;
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -1110,6 +1162,7 @@ export default {
 					} else {
             this.form.personList = this.selectPersonList;
             addPlan(this.form).then(response => {
+              this.planLoading = false;
 							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
@@ -1121,8 +1174,27 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const planIds = row.planId || this.ids;
-			this.$modal.confirm('是否确认删除点检计划编号为"' + planIds + '"的数据项？').then(function() {
-				return delSpotCheckPlan(planIds);
+
+      var planCodes = '';
+      // 处理信息
+      for (let i = 0; i < this.spotCheckPlanList.length; i++) {
+        for (let j = 0; j < planIds.length; j++) {
+          if (planIds[j] == this.spotCheckPlanList[i].planId) {
+            planCodes = planCodes + this.spotCheckPlanList[i].planCode + ',';
+          }
+        }
+      }
+
+      if (planCodes == '') {
+        for (let i = 0; i < this.spotCheckPlanList.length; i++) {
+          if (planIds == this.spotCheckPlanList[i].planId) {
+            planCodes = this.spotCheckPlanList[i].planCode;
+          }
+        }
+      }
+
+			this.$modal.confirm('是否确认删除计划编号为"' + planCodes + '"的数据项？').then(function() {
+				return delPlan(planIds);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 8e0c72d..46fa246 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -376,7 +376,7 @@
                 width="180">
               </el-table-column>
               <el-table-column
-                prop="standardType"
+                prop="standardTypeName"
                 label="标准类型"
                 width="180">
               </el-table-column>
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 1261024..6b3d459 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -892,7 +892,8 @@ import {
 } from "@/api/device/upkeepOrder";
 import {formatEquItem, querySpareList} from "@/api/device/upkeepPlan";
 import {getEquList, getPersonList, getWorkCenter} from "@/api/device/plan";
-import {getDeviceOrder} from "@/api/device/deviceOrder";
+import {getDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
+import {updateInspectionWork} from "@/api/device/inspectionWork";
 
 export default {
   name: "UpkeepOrder",
@@ -1381,7 +1382,7 @@ export default {
           if (this.form.orderId != null) {
             console.log("点击了提交")
             console.log(this.form)
-            updateUpkeepOrder(this.form).then(response => {
+            updateDeviceOrder(this.form).then(response => {
               this.$modal.msgSuccess("提交成功");
               this.open = false;
               this.getList();
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index 63af238..2fe13c2 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -83,10 +83,10 @@
                         placeholder="请选择循环执行时间结束">
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label="巡检人员" prop="planPerson">
+      <el-form-item v-if="false" label="保养人员" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入巡检人员"
+          placeholder="请输入保养人员"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -256,14 +256,14 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
       <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
-      <el-table-column label="计划编码" align="center" prop="planCode"/>
-      <el-table-column label="计划名称" align="center" prop="planName"/>
+      <el-table-column width="150" label="计划编码" align="center" prop="planCode"/>
+      <el-table-column width="150" label="计划名称" align="center" prop="planName"/>
       <el-table-column label="车间" align="center" prop="planWorkshop"/>
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>
       <el-table-column v-if="false" label="设备名称" align="center" prop="equipmentName"/>
       <el-table-column v-if="false" label="设备编码" align="center" prop="equipmentCode"/>
       <el-table-column label="循环周期" align="center" prop="planLoop"/>
-      <el-table-column label="循环周期类型" align="center" prop="planLoopType">
+      <el-table-column width="150" label="循环周期类型" align="center" prop="planLoopType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
         </template>
@@ -278,7 +278,7 @@
           <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" label="巡检人员" align="center" prop="planPerson"/>
+      <el-table-column v-if="false" label="保养人员" align="center" prop="planPerson"/>
       <el-table-column label="计划状态" align="center" prop="planStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.planStatus"/>
@@ -453,7 +453,7 @@
               </el-table-column>
               <el-table-column
                 prop="itemTempName"
-                label="巡检项"
+                label="保养项"
                 width="300">
               </el-table-column>
               <el-table-column
@@ -821,7 +821,7 @@ import {
   updateUpkeepPlan,
   formatEquItem, setSpareList, querySpareList
 } from "@/api/device/upkeepPlan";
-import {getEquList, getPersonList, getWorkCenter, initUpdatePlanInfo} from "@/api/device/plan";
+import {delPlan, getEquList, getPersonList, getWorkCenter, initUpdatePlanInfo} from "@/api/device/plan";
 
 export default {
   name: "UpkeepPlan",
@@ -999,7 +999,7 @@ export default {
         type: 'success'
       })
     },
-    // 改变巡检周期事件
+    // 改变保养周期事件
     changeArray(e) {
       console.log(e)
       console.log(this.form.planTimeArray)
@@ -1151,7 +1151,7 @@ export default {
         }
       });
     },
-    // 巡检人员穿梭框
+    // 保养人员穿梭框
     filterMethod(query, item) {
       return item.label.indexOf(query) > -1;
     },
@@ -1175,33 +1175,61 @@ export default {
         }
       }
     },
-    // 点击编辑设备-巡检项目
+    // 点击编辑设备-保养项目
     editorTheItem(e) {
 
+      console.log('e')
+      console.log(e)
+      console.log("form")
+      console.log(this.form.equipmentItem)
+      console.log("长度")
+      console.log(this.form.equipmentItem.length)
+
       // 清除缓存
       this.itemDetailList = [];
 
+      let qw = 1;
+
       for (let i = 0; i < this.form.equipmentItem.length; i++) {
-        if (e.code == this.form.equipmentItem[i].code) {
+
+        if (e.equipmentCode == this.form.equipmentItem[i].equipmentCode) {
+          console.log("一次")
+          console.log(e.equipmentCode == this.form.equipmentItem[i].equipmentCode)
+          console.log(e.equipmentCode)
+          console.log(this.form.equipmentItem[i].equipmentCode)
+
           for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
+
+            // 检查项名称
             var itemName = this.form.equipmentItem[i].equPlanDetailList[j].itemName;
+
+            console.log("长度")
+            console.log(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length)
+
             for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++){
-              this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
-              if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
-              }else {
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
+
+              if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].showFlag == true) {
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
+                if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
+                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
+                }else {
+                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
+                }
+                console.log(qw++)
+                this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
               }
 
-              this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
             }
+
           }
+
         }
+
       }
 
       this.editorItem = true;
     },
-    // 删除设备-巡检项
+    // 删除设备-保养项
     delTheEquItem(e) {
       this.form.equipmentItem.splice(e.equipmentCode, 1)
     },
@@ -1415,8 +1443,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const planIds = row.planId || this.ids;
-      this.$modal.confirm('是否确认删除保养计划编号为"' + planIds + '"的数据项？').then(function () {
-        return delUpkeepPlan(planIds);
+
+      var planCodes = '';
+      // 处理信息
+      for (let i = 0; i < this.upkeepPlanList.length; i++) {
+        for (let j = 0; j < planIds.length; j++) {
+          if (planIds[j] == this.upkeepPlanList[i].planId) {
+            planCodes = planCodes + this.upkeepPlanList[i].planCode + ',';
+          }
+        }
+      }
+
+      if (planCodes == '') {
+        for (let i = 0; i < this.upkeepPlanList.length; i++) {
+          if (planIds == this.upkeepPlanList[i].planId) {
+            planCodes = this.upkeepPlanList[i].planCode;
+          }
+        }
+      }
+
+      this.$modal.confirm('是否确认删除计划编号为"' + planCodes + '"的数据项？').then(function () {
+        return delPlan(planIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");