From 475b431018e47473100c783fc41296284c400ed9 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 4 Dec 2023 16:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8A=A5=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/faultReport/index.vue | 62 +++++++++++++++++++-------
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index fa8454e..878527b 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -363,15 +363,21 @@
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
             <el-table :data="checkList" border style="width: 100%">
-              <el-table-column prop="itemName" label="检查项名称" width="200">
+              <el-table-column prop="itemName" label="检查项名称" width="160">
               </el-table-column>
-              <el-table-column prop="itemMethod" label="检查项方法" width="160">
+              <el-table-column prop="itemMethod" label="方法" width="100">
+              </el-table-column>
+              <el-table-column prop="itemTools" label="工具" width="60">
               </el-table-column>
               <el-table-column prop="standardName" label="标准名称" width="180">
               </el-table-column>
               <el-table-column prop="standardType" label="标准类型" width="85">
               </el-table-column>
-              <el-table-column prop="detailReach" label="是否达标" width="85">
+              <el-table-column prop="planLoopType" label="周期" width="50">
+              </el-table-column>
+              <el-table-column prop="planLoop" label="次" width="37">
+              </el-table-column>
+              <el-table-column prop="detailReach" label="是否达标" width="80">
                 <template slot-scope="scope">
                   <dict-tag
                     :options="dict.type.device_reach_standard"
@@ -385,9 +391,9 @@
               </el-table-column>
               <el-table-column prop="detailDownLimit" label="下限" width="50">
               </el-table-column>
-              <el-table-column prop="detailUnit" label="单位" width="47">
+              <el-table-column prop="detailUnit" label="单位" width="45">
               </el-table-column>
-              <el-table-column prop="picturePath" label="图片">
+              <el-table-column prop="picturePath" label="图片" w` idth="60">
                 <template slot-scope="scope">
                   <el-popover placement="right" width="300" trigger="hover">
                     <div class="standardUrl_body">
@@ -698,15 +704,21 @@
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
             <el-table :data="checkList" border style="width: 100%">
-              <el-table-column prop="itemName" label="检查项名称" width="200">
+              <el-table-column prop="itemName" label="检查项名称" width="160">
               </el-table-column>
-              <el-table-column prop="itemMethod" label="检查项方法" width="160">
+              <el-table-column prop="itemMethod" label="方法" width="100">
+              </el-table-column>
+              <el-table-column prop="itemTools" label="工具" width="60">
               </el-table-column>
               <el-table-column prop="standardName" label="标准名称" width="180">
               </el-table-column>
               <el-table-column prop="standardType" label="标准类型" width="85">
               </el-table-column>
-              <el-table-column prop="detailReach" label="是否达标" width="85">
+              <el-table-column prop="planLoopType" label="周期" width="50">
+              </el-table-column>
+              <el-table-column prop="planLoop" label="次" width="37">
+              </el-table-column>
+              <el-table-column prop="detailReach" label="是否达标" width="80">
                 <template slot-scope="scope">
                   <dict-tag
                     :options="dict.type.device_reach_standard"
@@ -720,9 +732,9 @@
               </el-table-column>
               <el-table-column prop="detailDownLimit" label="下限" width="50">
               </el-table-column>
-              <el-table-column prop="detailUnit" label="单位" width="47">
+              <el-table-column prop="detailUnit" label="单位" width="45">
               </el-table-column>
-              <el-table-column prop="picturePath" label="图片">
+              <el-table-column prop="picturePath" label="图片" width="60">
                 <template slot-scope="scope">
                   <el-popover placement="right" width="300" trigger="hover">
                     <div class="standardUrl_body">
@@ -1029,15 +1041,21 @@
           </el-tab-pane>
           <el-tab-pane label="检查项信息" v-if="checkList != null">
             <el-table :data="checkList" border style="width: 100%">
-              <el-table-column prop="itemName" label="检查项名称" width="200">
+              <el-table-column prop="itemName" label="检查项名称" width="160">
+              </el-table-column>
+              <el-table-column prop="itemMethod" label="方法" width="100">
               </el-table-column>
-              <el-table-column prop="itemMethod" label="检查项方法" width="160">
+              <el-table-column prop="itemTools" label="工具" width="60">
               </el-table-column>
               <el-table-column prop="standardName" label="标准名称" width="180">
               </el-table-column>
               <el-table-column prop="standardType" label="标准类型" width="85">
               </el-table-column>
-              <el-table-column prop="detailReach" label="是否达标" width="85">
+              <el-table-column prop="planLoopType" label="周期" width="50">
+              </el-table-column>
+              <el-table-column prop="planLoop" label="次" width="37">
+              </el-table-column>
+              <el-table-column prop="detailReach" label="是否达标" width="80">
                 <template slot-scope="scope">
                   <dict-tag
                     :options="dict.type.device_reach_standard"
@@ -1051,9 +1069,9 @@
               </el-table-column>
               <el-table-column prop="detailDownLimit" label="下限" width="50">
               </el-table-column>
-              <el-table-column prop="detailUnit" label="单位" width="47">
+              <el-table-column prop="detailUnit" label="单位" width="45">
               </el-table-column>
-              <el-table-column prop="picturePath" label="图片">
+              <el-table-column prop="picturePath" label="图片" width="60">
                 <template slot-scope="scope">
                   <el-popover placement="right" width="300" trigger="hover">
                     <div class="standardUrl_body">
@@ -1455,6 +1473,9 @@ export default {
                 var standard = {};
                 standard.itemName = item1.itemName;
                 standard.itemMethod = item1.itemMethod;
+                standard.itemTools = item1.itemTools;
+                standard.planLoop = item1.planLoop;
+                standard.planLoopType = item1.planLoopType;
                 standard.standardName = item.standardName;
                 standard.detailUpLimit = item.detailUpLimit;
                 standard.detailDownLimit = item.detailDownLimit;
@@ -1469,8 +1490,10 @@ export default {
                     standardUrlLists.push(item2.fileAddress);
                   });
                   standard.standardUrlLists = standardUrlLists;
-                  standards.push(standard);
+                }else{
+                  standard.standardUrlLists = null;
                 }
+                standards.push(standard);
               });
             }
           });
@@ -1527,6 +1550,9 @@ export default {
                 var standard = {};
                 standard.itemName = item1.itemName;
                 standard.itemMethod = item1.itemMethod;
+                standard.itemTools = item1.itemTools;
+                standard.planLoop = item1.planLoop;
+                standard.planLoopType = item1.planLoopType;
                 standard.standardName = item.standardName;
                 standard.detailUpLimit = item.detailUpLimit;
                 standard.detailDownLimit = item.detailDownLimit;
@@ -1541,8 +1567,10 @@ export default {
                     standardUrlLists.push(item2.fileAddress);
                   });
                   standard.standardUrlLists = standardUrlLists;
-                  standards.push(standard);
+                }else{
+                  standard.standardUrlLists = null;
                 }
+                standards.push(standard);
               });
             }
           });