Merge remote-tracking branch 'origin/master' into dev

src/views/assets/workbench/eqpt/calculate/index.vue

@@ -13,6 +13,8 @@
   
 <script>
 import { Timeline, Bench } from "./components";
+import { mapStores } from 'pinia';
+import { assetsProjectInfo } from '@/stores/assetsProjectStore';
 
 export default {
   name: 'assetsCalculateWorkBench',
@@ -25,6 +27,15 @@ export default {
       showTimeline: true
     }
   },
+  computed: {
+    ...mapStores(assetsProjectInfo),
+  },
+  mounted() {
+    // 测算表进度为GENERATE时默认折叠进度条以显示更多内容
+    if (this.projectStore.calculateProgress.progress === 'GENERATE') {
+      this.changeTimelineStatus(false);
+    }
+  },
   methods: {
     // 显示隐藏步骤条时更改页面布局,直接操作DOM元素
     // contrl是每个子组件都有的样式