合并冲突 完成实验步骤

src/store/modules/setting.ts

@@ -125,7 +125,7 @@ const settingStore = defineStore("settingStore", {
             router.push({
               path: "/",
               query: {
-                ieda: true,
+                idea: true,
               },
             });
           }

src/views/experimentalData/index.vue

@@ -25,6 +25,9 @@
       </el-table>
     </div>
   </div>
+  <div class="settting">
+    <el-button @click="router.back()">返回</el-button>
+  </div>
 </template>
 
 <script setup>
@@ -32,6 +35,8 @@ import settingstore from '@/store/modules/setting'
 import { setStepEvent } from "@/utils/setStep";
 import { formatDate } from "@/utils";
 import {ref} from 'vue'
+import { useRouter } from 'vue-router';
+const router = useRouter()
 const useSettingStore = settingstore()
 const tableData = ref([])
 tableData.value = useSettingStore.shiyanData
@@ -88,4 +93,9 @@ setStepEvent(10,formatDate(new Date()))
 .el-table::before {
   background: transparent !important;
 }
+.settting{
+  position: absolute;
+  top: 20px;
+  right: 20px;
+}
 </style>

src/views/largeDataScreen/home.vue

@@ -799,7 +799,7 @@ const setInstallationStep = (): void => {
     Popup.value = true;
   }
   if(installationStep.value == 11){
-    Installation.value = true
+    // Installation.value = true
     Popup.value = false
   }
 };

src/views/program/index.vue

@@ -93,7 +93,7 @@
       <div class="dialog-footer">
         <el-button @click="dialogVisible = false">取消</el-button>
         <el-button type="primary" @click="exportWord">
-          导出
+          保存
         </el-button>
       </div>
     </template>