修改代码合并异常

src/views/manage/calculate/view.vue

@@ -74,7 +74,7 @@ function closeBack() {
 }
 
 /** 初始化数据 */
-funcrouter.push) {
+function initData() {
   let id = route.query.id;
   loading.value = true;
   OperatorApi.findOne(id)

src/views/manage/calculateParam/edit.vue

@@ -206,7 +206,7 @@ const handleSubmit = useThrottleFn(() => {
 }, 3000);
 
 // 超出限制，清空文件列表
-furouter.pushileExceed() {
+function handleFileExceed() {
   uploadRef.value.clearFiles();
   ElMessage.warning("已清空文件列表,请重新上传！");
 }

src/views/manage/calculateParam/view.vue

@@ -137,5 +137,4 @@ onMounted(() => {
     }
   }
 }
-</style>
+</style>
-router.push

src/views/manage/equipment/index.vue

@@ -112,32 +112,6 @@ const queryParams = reactive({
 });
 
 
-defineOptions({
-  name: "calculateIndex",
-  inheritAttrs: false,
-});
-
-import { UserQuery } from "@/api/user/model";
-
-const queryFormRef = ref(ElForm); // 查询表单
-const router = useRouter();
-
-const loading = ref(false); //  加载状态
-const removeIds = ref([]); // 删除用户ID集合 用于批量删除
-const queryParams = reactive<UserQuery>({
-  pageNum: 1,
-  pageSize: 10,
-});
-const dateTimeRange = ref("");
-const total = ref(0); // 数据总数
-
-watch(dateTimeRange, (newVal) => {
-  if (newVal) {
-    queryParams.startTime = newVal[0];
-    queryParams.endTime = newVal[1];
-  }
-});
-
 const tableData = [
   {
     id: 1,
@@ -201,42 +175,45 @@ function resetQuery() {
 /** 行选中 */
 function handleSelectionChange(selection: any) {
   removeIds.value = selection.map((item: any) => item.id);
-}router.push
+}
 
 /** 删除数据 */
-furouter.pushelete(row: { [key: string]: any }) {
+function handleDelete(row: { [key: string]: any }) {
   ElMessageBox.confirm("确认删除计算设备信息?", "警告", {
     confirmButtonText: "确定",
-  router.pushText: "取消",
+    cancelButtonText: "取消",
     type: "warning",
   }).then(function () {
-  router.pushccess("删除成功");
+    // ToolChainshApi.deleteTool(row.tool_id).then((res) => {
+    ElMessage.success("删除成功");
+    //   resetQuery();
+    // });
   });
 }
 
-/**router.push
+/**
  * 打开弹窗
- *router.push
+ *
  * @param type 弹窗类型  用户表单：user-form | 用户导入：user-import
  * @param id 用户ID
  */
 async function openDialog(type: string, id?: number) {
-  router.replace({ path: "/tester/equipmentEdit" });
+  router.push({ path: "/tester/equipmentEdit" });
 }
 async function openDialog1(type: string, id?: number) {
-  router.replace({ path: "/tester/equipmentEditPcie" });
+  router.push({ path: "/tester/equipmentEditPcie" });
 }
 async function openDialog2(type: string, id?: number) {
-  router.replace({ path: "/tester/equipmentEditNet" });
+  router.push({ path: "/tester/equipmentEditNet" });
 }
 async function openDialog3(type: string, id?: number) {
-  router.replace({ path: "/tester/equipmentView" });
+  router.push({ path: "/tester/equipmentView" });
 }
 async function openDialog4(type: string, row) {
   if(row.sblx=='网络设备'){
-    router.replace({ path: "/tester/equipmentEditNet" });
+    router.push({ path: "/tester/equipmentEditNet" });
   }else{
-    router.replace({ path: "/tester/equipmentEditPcie" });
+    router.push({ path: "/tester/equipmentEditPcie" });
   }
 }
 /** 下载导入模板 */