diff --git a/src/api/knowledge/types.ts b/src/api/knowledge/types.ts
index 6be3e2985..fb111ba13 100644
--- a/src/api/knowledge/types.ts
+++ b/src/api/knowledge/types.ts
@@ -24,12 +24,8 @@ export interface UserDetail {
 //导航栏查询
 export interface NaviQuery {
   atParentId: string;
-<<<<<<< HEAD
-  
-=======
   userkey: String,
   usertoken: String,
->>>>>>> v3
 }
 //导航栏信息
 export interface Navi{
@@ -47,12 +43,10 @@ export interface Navi{
   atUid:string;
   //排序
   atSort:string;
-<<<<<<< HEAD
 
-=======
    //该导航栏中有无card
   hasCard:Boolean; 
->>>>>>> v3
+
 }
 export type cardList = PageResult<Graphicform[]>
 //卡片
@@ -166,9 +160,7 @@ interface PageResultJava<T> {
   //当前页
   pageNum:number;
 
-<<<<<<< HEAD
-}
-=======
+
 }
 
 //标题下有无内容
@@ -176,4 +168,4 @@ export interface ShowTitle {
   atIdAndGParentSun: string;//导航栏id
   hasCard:Boolean;//是否展示
 }
->>>>>>> v3
+
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index e480b1cb7..3672c3095 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -18,75 +18,25 @@ declare module '@vue/runtime-core' {
     CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
-    ElAlert: typeof import('element-plus/es')['ElAlert']
-    ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
-<<<<<<< HEAD
-=======
-    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCarousel: typeof import('element-plus/es')['ElCarousel']
-    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
-    ElDropdown: typeof import('element-plus/es')['ElDropdown']
-    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
-    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
-    ElMenu: typeof import('element-plus/es')['ElMenu']
-<<<<<<< HEAD
-=======
-    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-    ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
-    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
-<<<<<<< HEAD
-=======
-    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     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']
     EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default']
     ErrorDialog: typeof import('./../components/workflow/dialog/errorDialog.vue')['default']
@@ -99,40 +49,19 @@ declare module '@vue/runtime-core' {
     FormGroup: typeof import('./../components/DesignForm/public/form/formGroup.vue')['default']
     FormGroup1: typeof import('./../components/DesignForm/public/form/formGroup1.vue')['default']
     FormItem: typeof import('./../components/DesignForm/public/form/formItem.vue')['default']
+    FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default']
     GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default']
     Hamburger: typeof import('./../components/Hamburger/index.vue')['default']
     HeadTools: typeof import('./../components/DesignForm/public/headTools.vue')['default']
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-<<<<<<< HEAD
-=======
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-    IEpClose: typeof import('~icons/ep/close')['default']
-    IEpCollection: typeof import('~icons/ep/collection')['default']
-    IEpDelete: typeof import('~icons/ep/delete')['default']
-    IEpDownload: typeof import('~icons/ep/download')['default']
-    IEpEdit: typeof import('~icons/ep/edit')['default']
-    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-    IEpMinus: typeof import('~icons/ep/minus')['default']
-    IEpPicture: typeof import('~icons/ep/picture')['default']
-    IEpPlus: typeof import('~icons/ep/plus')['default']
-    IEpPosition: typeof import('~icons/ep/position')['default']
-    IEpRefresh: typeof import('~icons/ep/refresh')['default']
-    IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
-    IEpSearch: typeof import('~icons/ep/search')['default']
-    IEpSetting: typeof import('~icons/ep/setting')['default']
-    IEpTop: typeof import('~icons/ep/top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
-    IEpUser: typeof import('~icons/ep/user')['default']
-    IEpView: typeof import('~icons/ep/view')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
     ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']
     MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default']
     NodeWrap: typeof import('./../components/workflow/nodeWrap.vue')['default']
     Pagination: typeof import('./../components/Pagination/index.vue')['default']
+    PositionDialog: typeof import('./../components/workflow/dialog/positionDialog.vue')['default']
     PromoterDrawer: typeof import('./../components/workflow/drwer/promoterDrawer.vue')['default']
     RightPanel: typeof import('./../components/RightPanel/index.vue')['default']
     RoleDialog: typeof import('./../components/workflow/dialog/roleDialog.vue')['default']
diff --git a/src/views/knowledge/ask/dialog.vue b/src/views/knowledge/ask/dialog.vue
index d6b7900c7..8f50262be 100644
--- a/src/views/knowledge/ask/dialog.vue
+++ b/src/views/knowledge/ask/dialog.vue
@@ -9,11 +9,9 @@
   </template>
   <script lang="ts">
   import { reactive } from "vue";
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
+
+
   interface FormInfo {
 	id: string;
 	age: string;
diff --git a/src/views/knowledge/exam/dialog.vue b/src/views/knowledge/exam/dialog.vue
index 6507182fc..32dbc8a8c 100644
--- a/src/views/knowledge/exam/dialog.vue
+++ b/src/views/knowledge/exam/dialog.vue
@@ -37,11 +37,7 @@
   import { reactive, toRefs, ref, onMounted} from "vue";
   import { Delete, Download, Plus, ZoomIn } from "@element-plus/icons-vue";
   import { ElMessage,UploadProps} from "element-plus";
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
   import type { UploadFile } from 'element-plus'
   import Diaiop from "./diaiop.vue"
   interface FormInfo {
diff --git a/src/views/knowledge/knowledge/components/KnowledgeContent.vue b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
index 8291401d8..2ab179d50 100644
--- a/src/views/knowledge/knowledge/components/KnowledgeContent.vue
+++ b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
@@ -10,7 +10,10 @@ const props = defineProps({
         default: false
     },
     contentSource: {
-        type: Object
+        type: Object,
+		default:()=>{
+			return "";
+		}
     },
 });
 const emits = defineEmits(["update:isShow"]);		//操作父级数据
@@ -43,11 +46,7 @@ watch(() => props.isShow, () => {
         } else {
             pdfIframeShow.value = true
         }
-<<<<<<< HEAD
-        console.log(pdfIframeShow.value)
-=======
-        //console.log(pdfIframeShow.value)
->>>>>>> v3
+
     }
 })
 onMounted(() => {
@@ -61,7 +60,7 @@ onMounted(() => {
 
 <template>
     <el-dialog v-model="boxShow" class="dialogStyle" :show-close="true">
-        <template #header="{ close, titleId, titleClass }">
+        <template #header="{  titleId, titleClass }">
             <div class="my-header">
                 <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gTitle }}</h4>
                 <!-- <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gContent }}</h4> -->
@@ -97,4 +96,4 @@ onMounted(() => {
     margin-top: 0% !important;
     padding-top: 0% !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/knowledge/knowledge/components/Navili.vue b/src/views/knowledge/knowledge/components/Navili.vue
index 62f4efffa..ac4583db4 100644
--- a/src/views/knowledge/knowledge/components/Navili.vue
+++ b/src/views/knowledge/knowledge/components/Navili.vue
@@ -1,13 +1,14 @@
 <script lang='ts' setup>
 import { scrollTo } from '@/api/knowledge/scroll'
-<<<<<<< HEAD
-=======
+
 const showli = ref(true);
->>>>>>> v3
+
 const props = defineProps({
     oneli: {
         type: Object,
-
+		default:()=>{
+			return "";
+		}
     },
 
     index: {
@@ -17,28 +18,17 @@ const props = defineProps({
     active: {
         type: Number,
         default: 0
-<<<<<<< HEAD
+
     }
 })
 const liIndex = props.index + 1;
 </script>
-<template>
-    <li :class="{ active: active === index }" @click="scrollTo(index)">
-=======
-    },
-    knowledgeStore: {
-        type: Object,
-    },
-    fatherisReady1: {
-        type: Number,
-    }
-})
 
-</script>
+
 <template>
     <li :class="{ active: active === index }" @click="scrollTo(index)" v-if="showli">
->>>>>>> v3
+
         {{ oneli?.atTitle }}
     </li>
 </template>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/knowledge/knowledge/components/archivestype.vue b/src/views/knowledge/knowledge/components/archivestype.vue
index 52e754285..d505e0676 100644
--- a/src/views/knowledge/knowledge/components/archivestype.vue
+++ b/src/views/knowledge/knowledge/components/archivestype.vue
@@ -1,35 +1,29 @@
 <script lang='ts' setup>
 import { useUserStore } from "@/store/modules/user"
 import { ref, watch } from 'vue'
-<<<<<<< HEAD
+
 import { getUserDetail, getZxxyNavis, getTuijian } from '@/api/knowledge/index'
 import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue'
 import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam } from '@/api/knowledge/types'
 import { formatDate } from '@/api/knowledge/scroll'
 import { useRouter } from 'vue-router'
 import errimg from '@/assets/404_images/imgNotFound.png'
-=======
-import { getTuijian } from '@/api/knowledge/index'
-import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue'
-import { UserDetail, NaviQuery, Navi, Graphicform, PageParam, ShowTitle } from '@/api/knowledge/types'
-import { formatDate } from '@/api/knowledge/scroll'
-import errimg from '@/assets/404_images/imgNotFound.png'
-import { useKnowledgeStore } from "@/store/modules/knowledge"
+
 
 const showArea = ref(true);
 
->>>>>>> v3
+
 const props = defineProps({
   liContent: {
     type: Object,
-
+		default:()=>{
+			return "";
+		}
   },
-<<<<<<< HEAD
-  routerUrl:{
-=======
+
   routerUrl: {
->>>>>>> v3
     type: String,
+		default:""
   },
 
   index: {
@@ -43,22 +37,14 @@ const props = defineProps({
   fatherisReady: {
     type: Number,
     default: 0
-<<<<<<< HEAD
-  }
-=======
   },
 
->>>>>>> v3
+
 })
 
 const userStore = useUserStore();
 const { userKey, userToken } = userStore;
-<<<<<<< HEAD
 
-
-
-=======
->>>>>>> v3
 const userDetail = ref<UserDetail>({
   //证件号码
   idcardno: ["1", "2"],
@@ -75,7 +61,7 @@ const userDetail = ref<UserDetail>({
 });
 const tuijianPage = ref<Graphicform[]>();
 
-<<<<<<< HEAD
+
 /* const naviList = ref<Navi[]>(); */
 /* //用户信息查询参数
 const userQueryParam = reactive<UserQuery>({
@@ -83,16 +69,14 @@ const userQueryParam = reactive<UserQuery>({
   usertoken: userToken,
 }); */
 //navi查询参数
-const naviQueryParam = reactive<NaviQuery>({
-  atParentId: "",//知识库
-=======
+
 
 //navi查询参数
 const naviQueryParam = reactive<NaviQuery>({
   atParentId: "",//知识库
   userkey: userKey,
   usertoken: userToken,
->>>>>>> v3
+
 });
 const pageParamTuijian = reactive<PageParam>({
   total: 0,
@@ -114,7 +98,7 @@ function errorImg(e: any) {
   //这一句没用，如果默认图片的路径错了还是会一直闪屏，在方法的前面加个.once只让它执行一次也没用
   e.srcElement.onerror = null; //防止闪图
 }
-<<<<<<< HEAD
+
 onMounted(() => {
 
   //console.log(props.liContent?.gParentSun)
@@ -185,7 +169,7 @@ watch(() => [props.fatherisReady, props.liContent,props.routerUrl], (newVal, old
   }) */
 
 
-=======
+
 
 watch(() => [props.fatherisReady, props.liContent, props.routerUrl], (newVal, oldVal) => {
   //console.log(newVal, oldVal); // [11, 22], [1, 2]
@@ -236,7 +220,7 @@ watch(() => [props.fatherisReady, props.liContent, props.routerUrl], (newVal, ol
   }
 })
 
->>>>>>> v3
+
 function handleCurrentChange() {
 
   getTuijian(pageParamTuijian)
@@ -244,11 +228,10 @@ function handleCurrentChange() {
       tuijianPage.value = data.list
       pageParamTuijian.page = data.pageNum
       pageParamTuijian.total = data.total
-<<<<<<< HEAD
+
 
       console.log(tuijianPage.value)
-=======
->>>>>>> v3
+
     });
 }
 
@@ -258,23 +241,23 @@ const showCards = ref(0)
 
 //dialog
 const cardContentSource = ref<Graphicform>({});
-<<<<<<< HEAD
+
 const showContentBox= ref(false);	//详情弹窗
 function showContentDialog(item:any){
 
   showContentBox.value = true;
   cardContentSource.value=item;
-=======
+
 const showContentBox = ref(false);	//详情弹窗
 function showContentDialog(item: any) {
 
   showContentBox.value = true;
   cardContentSource.value = item;
 
->>>>>>> v3
-}
 
+}
 
+}
 
 </script>
 <template>
@@ -284,20 +267,16 @@ function showContentDialog(item: any) {
       <h3>{{ props.liContent?.atTitle }}</h3>
 
     </div>
-<<<<<<< HEAD
-    <div v-show="!showCards" style="text-align: center;padding-top: 5%;" >暂无数据</div>
-=======
+
     <div v-show="!showCards" style="text-align: center;padding-top: 5%;">暂无数据</div>
->>>>>>> v3
+
     <div class="grid-tuijian" v-show="showCards">
 
 
       <div v-for="(item, index) in tuijianPage" :key="index" class="tuijian-card" @click="showContentDialog(item)">
-<<<<<<< HEAD
-        <img style="width: 140px; height: 126px;border-radius:8px;margin-top: 4px; margin-left: 4px;"
-=======
+
         <img style="width: 170px; height: 126px;border-radius:8px;margin-top: 4px; margin-left: 4px;"
->>>>>>> v3
+
           referrerpolicy="no-referrer" :src="item.gThumbnail" fit="fill" loading="lazy" @error="errorImg($event)" />
 
         <div class="card-right">
@@ -324,11 +303,9 @@ function showContentDialog(item: any) {
 <style>
 .models {
   width: 100%;
-<<<<<<< HEAD
+
    min-height: 200px;
-=======
-  min-height: 200px;
->>>>>>> v3
+
 
 
 }
@@ -342,11 +319,9 @@ function showContentDialog(item: any) {
 .grid-tuijian {
   /* border-top: solid 1px; */
   display: grid;
-<<<<<<< HEAD
-  grid-template-columns: repeat(auto-fill, 415px);
-=======
+
   grid-template-columns: repeat(auto-fill, 484px);
->>>>>>> v3
+
   gap: 10px;
   grid-auto-flow: row dense;
 
@@ -354,11 +329,9 @@ function showContentDialog(item: any) {
 
 .tuijian-card {
   display: flex;
-<<<<<<< HEAD
-  width: 412px;
-=======
+
   width: 481px;
->>>>>>> v3
+
   height: 140px;
   padding: 3px;
   border-radius: 8px;
@@ -425,4 +398,4 @@ function showContentDialog(item: any) {
   justify-content: center;
 
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/knowledge/news/detail.vue b/src/views/knowledge/news/detail.vue
index 4d8fce56c..e1480fe7f 100644
--- a/src/views/knowledge/news/detail.vue
+++ b/src/views/knowledge/news/detail.vue
@@ -22,11 +22,8 @@
   import { Delete, Download, Plus, ZoomIn } from "@element-plus/icons-vue";
   import { ElMessage,UploadProps} from "element-plus";
   import Editor from "@/components/WangEditor/index.vue";
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
+
   import type { UploadFile } from 'element-plus'
   interface FormInfo {
 	id: string;