fix：机房详情

pages/inspectionContent/components/dczt.vue

@@ -108,36 +108,45 @@ export default {
         inspectionItem: "", //巡检事项
         detail: [
           {
-            label: "实际电池电压",
+            label: "电池电压",
+            sjLabel: "实际电池电压",
+            sjLabelShow: "实际电压",
             inspectionResult: 0,
             inspectionResultLable: "正常",
             lableArr: ["正常", "正常"],
             conclusion: "",
             settingLabel: "设定电池电压",
+            settingLabelShow: "设定电压",
             setting: this.jfType === "3" ? "10V-15V" : "2V-3V", //设定温度值
             value: "", //输入温度
             unit: "V", //单位
             photos: [],
           },
           {
-            label: "实际电池温度",
+            label: "电池温度",
+            sjLabel: "实际电池温度",
+            sjLabelShow: "实际温度",
             inspectionResult: 0,
             inspectionResultLable: "正常",
             lableArr: ["正常", "正常"],
             conclusion: "",
             settingLabel: "设定电池温度",
+            settingLabelShow: "设定温度",
             setting: "15℃-30℃", //设定湿度值
             value: "", //输入湿度
             unit: "℃", //单位
             photos: [],
           },
           {
-            label: "实际电池内阻",
+            label: "电池内阻",
+            sjLabel: "实际电池内阻",
+            sjLabelShow: "实际内阻",
             inspectionResult: 0,
             inspectionResultLable: "正常",
             lableArr: ["正常", "正常"],
             conclusion: "",
             settingLabel: "设定电池内阻",
+            settingLabelShow: "设定内阻",
             setting: this.jfType === "3" ? "<10mΩ" : "<0.5mΩ", //设定湿度值
             value: "", //输入湿度
             unit: "mΩ", //单位

pages/inspectionContent/components/jfwsd.vue

@@ -102,7 +102,8 @@ export default {
         inspectionItem: "", //巡检事项
         detail: [
           {
-            label: "实际温度",
+            label: "机房温度",
+            sjLabel: "实际温度",
             inspectionResult: 0,
             inspectionResultLable: "正常",
             lableArr: ["正常", "正常"],
@@ -114,7 +115,8 @@ export default {
             photos: [],
           },
           {
-            label: "实际湿度",
+            label: "机房湿度",
+            sjLabel: "实际湿度",
             inspectionResult: 0,
             inspectionResultLable: "正常",
             lableArr: ["正常", "正常"],

pages/inspectionContent/components/sbgj.vue

@@ -226,7 +226,7 @@ export default {
     // 处理】数据
     getFromData() {
       console.log(111, this.itemData);
-      const isValid = this.areAllObjectsValid(this.itemData.detail, 2); //false不通过 true通过
+      const isValid = this.areAllObjectsValid(this.itemData.detail, 0); //false不通过 true通过
       // const isAllOne = this.areAllInspectionResultsOne(this.itemData.detail);
       this.itemData.isValid = isValid;
       this.itemData.inspectionItem = this.inspectionItem;

pages/inspectionContent/inspectionContentList.vue

@@ -53,7 +53,7 @@
         >
       </view>
     </view>
-    <view  class="card-box">
+    <view class="card-box">
       <view
         class="card-row"
         :class="{ right: rowIndex % 2 !== 0 }"
@@ -91,7 +91,7 @@
         </view>
       </view></view
     >
-    <view  class="card-box">
+    <view class="card-box">
       <view
         class="card-row"
         :class="{ right: rowIndex % 2 !== 0 }"
@@ -127,9 +127,9 @@
             </view>
           </view>
         </view>
-      </view></view
-    >
-    <detail ref="detail" :detailsItem="detailsItem"></detail>
+      </view>
+      <detail ref="detail" :jfType="jfType" :detailsItem="detailsItem"></detail
+    ></view>
     <signDialog ref="signDialog" @confirm="handlePopupConfirm"></signDialog>
   </view>
 </template>
@@ -148,7 +148,7 @@ import detail from "./components/detail.vue";
 export default {
   components: {
     signDialog,
-    detail
+    detail,
   },
   data() {
     return {
@@ -157,7 +157,7 @@ export default {
       baseInfo: {}, // 基础信息
       inspectionNumber: 0, // 已巡检的井道数量
       detailsInfo: {}, // 详情
-      detailsItem:{},
+      detailsItem: {},
       isDisable: false, // 禁用
       isSign: false, //签名状态
       isSubmit: 0, //提交状态
@@ -165,6 +165,7 @@ export default {
       options: {}, //存储数据
       backValue: "",
       all_data: [], //所有数据
+      jfType:"0",//机房类型
     };
   },
   computed: {
@@ -186,7 +187,7 @@ export default {
       this.init();
     }
     this.all_data = this.$store.state.all_data;
-    console.log("onShow",this.all_data)
+    console.log("onShow", this.all_data);
   },
   methods: {
     init() {
@@ -238,8 +239,13 @@ export default {
           this.cardsInfo = detailsInfo.originData;
           this.isSubmit = this.detailsInfo.isSubmit;
           this.isSign = this.detailsInfo.isSign;
-          this.detailsItem =  detailsInfo.originData[0].details;
-
+          this.detailsItem = detailsInfo.originData[0].details;
+          if (this.detailsItem.afxt.detail[2].inspectionResult === 1) {
+            this.detailsItem.afxt.detail = this.detailsItem.afxt.detail.slice(
+              0,
+              3
+            );
+          }
           const group1 = this.cardsInfo.slice(0, 5);
           const group2 = this.cardsInfo.slice(5, 10);
           const group3 = this.cardsInfo.slice(10);
@@ -259,9 +265,13 @@ export default {
         });
     },
     // 获取机房详情
-    getDetailsItem(location, jfType, value){
-      this.detailsItem =  this.detailsInfo.originData[value - 1].details;
-      console.log("this.detailsItem",this.detailsItem)
+    getDetailsItem(location, jfType, value) {
+      this.detailsItem = this.detailsInfo.originData[value - 1].details;
+      this.jfType =  this.detailsInfo.originData[value - 1].jfType
+      if (this.detailsItem.afxt.detail[2].inspectionResult === 1) {
+        this.detailsItem.afxt.detail = this.detailsItem.afxt.detail.slice(0, 3);
+      }
+      console.log("this.detailsItem", this.detailsItem);
     },
     // 跳转到具体的机房
     toShaftInspection(location, jfType, value) {
@@ -506,6 +516,7 @@ export default {
   border-radius: 0 0 9.6px 9.6px;
   padding: 12.8px 19.2px;
   height: calc(100vh - 225px);
+  // overflow: auto;
 }
 .card-row {
   display: flex;