IStation/SZJT/Wechart.V1.0.git

			@@ -90,10 +90,11 @@
			bottomStatus: false,
			listFinish: [],
			alarmList: [],
			alarmTotal: 1
			alarmTotal:result.Data.Total
			})
			return
			}

			var listFinish = [];
			result.Data.List.forEach(item => {
			listFinish.push(item)
			@@ -228,7 +229,6 @@
			* 页面上拉触底事件的处理函数
			*/
			onReachBottom() {
			console.log(111)
			if (this.data.PageIndex < this.data.alarmTotal) { //如果当前页小于总页数，则获取下一页数据
			this.setData({
			scrollTop: 0,

			@@ -31,7 +31,7 @@
			</view>
			</view>
			</view>
			<scroll-view class="sc" scroll-y="true" style="height: calc(100% - 50rpx)" scroll-top="{{scrollTop}}" bindscrolltolower="onReachBottom">
			<scroll-view class="sc" scroll-y="true" style="height: calc(100% - 142rpx)" scroll-top="{{scrollTop}}" bindscrolltolower="onReachBottom">
			<view class="tui-menu-list tui-youjiantou" wx:for="{{alarmList}}" wx:for-item="alarm_item" wx:for-index="node_index" wx:key="node_index">
			<view>
			<block>

			@@ -36,8 +36,8 @@
			<span>{{listItem.CreateTime}}</span>
			</view>
			</view>
			<view>位置 : {{listItem.Address}}</view>
			<view>设备 : {{listItem.EquipmentName}}</view>
			<view>位置 : {{listItem.Address?listItem.Address:''}}</view>
			<view>设备 : {{listItem.EquipmentName?listItem.EquipmentName:''}}</view>
			</view>
			<icon class="iconfont icon-youjian"></icon>
			</view>
			@@ -166,7 +166,7 @@
			</view>
			<view style="color:#096;" wx:if="{{listItem.FormStatus == 100}}">表单状态 : 已完工,未验收</view>
			<view style="color:#096;" wx:if="{{listItem.FormStatus == 200}}">表单状态 : 已验收</view>
			<view>设备 : {{listItem.EquipmentName}}</view>
			<view>设备 : {{listItem.EquipmentName?listItem.EquipmentName:''}}</view>
			</view>
			<!-- <icon class="iconfont icon-youjian"></icon> -->
			</view>

			@@ -46,7 +46,7 @@
			display: flex;
			align-items: center;
			justify-content: space-between;
			flex-wrap: wrap;
			flex-wrap: nowrap;
			border-top: 1px solid #EFEFF4;

			}

			@@ -50,7 +50,7 @@
			</li>
			<li class="mui-table-view-cell">
			<span class="title">设备名称：</span>
			<span class="body" style="color:red;">{{TaskEntity.EquipmentName}} </span>
			<span class="body" style="color:red;">{{TaskEntity.EquipmentName?TaskEntity.EquipmentName:''}} </span>
			</li>
			<li class="mui-table-view-cell">
			<span class="title">设备型号：</span>

	other/alarm/index.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	other/alarm/index.wxml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	repair/myTask/index.wxml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	repair/myTask/index.wxss	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	repair/receiveTask/index.wxml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史