From 118d1b9b088a6ba67cee7f5a3a746329a048113c Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 29 Nov 2023 17:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E7=82=B9=E6=A3=80=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E8=AE=A1=E5=88=92=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/inspectionPlan/index.vue | 66 +++++++++++++++-----
 src/views/device/spotCheckPlan/index.vue  | 75 ++++++++++++++++++-----
 src/views/device/upkeepPlan/index.vue     | 50 ++++++++++++---
 3 files changed, 148 insertions(+), 43 deletions(-)

diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index c19cedd..5b4b81a 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -453,6 +453,7 @@
               </el-col>
             </el-row>
             <el-table
+              border
               :data="form.equipmentItem"
               stripe
               style="width: 100%">
@@ -469,15 +470,18 @@
               </el-table-column>
               <el-table-column
                 prop="itemTempName"
-                label="巡检项"
+                label="部位"
                 width="300">
+                <template slot-scope="scope">
+                  <div v-html="scope.row.equPlanDetailList.filter(detail => detail.equPlanStandardList.filter(standard => standard.showFlag == false).length == 0).map(item => item.itemName).join(',')"></div>
+                </template>
               </el-table-column>
               <el-table-column
                 fixed="right"
                 label="操作"
               >
                 <template slot-scope="scope">
-                  <el-button @click="editorTheItem(scope.row)" type="text" size="small">编辑</el-button>
+                  <el-button @click="editorTheItem(scope.row)" type="text" size="small">检查项</el-button>
                   <el-button @click="delTheEquItem(scope.row)" type="text" size="small">删除</el-button>
                 </template>
               </el-table-column>
@@ -491,17 +495,26 @@
             >
               <!-- 编辑检查标准 -->
               <el-table
+                border
                 :data="itemDetailList"
                 v-loading="detailLoading"
                 stripe
                 @selection-change="selectChangeEqu"
                 style="width: 100%">
-                <el-table-column width="55" align="center"/>
                 <el-table-column
                   prop="itemName"
-                  label="检查项">
+                  label="部位">
+                </el-table-column>
+                <el-table-column
+                  prop="itemMethod"
+                  label="方法">
                 </el-table-column>
                 <el-table-column
+                  prop="itemTools"
+                  label="工具">
+                </el-table-column>
+                <el-table-column
+                  width="200"
                   prop="standardName"
                   label="检查标准">
                 </el-table-column>
@@ -921,23 +934,36 @@ export default {
 
           for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
 
-            // 检查项名称
+            // 部位
             var itemName = this.form.equipmentItem[i].equPlanDetailList[j].itemName;
+            // 方法
+            var itemMethod = this.form.equipmentItem[i].equPlanDetailList[j].itemMethod;
+            // 工具
+            var itemTools = this.form.equipmentItem[i].equPlanDetailList[j].itemTools;
+            // // 周期
+            // var itemLoop = this.form.equipmentItem[i].equPlanDetailList[j].itemLoop;
+            // var itemLoopType = this.form.equipmentItem[i].equPlanDetailList[j].itemLoopType;
 
-            for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++){
+            for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++) {
 
               if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].showFlag == true) {
+
                 this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemMethod = itemMethod;
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemTools = itemTools;
+                // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoop = itemLoop;
+                // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoopType = itemLoopType;
+
+
                 if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
                   this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
-                }else {
+                } else {
                   this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
                 }
                 this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
               }
 
             }
-
           }
 
         }
@@ -969,6 +995,12 @@ export default {
         }
       }
 
