diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index af0b8b96c..a31a922dd 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -76,8 +76,11 @@ declare module '@vue/runtime-core' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     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']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTransfer: typeof import('element-plus/es')['ElTransfer']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
diff --git a/src/views/knowledge/knowledge/bb.vue b/src/views/knowledge/knowledge/bb.vue
index 73920ae85..c821a686a 100644
--- a/src/views/knowledge/knowledge/bb.vue
+++ b/src/views/knowledge/knowledge/bb.vue
@@ -106,15 +106,13 @@
       </el-table-column>
     </el-table>
     <!-- 新建/编辑弹框 -->
-<<<<<<< HEAD
-    
-=======
+
     <Dialog
 			v-if="data.dialogShow"
       v-model="data.dialogShow"
       :row-info="data.rowInfo"
     />
->>>>>>> luzhiqiang_v1
+
     <!-- 详情弹窗 -->
   </div>
 </template>
diff --git a/src/views/knowledge/news/dialog.vue b/src/views/knowledge/news/dialog.vue
index e88b6413f..0d1e0377f 100644
--- a/src/views/knowledge/news/dialog.vue
+++ b/src/views/knowledge/news/dialog.vue
@@ -127,7 +127,7 @@
   <script lang="ts" setup>
   import { reactive, onMounted } from "vue";
   import Editor from "@/components/WangEditor/index.vue";
-<<<<<<< HEAD
+
   import type { UploadFile } from 'element-plus'
   interface FormInfo {
 	id: string;
@@ -141,10 +141,10 @@
 	dialogVis: boolean;
 	dialogImageUrl: string;
   }
-=======
+
 //   import Lzq from './lzq.vue'
   const value = ref("初始内容");
->>>>>>> luzhiqiang_v1
+
   const childBorder = ref(false);
   const parentBorder = ref(false);
   const editContvalue = ref("");
diff --git a/src/views/taskplatform/taskmanagement/drafts.vue b/src/views/taskplatform/taskmanagement/drafts.vue
index b96cdd729..bcec78991 100644
--- a/src/views/taskplatform/taskmanagement/drafts.vue
+++ b/src/views/taskplatform/taskmanagement/drafts.vue
@@ -49,9 +49,7 @@ const initDataDr = () =>{
 onMounted(()=>{
 	getToDoListDr();
 })
-<<<<<<< HEAD
-const editFlow = (val:nay) => {}
-=======
+
 /**
  * 删除工作流
  */
@@ -100,7 +98,7 @@ const editFlow = (val:any) => {
 	darwOpenOrClose.value = true
 	inFoid.value = val.idStr
 }
->>>>>>> v3
+
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
diff --git a/src/views/taskplatform/taskmanagement/myrequest.vue b/src/views/taskplatform/taskmanagement/myrequest.vue
index def4b1549..2949e3ec5 100644
--- a/src/views/taskplatform/taskmanagement/myrequest.vue
+++ b/src/views/taskplatform/taskmanagement/myrequest.vue
@@ -73,11 +73,11 @@ const lookFlowInfo = (val:any,types:number) =>	{
 	flowLogInfo.value = val
 	darwOpenOrClose.value = true
 }
-<<<<<<< HEAD
+
 const searchQuery = () =>{
 	getMyToDoList()
 }
-=======
+
 /**
  * 重新申请
  */
@@ -172,8 +172,7 @@ const retractFlowInfo = (val:any) => {
 	})
 	.catch(() => {})
 }
-const searchQuery = () =>{}
->>>>>>> v3
+
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
diff --git a/src/views/taskplatform/taskmanagement/runFlowStep.vue b/src/views/taskplatform/taskmanagement/runFlowStep.vue
index 8b252c868..3b40592c6 100644
--- a/src/views/taskplatform/taskmanagement/runFlowStep.vue
+++ b/src/views/taskplatform/taskmanagement/runFlowStep.vue
@@ -92,21 +92,15 @@ const addPeople = (val:any) =>{
 }
 //更新节点操作人
 const updateNode = (val:any) =>{
-<<<<<<< HEAD
-	if(flowMaps.value && flowMaps.value.length > 0){
-=======
+
 	if(flowMaps.value&& flowMaps.value.length > 0){
->>>>>>> v3
+
 		flowMaps.value.forEach((item:any) =>{
 			if(item.step == zhiXingStep){
 				item.operator = val
 			}
 		})
 	}
-<<<<<<< HEAD
-	
-=======
->>>>>>> v3
 }
 const sendFlowInfo = ref<string>() //审批意见
 //提交审批
diff --git a/src/views/taskplatform/taskmanagement/todolist.vue b/src/views/taskplatform/taskmanagement/todolist.vue
index 1533d4073..2c85b933b 100644
--- a/src/views/taskplatform/taskmanagement/todolist.vue
+++ b/src/views/taskplatform/taskmanagement/todolist.vue
@@ -65,13 +65,10 @@ const lookFlowInfo = (val:any,types:number) =>	{
 	flowLogInfo.value = val
 	darwOpenOrClose.value = true
 }
-<<<<<<< HEAD
+
 const searchQuery = () => {
 	getToDoListTd()
-=======
-const searchQuery = () =>{
-	
->>>>>>> v3
+
 }
 </script>
 <template>