From 07337d6f204dab0acf25e5835e528a60de3f09bd Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Wed, 10 May 2023 18:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=B7=A1=E6=A3=80UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionInput/inspectionInput.json      |  3 -
 .../startInspection/startInspection.json      |  4 +-
 .../startInspection/startInspection.wxml      | 75 ++++++-------------
 .../startInspection/startInspection.wxss      | 34 +++++++--
 4 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/weapp/package/inspectionInput/inspectionInput.json b/weapp/package/inspectionInput/inspectionInput.json
index e4ba6c1..b38e920 100644
--- a/weapp/package/inspectionInput/inspectionInput.json
+++ b/weapp/package/inspectionInput/inspectionInput.json
@@ -9,9 +9,6 @@
     "t-cell": "tdesign-miniprogram/cell/cell",
     "t-picker": "tdesign-miniprogram/picker/picker",
     "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
-    "van-cell": "@vant/weapp/cell/index",
-    "van-cell-group": "@vant/weapp/cell-group/index",
-    "van-icon": "@vant/weapp/icon/index",
     "van-radio": "@vant/weapp/radio/index",
     "van-radio-group": "@vant/weapp/radio-group/index"
   }
diff --git a/weapp/package/startInspection/startInspection.json b/weapp/package/startInspection/startInspection.json
index 46db035..be4d517 100644
--- a/weapp/package/startInspection/startInspection.json
+++ b/weapp/package/startInspection/startInspection.json
@@ -8,6 +8,8 @@
     "t-cell-group": "tdesign-miniprogram/cell-group/cell-group",
     "t-cell": "tdesign-miniprogram/cell/cell",
     "t-picker": "tdesign-miniprogram/picker/picker",
-    "t-picker-item": "tdesign-miniprogram/picker-item/picker-item"
+    "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index"
   }
 }
\ No newline at end of file
diff --git a/weapp/package/startInspection/startInspection.wxml b/weapp/package/startInspection/startInspection.wxml
index 979e8e7..d61e2bf 100644
--- a/weapp/package/startInspection/startInspection.wxml
+++ b/weapp/package/startInspection/startInspection.wxml
@@ -1,5 +1,5 @@
 <!-- package/startInspection/startInspection.wxml -->
-<view class="box">
+<view class="page">
   <view class="plan-list" wx:if="{{planList}}">
     <t-cell class="block" title="选择巡检计划" arrow hover note="{{planListText}}" bind:click="onPlanListPicker" />
     <t-picker visible="{{planListVisible}}" value="{{planListValue}}" data-key="planList" title="选择巡检计划" cancelBtn="取消" confirmBtn="确认" bindchange="onPickerChange" bindcancel="onPickerCancel">
@@ -7,59 +7,26 @@
     </t-picker>
   </view>
   <view class="titleFirst">巡检要求</view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">结构物名称</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.project.name}}</view>
