free-sun
/
Inspection
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

开始巡检UI

master
liujiangyong 1 year ago
parent
7af91ea37b
commit
07337d6f20
4 changed files with 53 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      weapp/package/inspectionInput/inspectionInput.json
  2. 4
      weapp/package/startInspection/startInspection.json
  3. 75
      weapp/package/startInspection/startInspection.wxml
  4. 34
      weapp/package/startInspection/startInspection.wxss

3
weapp/package/inspectionInput/inspectionInput.json
View File

@ -9,9 +9,6 @@
"t-cell": "tdesign-miniprogram/cell/cell", "t-cell": "tdesign-miniprogram/cell/cell",
"t-picker": "tdesign-miniprogram/picker/picker", "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",
"van-icon": "@vant/weapp/icon/index",
"van-radio": "@vant/weapp/radio/index", "van-radio": "@vant/weapp/radio/index",
"van-radio-group": "@vant/weapp/radio-group/index" "van-radio-group": "@vant/weapp/radio-group/index"
} }

4
weapp/package/startInspection/startInspection.json
View File

@ -8,6 +8,8 @@
"t-cell-group": "tdesign-miniprogram/cell-group/cell-group", "t-cell-group": "tdesign-miniprogram/cell-group/cell-group",
"t-cell": "tdesign-miniprogram/cell/cell", "t-cell": "tdesign-miniprogram/cell/cell",
"t-picker": "tdesign-miniprogram/picker/picker", "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"
} }
} }

75
weapp/package/startInspection/startInspection.wxml
View File

@ -1,5 +1,5 @@
<!-- package/startInspection/startInspection.wxml --> <!-- package/startInspection/startInspection.wxml -->
<view class="box"> <view class="page">
<view class="plan-list" wx:if="{{planList}}"> <view class="plan-list" wx:if="{{planList}}">
<t-cell class="block" title="选择巡检计划" arrow hover note="{{planListText}}" bind:click="onPlanListPicker" /> <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"> <t-picker visible="{{planListVisible}}" value="{{planListValue}}" data-key="planList" title="选择巡检计划" cancelBtn="取消" confirmBtn="确认" bindchange="onPickerChange" bindcancel="onPickerCancel">
@ -7,59 +7,26 @@
</t-picker> </t-picker>
</view> </view>
<view class="titleFirst">巡检要求</view> <view class="titleFirst">巡检要求</view>
<view class="txt"> <van-cell-group>
<view style="float: left;font-weight: bold;">结构物名称</view> <van-cell size="large" title="结构物名称：" value="{{dataList.project.name}}" />
<view style="float:left;width:70%;margin-left:40rpx;">{{dataList.project.name}}</view> <van-cell size="large" title="开始时间：" value="{{dataList.startTime}}" />
</view> <van-cell size="large" title="结束时间：" value="{{dataList.endTime}}" />
<view class="txt"> <van-cell size="large" title="巡检方式：" value="{{dataList.way}}" />
<view style="float: left;font-weight: bold;">开始时间</view> <van-cell size="large" title="巡检频次：" value="{{dataList.frequency}}" />
<view style="float:left;width:70%;margin-left:40rpx;">{{dataList.startTime}}</view> <van-cell size="large" title="巡检人：" value="{{dataList.showUsers}}" />
</view> <van-cell size="large" title="巡检单位：" value="{{dataList.showDepts}}" />
<view class="txt"> <van-cell size="large" title="巡检点位：" value="{{points}}" />
<view style="float: left;font-weight: bold;">结束时间</view> </van-cell-group>
<view style="float:left;width:70%;margin-left:40rpx;">{{dataList.endTime}}</view> <view class="titleTwo">巡检结果录入</view>
</view> <block wx:for="{{dataList.points}}" wx:key="*this" class="entering">
<view class="txt"> <van-cell-group>
<view style="float: left;font-weight: bold;">巡检方式</view> <van-cell title="巡检点位：" value="{{item.name}}" />
<view style="float:left;width:70%;margin-left:40rpx;">{{dataList.way}}</view> <van-cell title="上次巡检日期：" value="{{item.lastInspectionTime}}" />
</view> <van-cell title="巡检人：" value="{{dataList.showUsers}}" />
<view class="txt"> <van-cell title="本次巡检日期：" value="{{item.inspectionTime}}" />
<view style="float: left;font-weight: bold;">巡检频次</view> </van-cell-group>
<view style="float:left;width:70%;margin-left:40rpx;">{{dataList.frequency}}</view> <view class="flex-end btn-box">
</view> <view class="startBtn" data-itemData="{{item}}" bindtap="showModal">开始巡检</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>
</view> </view>
</block> </block>
<!-- 开始巡检弹框 --> <!-- 开始巡检弹框 -->

34
weapp/package/startInspection/startInspection.wxss
View File

@ -1,8 +1,14 @@
/* package/startInspection/startInspection.wxss */ /* package/startInspection/startInspection.wxss */
.box { .page {
width: 696rpx; width: 100%;
margin: 0 auto; margin: 0 auto;
padding: 30rpx 0; padding: 30rpx 0;
background-color: #F7F7FA;
}
.flex-end {
display: flex;
justify-content: flex-end;
} }
.plan-list { .plan-list {
@ -13,6 +19,12 @@
.titleFirst { .titleFirst {
font-size: 32rpx; font-size: 32rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
margin-left: 30rpx;
}
.titleTwo {
font-size: 32rpx;
margin: 30rpx;
} }
.txt { .txt {
@ -31,12 +43,20 @@
} }
.startBtn { .startBtn {
float: right; width: 52px;
height: 18px;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
background: #1979ff; background: #1684FF;
border-radius: 16px;
color: #fff; color: #fff;
border-radius: 10rpx;
font-size: 26rpx; font-size: 26rpx;
margin: 10px 12px 10px;
}
.btn-box {
background: #fff;
width: 100%;
margin-bottom: 16px;
} }
.modal { .modal {
@ -115,3 +135,7 @@
.block { .block {
display: block; display: block;
} }
.entering {
padding: 30rpx;
}
Write Preview
Loading…
Cancel
Save