From cc52bebcc678101a3bc9fa99be344a18461ce2fa Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 21 Apr 2025 09:57:51 +0800
Subject: [PATCH] feat；从master合并至test分支
---
src/views/SignMachineNest/MachineLeft/MachineData.vue | 2 +-
src/store/modules/home.js | 1 -
src/views/SignMachineNest/MachineLeft/MachineLeft.vue | 3 ++-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index 4012aeb..f4b0ca8 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -77,7 +77,6 @@
window.localStorage.setItem('bs_workspace_id', id)
},
setOsdVisibleInfo: (state, info) => {
- console.log('存储',info)
state.osdVisible = Object.assign({}, info)
window.localStorage.setItem('bs_osd', JSON.stringify(info))
},
diff --git a/src/views/SignMachineNest/MachineLeft/MachineData.vue b/src/views/SignMachineNest/MachineLeft/MachineData.vue
index 0a4db03..8892a6d 100644
--- a/src/views/SignMachineNest/MachineLeft/MachineData.vue
+++ b/src/views/SignMachineNest/MachineLeft/MachineData.vue
@@ -33,7 +33,7 @@
(newValue) => {
if (!newValue) return;
statisticsList.value = [
- { imgurl: rwcs, num: newValue.fly_count || 0, text: '任务次数(次)' },
+ { imgurl: rwcs, num: newValue.task_num || 0, text: '任务次数(次)' },
{ imgurl: sjs, num: newValue.event_count || 0, text: '事件数(件)' },
{ imgurl: jscb, num: newValue.total_cost_saved || 0, text: '节省成本(万元)' },
{ imgurl: rwcg, num: newValue.achievement_count || 0, text: '任务成果(个)' },
diff --git a/src/views/SignMachineNest/MachineLeft/MachineLeft.vue b/src/views/SignMachineNest/MachineLeft/MachineLeft.vue
index 6f9d0b8..417f790 100644
--- a/src/views/SignMachineNest/MachineLeft/MachineLeft.vue
+++ b/src/views/SignMachineNest/MachineLeft/MachineLeft.vue
@@ -24,7 +24,8 @@
const goBack = () => {
store.commit('setSingleUavHome', {});
- store.commit('setFootActiveIndex', 0)
+ store.commit('setFootActiveIndex', 0);
+ store.commit('setOsdVisibleInfo', {});
};
</script>
--
Gitblit v1.9.3