From 264053bd7e466b4a1393ad1bcebc75918fa12cdd Mon Sep 17 00:00:00 2001
From: liyuanchao <438964165@qq.com>
Date: Mon, 25 Aug 2025 13:43:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=A7=E5=9B=BE=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workbench/earlyWarning/earlyWarning.vue   | 24 +++++++++---------
 pages/sys/workbench/order/orderDetail.vue     | 25 +++++++++++++------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/pages/sys/workbench/earlyWarning/earlyWarning.vue b/pages/sys/workbench/earlyWarning/earlyWarning.vue
index 418efa2..8d60266 100644
--- a/pages/sys/workbench/earlyWarning/earlyWarning.vue
+++ b/pages/sys/workbench/earlyWarning/earlyWarning.vue
@@ -40,7 +40,7 @@
           <view class="warn-info">预警位置：{{ item.deviceGroupName }}</view>
           <view class="warn-info">预警时间：{{ item.reportTime }}</view>
           <view class="warn-info">预警设备：{{ item.deviceName }}</view>
-          <view v-if="[20, 30, 31, 32].includes(item.state)" class="warn-eval-wrap" @click.stop="goDetail(item)">
+          <view v-if="[20, 30, 31, 32].includes(item.state)" class="warn-eval-wrap">
             <view class="warn-eval-btn">去处理</view>
           </view>
         </view>
@@ -141,17 +141,17 @@
 				this.tabLoaded[idx] = true;
 				this.loading = false;
 			},
-			goDetail(item) {
-				const itemStr = encodeURIComponent(JSON.stringify(item));
-				uni.navigateTo({
-					url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr,
-				});
-			},
-			goDetail2(item) {
-				const itemStr = encodeURIComponent(JSON.stringify(item));
-				uni.navigateTo({
-					url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr + "&pageType=detail",
-				});
+			goDetail2(item) {
+				const itemStr = encodeURIComponent(JSON.stringify(item));
+				if([20, 30, 31, 32].includes(item.state)){
+					uni.navigateTo({
+						url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr,
+					});
+				}else{
+					uni.navigateTo({
+						url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr + "&pageType=detail",
+					});
+				}
 			},
 			goStatistics() {
 				uni.navigateTo({
diff --git a/pages/sys/workbench/order/orderDetail.vue b/pages/sys/workbench/order/orderDetail.vue
index c983582..54f15bd 100644
--- a/pages/sys/workbench/order/orderDetail.vue
+++ b/pages/sys/workbench/order/orderDetail.vue
@@ -29,10 +29,17 @@
 			<view class="detail-value remark"><text>备注：</text>{{ detail.remark }}</view>
 			<view class="detail-value"><text class="detail-key">工单图片：</text></view>
 			<view class="image-list" v-if="orderImgUrls.length > 0">
-				<u-image v-for="(imgUrl, index) in orderImgUrls" :key="index" :src="imgUrl"
-					width="200rpx" height="200rpx" border-radius="10rpx"
+				<u-image 
+					v-for="(imgUrl, index) in orderImgUrls" 
+					:key="index" 
+					:src="imgUrl"
+					width="200rpx" 
+					height="200rpx" 
+					border-radius="10rpx"
 					@click="previewImage(orderImgUrls, index)"
-					style="margin-right: 20rpx; margin-bottom: 20rpx;"></u-image>
+					style="margin-right: 20rpx; margin-bottom: 20rpx;"
+					mode="aspectFill"
+				></u-image>
 			</view>
 
 		</view>
@@ -123,10 +130,14 @@
 			},
 			previewImage(urls, index) {
 				// 使用uView的图片预览组件
-				this.$u.previewImage({
-					urls: urls.filter(url => url.trim() !== ''),
-					current: index
-				});
+				  // 过滤掉空值
+				  const validUrls = urls.filter(url => url && url.trim() !== '')
+				  uni.previewImage({
+				    urls: validUrls,
+				    current: validUrls[index], // current 必须是 url，而不是索引
+				    indicator: 'number', // 显示数字指示器
+				    backgroundColor: '#000'
+				  })
 			},
 			async onConfirm(selected) {
 				let params = this.detail