-  </view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">开始时间</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.startTime}}</view>
-  </view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">结束时间</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.endTime}}</view>
-  </view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">巡检方式</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.way}}</view>
-  </view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">巡检频次</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.frequency}}</view>
-  </view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">巡检人</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.showUsers}}</view>
-  </view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">巡检单位</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.showDepts}}</view>
-  </view>
-  <view class="txt">
-    <view style="float: left;font-weight: bold;">巡检点位</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{points}}</view>
-  </view>
-  <view class="line"></view>
-  <view class="titleFirst">巡检结果录入</view>
-  <block wx:for="{{dataList.points}}" wx:key="*this">
-    <view style="margin-bottom: 60rpx;">
-      <view class="txt" style="margin-bottom: 20rpx;">
-        <view style="float: left;font-weight: bold;">巡检点位</view>
-        <view style="float:left;width:55%;margin-left:40rpx;">{{item.name}}</view>
-        <view class="startBtn" data-itemData="{{item}}" bindtap="showModal">开始巡检</view>
-      </view>
-      <view class="txt" style="margin-bottom: 20rpx;">
-        <view style="float: left;font-weight: bold;">上次巡检日期</view>
-        <view style="float:left;width:55%;margin-left:40rpx;">{{item.lastInspectionTime}}</view>
-      </view>
-      <view class="txt" style="margin-bottom: 20rpx;">
-        <view style="float: left;font-weight: bold;">巡检人</view>
-        <view style="float:left;width:55%;margin-left:40rpx;">{{dataList.showUsers}}</view>
-      </view>
-      <view class="txt" style="margin-bottom: 20rpx;">
-        <view style="float: left;font-weight: bold;">本次巡检日期</view>
-        <view style="float:left;width:55%;margin-left:40rpx;">{{item.inspectionTime}}</view>
-      </view>
+  <van-cell-group>
+    <van-cell size="large" title="结构物名称：" value="{{dataList.project.name}}" />
+    <van-cell size="large" title="开始时间：" value="{{dataList.startTime}}" />
+    <van-cell size="large" title="结束时间：" value="{{dataList.endTime}}" />
+    <van-cell size="large" title="巡检方式：" value="{{dataList.way}}" />
+    <van-cell size="large" title="巡检频次：" value="{{dataList.frequency}}" />
+    <van-cell size="large" title="巡检人：" value="{{dataList.showUsers}}" />
+    <van-cell size="large" title="巡检单位：" value="{{dataList.showDepts}}" />
+    <van-cell size="large" title="巡检点位：" value="{{points}}" />
+  </van-cell-group>
+  <view class="titleTwo">巡检结果录入</view>
+  <block wx:for="{{dataList.points}}" wx:key="*this" class="entering">
+    <van-cell-group>
+      <van-cell title="巡检点位：" value="{{item.name}}" />
+      <van-cell title="上次巡检日期：" value="{{item.lastInspectionTime}}" />
+      <van-cell title="巡检人：" value="{{dataList.showUsers}}" />
+      <van-cell title="本次巡检日期：" value="{{item.inspectionTime}}" />
+    </van-cell-group>
+    <view class="flex-end btn-box">
+      <view class="startBtn" data-itemData="{{item}}" bindtap="showModal">开始巡检</view>
     </view>
   </block>
   <!-- 开始巡检弹框 -->
diff --git a/weapp/package/startInspection/startInspection.wxss b/weapp/package/startInspection/startInspection.wxss
index 044f87c..d6fba7c 100644
--- a/weapp/package/startInspection/startInspection.wxss
+++ b/weapp/package/startInspection/startInspection.wxss
@@ -1,8 +1,14 @@
 /* package/startInspection/startInspection.wxss */
-.box {
-  width: 696rpx;
+.page {
+  width: 100%;
   margin: 0 auto;
   padding: 30rpx 0;
+  background-color: #F7F7FA;
+}
+
+.flex-end {
+  display: flex;
+  justify-content: flex-end;
 }
 
 .plan-list {
@@ -13,6 +19,12 @@
 .titleFirst {
   font-size: 32rpx;
   margin-bottom: 30rpx;
+  margin-left: 30rpx;
+}
+
+.titleTwo {
+  font-size: 32rpx;
+  margin: 30rpx;
 }
 
 .txt {
@@ -31,12 +43,20 @@
 }
 
 .startBtn {
-  float: right;
+  width: 52px;
+  height: 18px;
   padding: 10rpx 20rpx;
-  background: #1979ff;
+  background: #1684FF;
+  border-radius: 16px;
   color: #fff;
-  border-radius: 10rpx;
   font-size: 26rpx;
+  margin: 10px 12px 10px;
+}
+
+.btn-box {
+  background: #fff;
+  width: 100%;
+  margin-bottom: 16px;
 }
 
 .modal {
@@ -114,4 +134,8 @@
 
 .block {
   display: block;
+}
+
+.entering {
+  padding: 30rpx;
 }
\ No newline at end of file