diff --git a/pc-cattle-transportation/src/api/abroad.js b/pc-cattle-transportation/src/api/abroad.js
index 1e84628..90c230a 100644
--- a/pc-cattle-transportation/src/api/abroad.js
+++ b/pc-cattle-transportation/src/api/abroad.js
@@ -88,4 +88,58 @@ export function pageDeviceList(data) {
method: 'POST',
data,
});
+}
+
+// 智能耳标日志查询
+export function getEarTagLogs(data) {
+ return request({
+ url: '/deliveryDevice/getEarTagLogs',
+ method: 'POST',
+ data,
+ });
+}
+
+// 智能项圈日志查询
+export function getCollarLogs(data) {
+ return request({
+ url: '/deliveryDevice/getCollarLogs',
+ method: 'POST',
+ data,
+ });
+}
+
+// 智能主机日志查询
+export function getHostLogs(data) {
+ return request({
+ url: '/deliveryDevice/getHostLogs',
+ method: 'POST',
+ data,
+ });
+}
+
+// 智能耳标运动轨迹查询
+export function getEarTagTrajectory(data) {
+ return request({
+ url: '/deliveryDevice/getEarTagTrajectory',
+ method: 'POST',
+ data,
+ });
+}
+
+// 智能项圈运动轨迹查询
+export function getCollarTrajectory(data) {
+ return request({
+ url: '/deliveryDevice/getCollarTrajectory',
+ method: 'POST',
+ data,
+ });
+}
+
+// 智能主机运动轨迹查询
+export function getHostTrajectory(data) {
+ return request({
+ url: '/deliveryDevice/getHostTrajectory',
+ method: 'POST',
+ data,
+ });
}
\ No newline at end of file
diff --git a/pc-cattle-transportation/src/api/shipping.js b/pc-cattle-transportation/src/api/shipping.js
index 57124f8..642929e 100644
--- a/pc-cattle-transportation/src/api/shipping.js
+++ b/pc-cattle-transportation/src/api/shipping.js
@@ -22,6 +22,50 @@ export function orderDel(id) {
method: 'GET',
});
}
+// 清空设备delivery_id
+export function clearDeviceDeliveryId(deliveryId) {
+ return request({
+ url: '/deliveryDevice/clearDeliveryId',
+ method: 'POST',
+ data: { deliveryId },
+ });
+}
+
+// 测试接口：检查订单设备数据
+export function testOrderDevices(deliveryId) {
+ return request({
+ url: '/deliveryDevice/testOrderDevices',
+ method: 'POST',
+ data: { deliveryId },
+ });
+}
+
+// 更新设备delivery_id和weight
+export function updateDeviceDeliveryId(data) {
+ return request({
+ url: '/deliveryDevice/updateDeviceDeliveryId',
+ method: 'POST',
+ data,
+ });
+}
+
+// 批量更新设备weight
+export function updateDeviceWeights(data) {
+ return request({
+ url: '/deliveryDevice/updateDeviceWeights',
+ method: 'POST',
+ data,
+ });
+}
+
+// 获取订单绑定的智能主机
+export function getOrderHostDevice(deliveryId) {
+ return request({
+ url: '/deliveryDevice/getOrderHostDevice',
+ method: 'POST',
+ data: { deliveryId },
+ });
+}
// 装车订单 - 编辑
export function orderEdit(data) {
return request({
diff --git a/pc-cattle-transportation/src/views/entry/attestation.vue b/pc-cattle-transportation/src/views/entry/attestation.vue
index 2393b82..e5f6eab 100644
--- a/pc-cattle-transportation/src/views/entry/attestation.vue
+++ b/pc-cattle-transportation/src/views/entry/attestation.vue
@@ -54,16 +54,16 @@
- {{ scope.row.registeredJbqCount || '0' }}
+ {{ getTotalDeviceCount(scope.row.id) }}
-
- {{ scope.row.earTagCount || '0' }}
+
+ {{ getEarTagCount(scope.row.id) }}
- {{ scope.row.earTagCount || '0' }}
+ {{ getEarTagCount(scope.row.id) }}
@@ -105,10 +105,10 @@