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

# Conflicts:
#	src/types/components.d.ts

src/types/components.d.ts

@@ -28,8 +28,6 @@ declare module 'vue' {
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -58,19 +56,14 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FlvVideo: typeof import('./../components/FlvVideo/index.vue')['default']

src/views/inspectionWork/patrolTask.vue

@@ -252,26 +252,17 @@ const handleSelectionChange = (selection) => {
   multiple.value = !selection.length;
 };
 const handleWork = async (row) => {
-  try {
-    const confirmed = await ElMessageBox.confirm('确定要完结任务吗？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    });
-    if (confirmed) {
-      try {
-        await updatetask({ id: row.id, task_status: '3' });
-        console.log(`任务 ${row.id} 已完结`);
-        fetchWorkrData();
-      } catch (error) {
-        console.error(`任务 ${row.id} 完结失败:`, error);
-      }
-    } else {
-      console.log(`任务 ${row.id} 未完结`);
-    }
-  } catch (error) {
-    console.error('确认对话框处理失败:', error);
-  }
+  const confirmed = await ElMessageBox.confirm('确定要完结任务吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  });
+  if (confirmed) {
+    await updatetask({ id: row.id, task_status: '3' }).then(() => {
+      proxy.$modal.msgSuccess('任务已完结');
+    })
+    fetchWorkrData();
+  };
 };
 onMounted(() => {
   fetchWorkrData();