提交

pages/inspectionContent/components/dialog.vue

@@ -11,7 +11,7 @@
         >
       </view><view class="row-item bottom-row">
         <view v-if="!startDialogData.isList" class="button btn" @click="backList">返回巡检列表</view>
-        <view class="button" @click="confirmSignature">我已到达</view>
+        <view v-if="!startDialogData.isLast" class="button" @click="confirmSignature">我已到达</view>
       </view>
 
       <!-- 关闭按钮 -->

pages/inspectionContent/inspectionContentList.vue

@@ -40,7 +40,7 @@
         </view>
       </view>
     </view>
-    <view class="box" v-if="!isSign" >
+    <view class="box" v-if="!isSign">
       <view class="bar">
         <view class="title"> 巡检进度 </view>
         <view class="dai">
@@ -159,7 +159,7 @@
       </view>
       <detail ref="detail" :jfType="jfType" :detailsItem="detailsItem"></detail
     ></view>
-    <view class="submit-module">
+    <view v-if="!isSign" class="submit-module">
       <view class="action-btn" @click="startDialogBtn()">开始巡检</view>
     </view>
     <signDialog ref="signDialog" @confirm="handlePopupConfirm"></signDialog>
@@ -321,7 +321,8 @@ export default {
           this.isSubmit = this.detailsInfo.isSubmit;
           this.isSign = this.detailsInfo.isSign;
           this.detailsItem = detailsInfo.originData[0].details;
-          if (this.detailsItem.afxt.detail[2].inspectionResult === 1) {
+          console.log(12121)
+          if (this.detailsItem.afxt && this.detailsItem.afxt.detail && this.detailsItem.afxt.detail[2].inspectionResult === 1) {
             this.detailsItem.afxt.detail = this.detailsItem.afxt.detail.slice(
               0,
               3
@@ -400,6 +401,7 @@ export default {
     },
     // 跳转到具体的机房
     toShaftInspection(name, jfType, value) {
+      console.log("name, 跳转到具体的机房, value",name, jfType, value)
       uni.navigateTo({
         url: `/pages/inspectionContent/inspectionContentNew?value=${value}&inspectionCode=${this.inspectionCode}&jfType=${jfType}&location=${name}&uid=${this.uid}&backValue=${this.backValue}`,
       });
@@ -682,6 +684,8 @@ export default {
   padding: 12.8px 19.2px;
   height: calc(100vh - 232px - 19.2px);
   &.detail {
+    height: calc(100vh - 200px);
+    border-radius: 9.6px;
     overflow: auto;
     .card-wrapper {
       width: calc((100% - 4 * 12.8px) / 5); /* 严格五等分宽度 */
@@ -809,12 +813,11 @@ export default {
     width: 145.6px;
     height: 38.4px;
     line-height: 38.4px;
-    background: #ffffff;
-    border: 0.8px solid rgba(224, 224, 224, 1);
+    background-image: linear-gradient(180deg, #3773f6 0%, #2c57f6 99%);
     box-shadow: 0px 8px 19.2px 0px rgba(185, 185, 185, 0.24);
     border-radius: 21.6px 19.2px 19.2px 21.6px;
     font-size: 16px;
-    color: #000000;
+    color: #fff;
     text-align: center;
     font-weight: 400;
 

pages/inspectionContent/inspectionContentNew.vue

@@ -242,7 +242,9 @@ export default {
     this.inspectionCode = options.inspectionCode;
     this.backValue = options.backValue || "";
     this.tabs =
-      this.jfType === "2" || this.jfType === "3" ? this.deepClone(tabsInfo2) : this.deepClone(tabsInfo1);
+      this.jfType === "2" || this.jfType === "3"
+        ? this.deepClone(tabsInfo2)
+        : this.deepClone(tabsInfo1);
     console.log("机房查看options", options);
     if (options.uid) {
       this.getDetails(options.uid);
@@ -293,7 +295,10 @@ export default {
           this.list = detailsInfo.originData[this.value - 1].details;
           console.log("查看list", this.list);
           this.tabs.forEach((item) => {
-            if (this.list[item.value] && this.list[item.value].status !== undefined) {
+            if (
+              this.list[item.value] &&
+              this.list[item.value].status !== undefined
+            ) {
               item.status = this.list[item.value].status;
             }
           });
@@ -536,6 +541,7 @@ export default {
     },
     startDialog() {
       let allIsSubmitOne = this.listData.every((item) => item.isSubmit === 1);
+      this.allIsSubmitOne = allIsSubmitOne;
       console.log("是否全部完成", allIsSubmitOne);
       console.log("this.listData", this.listData);
       let item = this.findTargetObject(this.listData);
@@ -554,6 +560,7 @@ export default {
           `本次巡检任务已全部完成，`,
           "请“返回巡检列表”进行签名及数据同步",
         ];
+        this.startDialogData.isLast = true;
       }
       this.$refs.startDialog.open();
     },