feat: update

pages/home/home.vue

@@ -2,14 +2,17 @@
   <!-- 首页 -->
   <view class="container">
     <view class="flex">
-      <navigator url="/pages/test/index" hover-class="navigator-hover">
-        <button type="default" class="uni-btn">跳转TEST</button>
+      <navigator
+        url="/pages/inspectionContent/inspectionContentList?uid=15"
+        hover-class="navigator-hover"
+      >
+        <button type="default" class="uni-btn">15</button>
       </navigator>
       <navigator
-        url="/pages/inspectionContent/inspectionContentList?uid=1"
+        url="/pages/inspectionContent/inspectionContentList?uid=16"
         hover-class="navigator-hover"
       >
-        <button type="default" class="uni-btn">测试巡检</button>
+        <button type="default" class="uni-btn">16</button>
       </navigator>
     </view>
     <!-- 第一个模块 -->

pages/inspectionContent/components/detail.vue

@@ -40,7 +40,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -84,7 +85,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -109,16 +111,14 @@
               ></view
             >
             <view class="list">
-              <view class="label">{{item.settingLabelShow}}：</view>
+              <view class="label">{{ item.settingLabelShow }}：</view>
               <view class="content">
                 {{ item.setting }}
               </view>
             </view>
             <view class="list">
-              <view class="label">{{item.sjLabelShow}}：</view>
-              <view class="content">
-                {{ item.value }}{{item.unit}}
-              </view>
+              <view class="label">{{ item.sjLabelShow }}：</view>
+              <view class="content"> {{ item.value }}{{ item.unit }} </view>
             </view>
             <view class="list">
               <view class="label">现场照片：</view>
@@ -131,7 +131,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -180,7 +181,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -205,16 +207,12 @@
               ></view
             >
             <view class="list">
-              <view class="label">{{item.settingLabel}}：</view>
-              <view class="content">
-                {{ item.setting }}{{item.unit}}
-              </view>
+              <view class="label">{{ item.settingLabel }}：</view>
+              <view class="content"> {{ item.setting }}{{ item.unit }} </view>
             </view>
             <view class="list">
-              <view class="label">{{item.sjLabel}}：</view>
-              <view class="content">
-                {{ item.value }}{{item.unit}}
-              </view>
+              <view class="label">{{ item.sjLabel }}：</view>
+              <view class="content"> {{ item.value }}{{ item.unit }} </view>
             </view>
             <view class="list">
               <view class="label">现场照片：</view>
@@ -227,7 +225,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -268,7 +267,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -285,8 +285,8 @@
             class="cards-item"
           >
             <view class="name"
-              >{{ item.label
-              }}{{index ===0 ? `(${item.setting})`:''}}<text
+              >{{ item.label }}{{ index === 0 ? `(${item.setting})` : ""
+              }}<text
                 class="status"
                 :class="{ warning: item.inspectionResult === 1 }"
                 >{{ item.inspectionResultLable }}</text
@@ -309,7 +309,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -350,7 +351,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -383,7 +385,8 @@
                   :key="urlIndex"
                   class="image-item"
                   :src="url"
-                  mode="center"
+                  mode="aspectFit"
+                  @click="previewImage(item.photos, urlIndex)"
                 ></image>
               </view>
             </view>
@@ -409,7 +412,14 @@ export default {
   mounted() {
     console.log("this.detailsItem", this.detailsItem);
   },
-  methods: {},
+  methods: {
+    previewImage(images, index) {
+      uni.previewImage({
+        current: index,
+        urls: images,
+      });
+    },
+  },
 };
 </script>
 
@@ -490,7 +500,7 @@ export default {
               font-weight: 400;
               display: flex;
               flex-wrap: nowrap;
-              justify-content: space-between;
+              // justify-content: space-between;
               .image-item {
                 width: 57.6px;
                 height: 57.6px;
@@ -504,4 +514,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

pages/inspectionContent/inspectionContentList.vue

@@ -41,7 +41,9 @@
           <div v-else style="display: flex">
             <image
               style="width: 120px; height: 40px"
+              mode="aspectFit"
               :src="detailsInfo.signImg"
+              @click="previewImage([detailsInfo.signImg], 0)"
             ></image>
             <button class="record-button" @click="toSign">重签</button>
           </div>
@@ -257,16 +259,19 @@ export default {
     this.value = this.options.value || "1";
   },
   onShow() {
-    if (this.uid) {
-      this.getRoomList().then((res) => {
-        this.init(res).then(() => {
-          this.getDetails(this.uid);
+    // 已经签名不触发更新，主要用于图片预览关闭后会触发onShow
+    if (!this.isSign) {
+      if (this.uid) {
+        this.getRoomList().then((res) => {
+          this.init(res).then(() => {
+            this.getDetails(this.uid);
+          });
         });
-      });
-    } else {
-      this.getRoomList().then((res) => {
-        this.init(res);
-      });
+      } else {
+        this.getRoomList().then((res) => {
+          this.init(res);
+        });
+      }
     }
 
     // this.startDialogData.text = [
@@ -577,6 +582,12 @@ export default {
         });
       }
     },
+    previewImage(images, index) {
+      uni.previewImage({
+        current: index,
+        urls: images,
+      });
+    },
   },
 };
 </script>

pages/inspectionContent/shared.js

@@ -63,6 +63,7 @@ export function sqlToData(sqlData) {
     originData,
     inspectionNumber,
     allIsSubmitOne,
+    isSign: !!sqlData.signImg,
   };
 
   return ret;