+      // 设置循环周期，用来后端格式化处理设备信息
+      for (let i = 0; i < this.selectEquList.length; i++) {
+        this.selectEquList[i].itemLoop = this.form.planLoop;
+        this.selectEquList[i].itemLoopType = this.form.planLoopType;
+      }
+
       // 处理信息
       formatEquItem(this.selectEquList).then(response => {
 
@@ -1171,14 +1203,14 @@ export default {
 
         this.selectPersonList = response.data.personListVO;
 
-        for (let i = 0; i < this.form.equipmentItem.length; i++) {
-          if (this.form.equipmentItem[i].itemTempName == null) {
-            this.form.equipmentItem[i].itemTempName = '';
-          }
-          for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
-            this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + ","
-          }
-        }
+        // for (let i = 0; i < this.form.equipmentItem.length; i++) {
+        //   if (this.form.equipmentItem[i].itemTempName == null) {
+        //     this.form.equipmentItem[i].itemTempName = '';
+        //   }
+        //   for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
+        //     this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + ","
+        //   }
+        // }
 
         this.loading = false;
         this.open = true;
@@ -1270,6 +1302,6 @@ export default {
 }
 
 .el-transfer-panel {
-  width: 260px;
+  width: 260px !important;
 }
 </style>
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 596a962..7de6a8c 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -438,7 +438,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="8" offset="2" >
+              <el-col :span="8" :offset="2" >
                 <el-form-item label="车间" prop="planWorkshop">
                   <el-select @change="changeCenter" v-model="form.planWorkshop" placeholder="请选择车间">
                     <el-option
@@ -472,6 +472,7 @@
               </el-col>
             </el-row>
             <el-table
+              border
               :data="form.equipmentItem"
               stripe
               style="width: 100%">
@@ -488,15 +489,18 @@
               </el-table-column>
               <el-table-column
                 prop="itemTempName"
-                label="点检项"
+                label="部位"
                 width="300">
+                <template slot-scope="scope">
+                  <div v-html="scope.row.equPlanDetailList.filter(detail => detail.equPlanStandardList.filter(standard => standard.showFlag == false).length == 0).map(item => item.itemName).join(',')"></div>
+                </template>
               </el-table-column>
               <el-table-column
                 fixed="right"
                 label="操作"
               >
                 <template slot-scope="scope">
-                  <el-button @click="editorTheItem(scope.row)" type="text" size="small">编辑</el-button>
+                  <el-button @click="editorTheItem(scope.row)" type="text" size="small">检查项</el-button>
                   <el-button @click="delTheEquItem(scope.row)" type="text" size="small">删除</el-button>
                 </template>
               </el-table-column>
@@ -505,22 +509,39 @@
             <el-dialog
               title="编辑检查项"
               :visible.sync="editorItem"
-              width="50%"
+              width="900px"
               append-to-body
             >
               <!-- 编辑检查标准 -->
               <el-table
+                border
                 :data="itemDetailList"
                 v-loading="detailLoading"
                 stripe
                 @selection-change="selectChangeEqu"
                 style="width: 100%">
-                <el-table-column width="55" align="center"/>
                 <el-table-column
                   prop="itemName"
-                  label="检查项">
+                  label="部位">
+                </el-table-column>
+<!--                <el-table-column-->
+<!--                  prop="itemLoop"-->
+<!--                  label="周期">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="itemLoopType"-->
+<!--                  label="周期类型">-->
+<!--                </el-table-column>-->
+                <el-table-column
+                  prop="itemMethod"
+                  label="方法">
                 </el-table-column>
                 <el-table-column
+                  prop="itemTools"
+                  label="工具">
+                </el-table-column>
+                <el-table-column
+                  width="200"
                   prop="standardName"
                   label="检查标准">
                 </el-table-column>
@@ -543,6 +564,7 @@
             </el-dialog>
             <!-- 选择设备弹窗 -->
             <el-dialog
+              border
               title="选择设备"
               :visible.sync="selectEqu"
               width="50%"
@@ -957,13 +979,27 @@ export default {
 
           for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
 
-            // 检查项名称
+            // 部位
             var itemName = this.form.equipmentItem[i].equPlanDetailList[j].itemName;
+            // 方法
+            var itemMethod = this.form.equipmentItem[i].equPlanDetailList[j].itemMethod;
+            // 工具
+            var itemTools = this.form.equipmentItem[i].equPlanDetailList[j].itemTools;
+            // // 周期
+            // var itemLoop = this.form.equipmentItem[i].equPlanDetailList[j].itemLoop;
+            // var itemLoopType = this.form.equipmentItem[i].equPlanDetailList[j].itemLoopType;
 
             for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++) {
 
               if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].showFlag == true) {
+
                 this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemMethod = itemMethod;
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemTools = itemTools;
+                // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoop = itemLoop;
+                // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoopType = itemLoopType;
+
+
                 if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
                   this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
                 } else {
@@ -973,7 +1009,6 @@ export default {
               }
 
             }
-
           }
 
         }
@@ -1005,6 +1040,12 @@ export default {
         }
       }
 
