电池编号

machineAndCell/cellSearch/cellSearch.vue

@@ -5,7 +5,7 @@
 				<image class="search-saoma" src="../../static/pages/images/saoma.png" @click="saomaFn()"></image>
 				<view class="search-input ddflex fflex">
 					<image class="search-input-icon" src="../../static/pages/images/search.png"></image>
-					<input class="fflex" v-model="searchValue" confirm-type="search" @confirm="searchFn" placeholder="请输入编号查询"/>
+					<input class="fflex" v-model="searchValue" confirm-type="search" @confirm="searchFn" placeholder="请输入电池编号查询"/>
 					<view class="search-btn" @click="searchFn">搜索</view>
 				</view>
 			</view>
@@ -26,7 +26,7 @@
 							<view class="cell-state" :style="item.leaseStatus==1?'':'background-color: #0FCB27;'">{{item.leaseStatus==1?'已租':'空闲'}}</view>
 						</view>
 						<view class="cell-info  ddflex">
-							<view>电池Id：</view>
+							<view>电池编号：</view>
 							<view>{{item.batteryId}}</view>
 						</view>
 						<view class="cell-info  ddflex">

pages/cell/cell.vue

@@ -70,7 +70,7 @@
 								<view class="cell-state" :style="item.leaseStatus==1?'':'background-color: #0FCB27;'">{{item.leaseStatus==1?'已租':'空闲'}}</view>
 							</view>
 							<view class="cell-info  ddflex">
-								<view>电池Id：</view>
+								<view>电池编号：</view>
 								<view>{{item.batteryId?item.batteryId:'暂无电池'}}</view>
 							</view>
 							<view class="cell-info  ddflex">

warning/machineAlarm/machineAlarm.vue

@@ -3,17 +3,21 @@
 		<!-- @click="openPop(item) -->
 		<view class="order-item" v-for="item,index in groupList">
 			<view class="ddflex order-item-header">
-				<view class="order-time">类型：{{item.alarmFlag}}</view>
+				<!-- <view class="order-time">类型：{{item.alarmFlag}}</view> -->
+				<view class="order-item-content ddflex">
+					<view class="order-item-content-label">机柜编号：</view>
+					<view class="order-item-content-data fflex tover">{{item.devId}}</view>
+				</view>
 				<block>
 					<view v-if="item.type==1" class="order-state">待消除</view>
 					<view v-else class="order-state" style="color: #0FCB27;border: 2rpx solid #0FCB27;">已消除</view>
 				</block>
 			</view>
 			<view class="order-item-body">
-				<view class="order-item-content ddflex">
+				<!-- <view class="order-item-content ddflex">
 					<view class="order-item-content-label">机柜编号：</view>
 					<view class="order-item-content-data fflex tover">{{item.devId}}</view>
-				</view>
+				</view> -->
 				<view class="order-item-content ddflex">
 					<view class="order-item-content-label">电池编号：</view>
 					<view class="order-item-content-data fflex tover">{{item.batteryId}}</view>
@@ -119,7 +123,7 @@
 					page: this.page,
 					limit: this.limit,
 				}
-				let api = '/admin/v2/cab/page'
+				let api = '/admin/v2/alarm/cabAlarmPage'
 				if(this.id){
 					api = '/admin/v2/cab/alarm/page'
 					queryParams.devId = this.id