Merge branch 'dt pusev' of https://git.yfzx.zjtys.com.cn/privateNetwork/inspection-pad-web into dev

api/inspect.js

@@ -284,7 +284,7 @@ LIMIT 1;`
       let sql = `UPDATE ${table.inspectionRecordName} SET 
             signImg = '${data.signImg}',
 			synFlag = '${data.synFlag}',
-			isException = '${data.isException}',
+			isException = '${data.isException}'
             WHERE id = ${data.id}`;
       await sqllitedb.executeSQL(sql);
     } catch (e) {

pages/inspectionContent/inspectionContentList.vue

@@ -27,10 +27,22 @@
             ></image>
           </view>
           <view class="info">
+            <view class="describe">
               <view class="username">{{ userInfo.user }}</view>
+              <view v-if="abnormalLengths" class="abnormal"
+                >存在异常 {{ abnormalLengths }} 项</view
+              >
+            </view>
+            <view class="describe">
               <view class="number"
                 >巡检编号：<text class="value">{{ inspectionCode }}</text></view
               >
+              <view v-if="!!isSign" class="number"
+                >巡检时间：<text class="value">
+                  {{ updateDate }}
+                </text></view
+              >
+            </view>
           </view>
         </view>
         <!-- v-if="allIsSubmitOne" -->
@@ -284,6 +296,14 @@ export default {
     userInfo() {
       return this.$store.state.now_user || {};
     },
+    updateDate() {
+      return moment(
+        Number(this.detailsInfo.updateTime || this.detailsInfo.createTime)
+      ).format("YYYY-MM-DD");
+    },
+    abnormalLengths() {
+      return this.detailsInfo?.originData?.filter((t) => t.status === 2).length;
+    },
   },
   onLoad(options) {
     this.options = options;
@@ -774,6 +794,7 @@ export default {
           line-height: 22.4px;
           font-weight: 500;
           margin-bottom: 7.2px;
+          margin-right: 10px;
         }
 
         .number {
@@ -781,11 +802,23 @@ export default {
           color: #4a4a4a;
           line-height: 22.4px;
           font-weight: 400;
-
+          margin-right: 9.6px;
           .value {
             color: #000000;
           }
         }
+        .describe {
+          display: flex;
+          .abnormal {
+            color: #fff;
+            line-height: 22.4px;
+            height: 22.4px;
+            padding: 0 8px;
+            font-size: 12px;
+            background-color: #f55a42;
+            border-radius: 11px;
+          }
+        }
       }
     }
     .profile-right {

pages/shaftInspection/shaftInspectionList.vue

@@ -29,10 +29,22 @@
             ></image>
           </view>
           <view class="info">
+            <view class="describe">
               <view class="username">{{ userInfo.user }}</view>
+              <view v-if="isSign && abnormalLengths" class="abnormal"
+                >存在异常 {{ abnormalLengths }} 项</view
+              >
+            </view>
+            <view class="describe">
               <view class="number"
                 >巡检编号：<text class="value">{{ inspectionCode }}</text></view
               >
+              <view v-if="isSign" class="number"
+                >巡检时间：<text class="value">
+                  {{ updateDate }}
+                </text></view
+              >
+            </view>
           </view>
         </view>
         <!-- {{ isSubmit }} {{ isSign }} -->
@@ -52,7 +64,12 @@
             v-else-if="detailsInfo.synchronization != 1"
             class="action-container"
           >
-            <image class="sign-img" :src="detailsInfo.signImg" mode="aspectFit">
+            <image
+              class="sign-img"
+              :src="detailsInfo.signImg"
+              mode="aspectFit"
+              @click="previewImage([detailsInfo.signImg], 0)"
+            >
             </image>
             <button class="record-button small" @click="toSign">重签</button>
             <view class="inspection-button" @click="openDialog(true)"
@@ -131,9 +148,14 @@
                     <text v-if="position.isSubmit === 0" class="status-text"
                       >草稿</text
                     >
-                    <text v-else class="status-text">{{
-                      position.statusLable
-                    }}</text>
+                    <text
+                      v-else
+                      :class="{
+                        'status-text': true,
+                        error: position.status == 2,
+                      }"
+                      >{{ position.statusLable }}</text
+                    >
                   </view>
                   <view class="info-line">
                     <text class="info-text"
@@ -198,9 +220,14 @@
                     <text v-if="position.isSubmit === 0" class="status-text"
                       >草稿</text
                     >
-                    <text v-else class="status-text">{{
-                      position.statusLable
-                    }}</text>
+                    <text
+                      v-else
+                      :class="{
+                        'status-text': true,
+                        error: position.status == 2,
+                      }"
+                      >{{ position.statusLable }}</text
+                    >
                   </view>
                   <view class="info-line">
                     <text class="info-text"
@@ -294,6 +321,18 @@ export default {
       const { uid, createByName } = this.detailsInfo;
       return !uid || (uid && createByName == this.userInfo.user);
     },
+    abnormalLengths() {
+      let allPoints = this.detailsInfo.originData.reduce((acc, cur) => {
+        acc.push(...cur.position);
+        return acc;
+      }, []);
+      return allPoints.filter((point) => point.status === 2).length;
+    },
+    updateDate() {
+      return moment(
+        Number(this.detailsInfo.updateTime || this.detailsInfo.createTime)
+      ).format("YYYY-MM-DD");
+    },
   },
   onLoad(options) {
     this.options = options;
@@ -417,6 +456,7 @@ export default {
               return acc;
             }, [])
             .every((pos) => pos.isSubmit === "" || pos.isSubmit === 1);
+          console.log(this.detailsInfo);
           this.isSign = !!this.detailsInfo.signImg;
           this.cardsInfo.forEach((item) => {
             this.tabs.push(item.name);
@@ -458,10 +498,10 @@ export default {
     handlePopupConfirm(summary) {
       this.detailsInfo.isSign = this.isSign = true; // 回显到文字显示区域
       this.detailsInfo.signImg = summary; // 回显到文字显示区域
-      // const isException = this.detailsInfo.originData.some(
-      //   (item) => item.status == 2
-      // );
-      // this.detailsInfo.isException = isException ? 1 : 0; // 巡检异常
+      const isException = this.detailsInfo.originData.some(
+        (item) => item.status == 2
+      );
+      this.detailsInfo.isException = isException ? 1 : 0; // 巡检异常
       this.submit(
         "sign",
         this.detailsInfo.signImg,
@@ -548,6 +588,12 @@ export default {
       }
       this.showSyncDialog = val;
     },
+    previewImage(images, index) {
+      uni.previewImage({
+        current: index,
+        urls: images,
+      });
+    },
   },
 };
 </script>
@@ -638,6 +684,7 @@ export default {
             line-height: 22.4px;
             font-weight: 500;
             margin-bottom: 7.2px;
+            margin-right: 10px;
           }
 
           .number {
@@ -645,11 +692,23 @@ export default {
             color: #4a4a4a;
             line-height: 22.4px;
             font-weight: 400;
-
+            margin-right: 9.6px;
             .value {
               color: #000000;
             }
           }
+          .describe {
+            display: flex;
+            .abnormal {
+              color: #fff;
+              line-height: 22.4px;
+              height: 22.4px;
+              padding: 0 8px;
+              font-size: 12px;
+              background-color: #f55a42;
+              border-radius: 11px;
+            }
+          }
         }
       }
 
@@ -864,6 +923,9 @@ export default {
                     text-align: center;
                     line-height: 16.5px;
                     font-weight: 400;
+                    &.error {
+                      color: #f55a42;
+                    }
                   }
                 }