From 2c714f69a9f661506ebed1a6d5e9eec3c7e42f7e Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Tue, 9 May 2023 16:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=B0=E5=BD=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionRecordDetail.js                 |  2 +-
 .../inspectionRecordDetail.json               |  6 +-
 .../inspectionRecordDetail.wxml               | 66 +++++++------------
 .../inspectionRecordDetail.wxss               | 14 ++--
 4 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.js b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.js
index 249cf3c..d1056fd 100644
--- a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.js
+++ b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.js
@@ -12,7 +12,7 @@ Page({
 
   handleChange(e) {
     this.setData({
-      activeValues: e.detail.value,
+      activeValues: e.detail,
     });
   },
 
diff --git a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.json b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.json
index a69b43b..c473dec 100644
--- a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.json
+++ b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.json
@@ -4,7 +4,9 @@
   "navigationBarTitleText": "巡检记录详情",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "t-collapse": "tdesign-miniprogram/collapse/collapse",
-    "t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel"
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-collapse": "@vant/weapp/collapse/index",
+    "van-collapse-item": "@vant/weapp/collapse-item/index"
   }
 }
\ No newline at end of file
diff --git a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxml b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxml
index fd8f1f9..fbf82df 100644
--- a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxml
+++ b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxml
@@ -1,45 +1,25 @@
 <!-- package/inspectionRecord/inspectionRecordDetail/inspectionRecordDetail.wxml -->
 <view class="page">
-  <view class='list'>
-    <view class='content'>
-      <view class='title'>结构物名称：</view>
-      <view class='value'>{{dataList.points.project.name}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>巡检人：</view>
-      <view class='value'>{{dataList.points.user.name}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>巡检单位：</view>
-      <view class='value'>{{dataList.points.user.department.name}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>巡检频次：</view>
-      <view class='value'>{{dataList.points.frequency}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>上次巡检日期：</view>
-      <view class='value'>{{dataList.lastInspectionTime}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>本次巡检日期：</view>
-      <view class='value'>{{dataList.inspectionTime}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>巡检结果：</view>
-      <view class='value'>{{dataList.alarm ? '异常' : '正常'}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>当前点位：</view>
-      <view class='value'>{{dataList.points.itemData.name}}</view>
-    </view>
-    <view class='content'>
-      <view class='title'>当前位置：</view>
-      <view class='value'>{{dataList.points.address}}</view>
-    </view>
-    <t-collapse value="{{activeValues}}" bind:change="handleChange">
+  <van-cell-group>
+    <van-cell size="large" title="结构物名称：" value="{{dataList.points.project.name}}" />
+    <van-cell size="large" title="巡检人：" value="{{dataList.points.user.name}}" />
+    <van-cell size="large" title="巡检单位：" value="{{dataList.points.user.department.name}}" />
+    <van-cell size="large" title="巡检频次：" value="{{dataList.points.frequency}}" />
+    <van-cell size="large" title="上次巡检日期：" value="{{dataList.lastInspectionTime}}" />
+    <van-cell size="large" title="本次巡检日期：" value="{{dataList.inspectionTime}}" />
+    <van-cell size="large" title="巡检结果：" value="{{dataList.alarm ? '异常' : '正常'}}" style="--cell-value-color: {{dataList.alarm ? '#FF0000' : '#006BE3'}}" />
+    <van-cell size="large" title="当前点位：" value="{{dataList.points.itemData.name}}" />
+    <van-cell size="large" title="当前位置：" value="{{dataList.points.address}}" title-width="80px" />
+  </van-cell-group>
+  <view style="margin-top: 16px">
+    <van-collapse value="{{ activeValues }}" bind:change="handleChange">
       <view wx:for="{{dataList.points.inspectContent}}" wx:key="key" wx:for-index="key" wx:for-item="value">
-        <t-collapse-panel header="{{key + '： ' + (value.isNormal ? '正常' : '异常')}}" value="{{key}}" expandIcon disabled="{{value.isNormal}}">
+        <van-collapse-item
+          title="{{key}}"
+          value="{{value.isNormal ? '正常' : '异常'}}"
+          style="--cell-value-color: {{value.isNormal ? '#006BE3' : '#FF0000'}}; --collapse-item-title-disabled-color: #323233"
+          disabled="{{value.isNormal}}"
+        >
           <view class='content'>
             <view class='title'>描述：</view>
             <view class='value'>{{value.msgInp || '--'}}</view>
@@ -48,14 +28,14 @@
             <view class='title'>异常等级：</view>
             <view class='value'>{{value.level || '--'}}</view>
           </view>
-          <view class='title'>巡检图片：</view>
+          <view class='content'>巡检图片：</view>
           <view class="img-v weui-uploader__bd" style="overflow:hidden;">
             <view class='pic' wx:for="{{value.imgs}}" wx:for-item="item" wx:key="*this">
-              <image class='weui-uploader__img showImg' src="{{imgUrl + item}}" data-img="{{imgUrl + item}}" data-index="{{index}}" data-key="{{key}}"  mode="aspectFill" bindtap="previewImg"></image>
+              <image class='weui-uploader__img showImg' src="{{imgUrl + item}}" data-img="{{imgUrl + item}}" data-index="{{index}}" data-key="{{key}}" mode="aspectFill" bindtap="previewImg"></image>
             </view>
           </view>
-        </t-collapse-panel>
+        </van-collapse-item>
       </view>
-    </t-collapse>
+    </van-collapse>
   </view>
 </view>
\ No newline at end of file
diff --git a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxss b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxss
index 76419af..d8920a8 100644
--- a/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxss
+++ b/weapp/package/polling/inspectionRecordDetail/inspectionRecordDetail.wxss
@@ -3,10 +3,6 @@ page {
   background-color: #F7F7FA;
 }
 
-.page {
-  padding: 30rpx;
-}
-
 .header-item-container {
   width: 100%;
   height: 180rpx;
@@ -52,7 +48,8 @@ page {
 .content {
   width: 100%;
   overflow: hidden;
-  margin-bottom: 30rpx;
+  margin-bottom: 20rpx;
+  font-size: 14px;
 }
 
 .title {
@@ -60,9 +57,8 @@ page {
 }
 
 .value {
-  float: left;
+  float: right;
   text-align: justify;
-  width: 400rpx;
   word-break: break-word;
 }
 
@@ -76,4 +72,8 @@ page {
 .showImg {
   width: 160rpx;
   height: 160rpx;
+}
+
+.page .van-icon-arrow {
+  color: #9699a6 !important;
 }
\ No newline at end of file