diff --git a/src/views/order-management/order-list/index.vue b/src/views/order-management/order-list/index.vue index 1980f6e..0c00bf2 100644 --- a/src/views/order-management/order-list/index.vue +++ b/src/views/order-management/order-list/index.vue @@ -869,7 +869,7 @@ } const res = await OrderService.getOrders(params) if (res.code === 0) { - orderList.value = res.data.list || [] + orderList.value = res.data.items || [] pagination.total = res.data.total || 0 } } catch (error) { @@ -1011,9 +1011,7 @@ try { // 获取资源ID (IoT卡ID或设备ID) const resourceId = - createForm.order_type === 'single_card' - ? createForm.iot_card_id - : createForm.device_id + createForm.order_type === 'single_card' ? createForm.iot_card_id : createForm.device_id if (!resourceId) { ElMessage.error('请选择IoT卡或设备') diff --git a/src/views/polling-management/monitor/index.vue b/src/views/polling-management/monitor/index.vue index 7d02f82..a1034f2 100644 --- a/src/views/polling-management/monitor/index.vue +++ b/src/views/polling-management/monitor/index.vue @@ -161,7 +161,9 @@ :stroke-width="20" :color="getProgressColor(initProgress.progress)" > - {{ initProgress.progress.toFixed(1) }}% + {{ initProgress.progress.toFixed(1) }}% @@ -169,207 +171,207 @@