+      // 设置循环周期，用来后端格式化处理设备信息
+      for (let i = 0; i < this.selectEquList.length; i++) {
+        this.selectEquList[i].itemLoop = this.form.planLoop;
+        this.selectEquList[i].itemLoopType = this.form.planLoopType;
+      }
+
       // 处理信息
       formatEquItem(this.selectEquList).then(response => {
 
@@ -1197,14 +1238,14 @@ export default {
 
         this.selectPersonList = response.data.personListVO;
 
-        for (let i = 0; i < this.form.equipmentItem.length; i++) {
-          if (this.form.equipmentItem[i].itemTempName == null) {
-            this.form.equipmentItem[i].itemTempName = '';
-          }
-          for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
-            this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + ","
-          }
-        }
+        // for (let i = 0; i < this.form.equipmentItem.length; i++) {
+        //   if (this.form.equipmentItem[i].itemTempName == null) {
+        //     this.form.equipmentItem[i].itemTempName = '';
+        //   }
+        //   for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
+        //     this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + ","
+        //   }
+        // }
 
         this.loading = false;
         this.open = true;
@@ -1295,6 +1336,6 @@ export default {
 }
 
 .el-transfer-panel {
-  width: 260px;
+  width: 260px !important;
 }
 </style>
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index 4316bee..8693446 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -503,6 +503,7 @@
               </el-col>
             </el-row>
             <el-table
+              border
               :data="form.equipmentItem"
               stripe
               style="width: 100%">
@@ -519,8 +520,11 @@
               </el-table-column>
               <el-table-column
                 prop="itemTempName"
-                label="保养项"
+                label="部位"
                 width="300">
+                <template slot-scope="scope">
+                  <div v-html="scope.row.equPlanDetailList.filter(detail => detail.equPlanStandardList.filter(standard => standard.showFlag == false).length == 0).map(item => item.itemName).join(',')"></div>
+                </template>
               </el-table-column>
               <el-table-column
                 v-if="false"
@@ -534,7 +538,7 @@
                 label="操作"
               >
                 <template slot-scope="scope">
-                  <el-button @click="editorTheItem(scope.row)" type="text" size="small">标准</el-button>
+                  <el-button @click="editorTheItem(scope.row)" type="text" size="small">检查项</el-button>
                   <el-button @click="selectSpareBtn(scope.row)" type="text" size="small">备件</el-button>
                   <el-button @click="delTheEquItem(scope.row)" type="text" size="small">删除</el-button>
                 </template>
@@ -549,17 +553,26 @@
             >
               <!-- 编辑检查标准 -->
               <el-table
+                border
                 :data="itemDetailList"
                 v-loading="detailLoading"
                 stripe
                 @selection-change="selectChangeEqu"
                 style="width: 100%">
-                <el-table-column width="55" align="center"/>
                 <el-table-column
                   prop="itemName"
-                  label="检查项">
+                  label="部位">
+                </el-table-column>
+                <el-table-column
+                  prop="itemMethod"
+                  label="方法">
+                </el-table-column>
+                <el-table-column
+                  prop="itemTools"
+                  label="工具">
                 </el-table-column>
                 <el-table-column
+                  width="200"
                   prop="standardName"
                   label="检查标准">
                 </el-table-column>
@@ -1288,23 +1301,36 @@ export default {
 
           for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
 
-            // 检查项名称
+            // 部位
             var itemName = this.form.equipmentItem[i].equPlanDetailList[j].itemName;
+            // 方法
+            var itemMethod = this.form.equipmentItem[i].equPlanDetailList[j].itemMethod;
+            // 工具
+            var itemTools = this.form.equipmentItem[i].equPlanDetailList[j].itemTools;
+            // // 周期
+            // var itemLoop = this.form.equipmentItem[i].equPlanDetailList[j].itemLoop;
+            // var itemLoopType = this.form.equipmentItem[i].equPlanDetailList[j].itemLoopType;
 
-            for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++){
+            for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++) {
 
               if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].showFlag == true) {
+
                 this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemMethod = itemMethod;
+                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemTools = itemTools;
+                // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoop = itemLoop;
+                // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoopType = itemLoopType;
+
+
                 if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
                   this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
-                }else {
+                } else {
                   this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
                 }
                 this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
               }
 
             }
-
           }
 
         }
@@ -1336,6 +1362,12 @@ export default {
         }
       }
 
+      // 设置循环周期，用来后端格式化处理设备信息
+      for (let i = 0; i < this.selectEquList.length; i++) {
+        this.selectEquList[i].itemLoop = this.form.planLoop;
+        this.selectEquList[i].itemLoopType = this.form.planLoopType;
+      }
+
       // 处理信息
       formatEquItem(this.selectEquList).then(response => {
 
@@ -1667,6 +1699,6 @@ export default {
 }
 
 .el-transfer-panel {
-  width: 250px;
+  width: 250px !important;
 }
 </style>