diff --git a/.gitignore b/.gitignore
index 6d8ada74a..243dceddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
 node_modules
 .node_modules
+./node_modules
 .DS_Store
 dist
+.dist
+./dist
 dist-ssr
+.dist-ssr
 *.local
 src/types
 
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 3672c3095..6ebfa9127 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -18,25 +18,66 @@ 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']
+    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
+    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     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']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    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']
+    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']
+    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']
@@ -55,6 +96,27 @@ declare module '@vue/runtime-core' {
     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']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
+    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']
+    IEpOperation: typeof import('~icons/ep/operation')['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']
diff --git a/src/views/knowledge/knowledge/index.vue b/src/views/knowledge/knowledge/index.vue
index 6002d10c7..ac5f27dab 100644
--- a/src/views/knowledge/knowledge/index.vue
+++ b/src/views/knowledge/knowledge/index.vue
@@ -1,19 +1,13 @@
 <script lang='ts' setup>
 import { useUserStore } from "@/store/modules/user"
-<<<<<<< HEAD
-import { ref } from 'vue'
-import { getUserDetail, getZxxyNavis, getTuijian, getCarousel } from '@/api/knowledge/index'
-import Archivestype from '@/views/knowledge/knowledge/components/archivestype.vue'
-import Navili from '@/views/knowledge/knowledge/components/Navili.vue'
-import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue'
-=======
+
 
 import { ref } from 'vue'
 import { getUserDetail, getZxxyNavis, getTuijian, getCarousel } from '@/api/knowledge/index'
 import Archivestype from '@/views/knowledge/knowledge/components/archivestype.vue'
 import Navili from './components/Navili.vue'
 import KnowledgeContent from './components/KnowledgeContent.vue'
->>>>>>> v3
+
 import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam } from '@/api/knowledge/types'
 import { onScroll, scrollTo, formatDate } from '@/api/knowledge/scroll'
 import { useRouter } from 'vue-router'
@@ -26,10 +20,6 @@ const userStore = useUserStore();
 const { userKey, userToken } = userStore;
 
 
-<<<<<<< HEAD
-
-=======
->>>>>>> v3
 const userDetail = ref<UserDetail>({
   //证件号码
   idcardno: ["1", "2"],
@@ -47,10 +37,9 @@ const userDetail = ref<UserDetail>({
 const tuijianPage = ref<Graphicform[]>();
 
 const naviList = ref<Navi[]>();
-<<<<<<< HEAD
-=======
+
 const naviList1 = ref<Navi[]>();
->>>>>>> v3
+
 //用户信息查询参数
 const userQueryParam = reactive<UserQuery>({
   userkey: userKey,
@@ -59,11 +48,10 @@ const userQueryParam = reactive<UserQuery>({
 //navi查询参数
 const naviQueryParam = reactive<NaviQuery>({
   atParentId: "",//知识库
-<<<<<<< HEAD
-=======
+
   userkey: userKey,
   usertoken: userToken,
->>>>>>> v3
+
 });
 const pageParamTuijian = reactive<PageParam>({
   total: 0,
@@ -86,11 +74,9 @@ function errorImg(e: any) {
   e.srcElement.onerror = null; //防止闪图
 }
 const fatherisReady = ref(0);
-<<<<<<< HEAD
-const router = useRouter()
-const routerUrl = toRaw(router).currentRoute.value.fullPath
-onBeforeMount(() => {
-=======
+
+
+
 
 const router = useRouter()
 const routerUrl = toRaw(router).currentRoute.value.fullPath
@@ -100,7 +86,7 @@ onBeforeMount(() => {
     .then(({ data }) => {
       userDetail.value = data
     });
->>>>>>> v3
+
 
 })
 
@@ -119,7 +105,6 @@ onMounted(() => {
   getZxxyNavis(naviQueryParam)
     .then(({ data }) => {
       naviList.value = data
-<<<<<<< HEAD
       //console.log(naviList.value)
 
     }).finally(() => {
@@ -131,30 +116,22 @@ onMounted(() => {
     .then(({ data }) => {
       userDetail.value = data
       //console.log(userDetail.value)
-    });
-
-
-
-=======
-      }).finally(() => {
+    }).finally(() => {
         fatherisReady.value = 100;
       })
->>>>>>> v3
+
   //推荐 
   getTuijian(pageParamTuijian)
     .then(({ data }) => {
       tuijianPage.value = data.list
       pageParamTuijian.page = data.pageNum
       pageParamTuijian.total = data.total
-<<<<<<< HEAD
-      //console.log(tuijianPage.value)
-=======
->>>>>>> v3
+
     });
   getCarousel(pageParamTuijian)
     .then(({ data }) => {
       carousel.value = data.list
-<<<<<<< HEAD
+
 
 
       //console.log(tuijianPage.value)
@@ -165,12 +142,11 @@ onMounted(() => {
   //setTimeout(function(){  fatherisReady.value = 100;}, 3000);　　//三秒之后执行函数
 
 });
-=======
-    });
-});
 
 
->>>>>>> v3
+
+
+
 function jsScroll() {
   active.value = onScroll();
 }
@@ -186,46 +162,29 @@ function handleCurrentChange() {
       tuijianPage.value = data.list
       pageParamTuijian.page = data.pageNum
       pageParamTuijian.total = data.total
-<<<<<<< HEAD
-
-      //console.log(tuijianPage.value)
-=======
->>>>>>> v3
     });
 
 }
 
 //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>
-<<<<<<< HEAD
-  <div class="know-main">
-    <KnowledgeContent v-model:isShow="showContentBox" :contentSource="cardContentSource"></KnowledgeContent>
-    <!-- 内容区域 -->
-    <div class="content" style="margin-left: 10% ;padding-right: 15%;">
-=======
+
   <div class="app-container">
     <KnowledgeContent v-model:isShow="showContentBox" :contentSource="cardContentSource"></KnowledgeContent>
     <!-- 内容区域 -->
     <div class="content">
->>>>>>> v3
+
 
       <div class="models ">
 
@@ -234,27 +193,20 @@ function showContentDialog(item: any) {
 
         </div>
         <div class="grid-tuijian">
-<<<<<<< HEAD
-          <el-carousel indicator-position="outside" class="mycarousel" style="width: 412px;height:290px; " arrow="always">
-            <el-carousel-item v-for="(item, index) in carousel" :key="index" >
-              <!-- <h3 text="2xl" justify="center">{{ item.gThumbnail }}</h3> -->
-              <img style="width: 412px; height: 300px;border-radius:16px;margin-top: 4px; margin-left: 4px;"
-=======
+
           <el-carousel indicator-position="outside" class="mycarousel" arrow="always">
             <el-carousel-item v-for="(item, index) in carousel" :key="index" @click="showContentDialog(item)">
 
               <img style="width: 495px; height: 300px;border-radius:16px;margin-top: 4px; margin-left: 4px;"
->>>>>>> v3
+
                 referrerpolicy="no-referrer" :src="item.gThumbnail" fit="fill" loading="lazy" @error="errorImg($event)" />
             </el-carousel-item>
           </el-carousel>
 
           <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">
@@ -273,7 +225,7 @@ function showContentDialog(item: any) {
           </div>
 
         </div>
-<<<<<<< HEAD
+
         <el-pagination
 v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
           v-model:page-size="pageParamTuijian.pagesize" layout="prev, pager, next, jumper" :total="pageParamTuijian.total"  class="pagi"
@@ -282,58 +234,37 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
       <!-- 各知识/新闻分区 -->
       <Archivestype  v-for="(item, index) in naviList" :key="index"   :fatherisReady="fatherisReady" :liContent=item :index=(index) :routerUrl="routerUrl">
       </Archivestype>
-=======
-        <el-pagination class="pagi" v-model:current-page="pageParamTuijian.page" v-if="pageParamTuijian.total > 0"
-          v-model:page-size="pageParamTuijian.pagesize" layout="prev, pager, next, jumper" :total="pageParamTuijian.total"
-          @current-change="handleCurrentChange" />
-      </div>
-      <!-- 各知识/新闻分区 -->
 
-      <template v-for="(item, index) in naviList">
-        <Archivestype :liContent=item :index=(index) :fatherisReady="fatherisReady" :routerUrl="routerUrl"></Archivestype>
-      </template>
-
->>>>>>> v3
 
 
 
     </div>
-<<<<<<< HEAD
+
     
     <!-- 导航区域 -->
-=======
+
 
     <!-- 导航区域 -->
 
->>>>>>> v3
+
     <ul class="navs">
       <li :class="{ active: active === 0 }" @click="scrollTo(0)">
         推荐
       </li>
-<<<<<<< HEAD
+
       <Navili v-for="(item, index) in naviList" :key="index" :class="{ active: active === index+1 }" :oneli=item :index=(index+1)
         :active=active @click="scrollTo(index+1)"></Navili>
 
     </ul>
     
   </div>
-  
-=======
 
-      <template v-for="(item, index) in naviList">
-        <Navili :class="{ active: active === index+1 }" :oneli=item :index=(index+1) v-if="item.hasCard" :active=active
-          @click="scrollTo(index + 1)"></Navili>
-      </template>
-
-    </ul>
-  </div>
->>>>>>> v3
 </template>
 
 
 
 <style scoped>
-<<<<<<< HEAD
+
 /* 内容区的样式 */
 .content {
   background-color: white;
@@ -352,15 +283,15 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
 .navs {
   position: fixed;
   top: 100px;
-=======
-.content {
-  background-color: white;
-  width: 89.1%;
-  margin-left: 190px;
-  box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
-  border-radius: 5px;
-}
 
+	.content {
+		background-color: white;
+		width: 89.1%;
+		margin-left: 190px;
+		box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
+		border-radius: 5px;
+	}
+}
 
 
 
@@ -373,25 +304,25 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
   position: fixed;
   height: auto;
   top: 95px;
->>>>>>> v3
+
 
 }
 
 .navs li {
 
-<<<<<<< HEAD
+
   padding: 0 40px;
   line-height: 2.6;
   font-size: 15px;
   color: #909399;
-=======
+
   text-align: center;
   line-height: 3;
   font-size: 15.5px;
   color: #909399;
   background-color: white;
   margin-right: 15px;
->>>>>>> v3
+
 }
 
 .navs li:hover {
@@ -405,23 +336,19 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
 }
 
 .model-title {
-<<<<<<< HEAD
-=======
+
   margin-top: -9px;
->>>>>>> v3
+
   height: 30px;
 }
 
 .grid-tuijian {
-<<<<<<< HEAD
-  display: grid;
-  grid-template-columns: repeat(auto-fill, 415px);
-=======
+
 
 
   display: grid;
   grid-template-columns: repeat(auto-fill, 484px);
->>>>>>> v3
+
   gap: 10px;
   grid-auto-flow: row dense;
 
@@ -429,46 +356,33 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
 
 .tuijian-card {
   display: flex;
-<<<<<<< HEAD
-  width: 412px;
-=======
+
   width: 481px;
->>>>>>> v3
+
   height: 140px;
   padding: 3px;
   border-radius: 8px;
   flex-direction: row;
   flex-wrap: wrap;
-<<<<<<< HEAD
-  /* border:#909399 1px solid; */
-  /* box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; */
-=======
->>>>>>> v3
   box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
 }
 
 .mycarousel {
-<<<<<<< HEAD
-  grid-row-start: 1;
-  grid-row-end: 3;
-  border-radius: 15px;
-=======
+
 
   grid-row-start: 1;
   grid-row-end: 3;
   border-radius: 15px;
   width: 480px;
   height: 290px;
->>>>>>> v3
+
 }
 
 .card-right {
   display: flex;
-<<<<<<< HEAD
-  width: 260px;
-=======
+
   width: 300px;
->>>>>>> v3
+
   flex-direction: column;
   flex-wrap: wrap;
   padding-left: 8px;
@@ -476,18 +390,6 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
 
 .card-title {
 
-<<<<<<< HEAD
-  /* height: 1.5em !important;
-  overflow: hidden; 
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
-  line-height: 25px;
-  height: 85px; */
-
-=======
->>>>>>> v3
 
   height: 1.5em !important;
   display: -webkit-box;
diff --git a/src/views/knowledge/news/dialog.vue b/src/views/knowledge/news/dialog.vue
index 53ee64600..cd37cdda9 100644
--- a/src/views/knowledge/news/dialog.vue
+++ b/src/views/knowledge/news/dialog.vue
@@ -40,11 +40,6 @@
   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;
diff --git a/src/views/knowledge/news/index.vue b/src/views/knowledge/news/index.vue
index 9c1815bcd..997cf72f8 100644
--- a/src/views/knowledge/news/index.vue
+++ b/src/views/knowledge/news/index.vue
@@ -1,24 +1,12 @@
-<<<<<<< HEAD
+
 <!--
 @ 作者: 鲁智强
 @ 时间: 2023-08-28 11:13:14
 @ 备注: 
 -->
+
 <script lang='ts' setup>
 import aaComponent from "./aa.vue"
-</script>
-<template>
-	<div>
-	<aa-component></aa-component>
-    </div>
-</template>
-<style  lang='scss' scoped>
-* {
-  background-color: #fff;
-}
-</style>
-=======
-<script lang='ts' setup>
 import { useUserStore } from "@/store/modules/user"
 
 import { ref } from 'vue'
@@ -374,5 +362,3 @@ function showContentDialog(item: any) {
 
 }
 </style>
-
->>>>>>> v3
diff --git a/src/views/opk/asd/news/dialog.vue b/src/views/opk/asd/news/dialog.vue
index 4137810c0..0f6fb83dd 100644
--- a/src/views/opk/asd/news/dialog.vue
+++ b/src/views/opk/asd/news/dialog.vue
@@ -60,14 +60,7 @@
   import {editPostCont} from '@/api/opk/pulic/api'
   import { ge_add } from '@/api/opk/news/api'
   import { create_scheme } from '@/api/opk/zxy/news/api'
-<<<<<<< HEAD
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-=======
->>>>>>> luzhiqiang_v1
   interface FormInfo {
 	id: string;
 	age: string;
diff --git a/src/views/opk/asd/news/dialoglog.vue b/src/views/opk/asd/news/dialoglog.vue
index 85219e9ad..81de27c41 100644
--- a/src/views/opk/asd/news/dialoglog.vue
+++ b/src/views/opk/asd/news/dialoglog.vue
@@ -54,14 +54,7 @@
 	  <script lang="ts" setup>
 	  import { reactive } from "vue"
 	  import { ge_copy,create_scheme_for } from '@/api/opk/zxy/news/api'
-<<<<<<< HEAD
-<<<<<<< HEAD
-	  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-=======
->>>>>>> luzhiqiang_v1
 	const isshow = ref(false)
 	const props= defineProps( {
 	      title: {
diff --git a/src/views/opk/asd/news/hyr.vue b/src/views/opk/asd/news/hyr.vue
index aade4ca18..8b343a0eb 100644
--- a/src/views/opk/asd/news/hyr.vue
+++ b/src/views/opk/asd/news/hyr.vue
@@ -28,14 +28,7 @@
   import { reactive } from "vue"
   import {ElMessage} from "element-plus"
   import {get_runman,get_org,edit_scheme } from '@/api/opk/zxy/news/api'
-<<<<<<< HEAD
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-=======
->>>>>>> luzhiqiang_v1
 const isshow = ref(false)
 const props= defineProps( {
 	  title: {
diff --git a/src/views/opk/asd/news/xd.vue b/src/views/opk/asd/news/xd.vue
index 0e93673f5..49285e443 100644
--- a/src/views/opk/asd/news/xd.vue
+++ b/src/views/opk/asd/news/xd.vue
@@ -20,14 +20,7 @@
   <script lang="ts" setup>
   import { reactive } from "vue"
   import {get_runman } from '@/api/opk/zxy/news/api'
-<<<<<<< HEAD
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-=======
->>>>>>> luzhiqiang_v1
 const isshow = ref(false)
 const props= defineProps( {
 	  title: {
diff --git a/src/views/opk/asd/news/ycy.vue b/src/views/opk/asd/news/ycy.vue
index 9f2c3be47..87f22018e 100644
--- a/src/views/opk/asd/news/ycy.vue
+++ b/src/views/opk/asd/news/ycy.vue
@@ -17,14 +17,7 @@
   <script lang="ts" setup>
   import { reactive } from "vue"
   import { get_runman,look_scheme } from '@/api/opk/zxy/news/api'
-<<<<<<< HEAD
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-=======
->>>>>>> luzhiqiang_v1
 const isshow = ref(false)
 const props= defineProps( {
 	  title: {
diff --git a/src/views/opk/asd/news/yg.vue b/src/views/opk/asd/news/yg.vue
index 2f822761f..151ab435c 100644
--- a/src/views/opk/asd/news/yg.vue
+++ b/src/views/opk/asd/news/yg.vue
@@ -59,14 +59,7 @@
   import Xd from './xd.vue'
   import Hyr from './hyr.vue'
   import Ycy from './ycy.vue'
-<<<<<<< HEAD
-<<<<<<< HEAD
-  
-=======
 
->>>>>>> 38c779d97b6527d17fa4fd5d13cdc2a5582c1bca
-=======
->>>>>>> luzhiqiang_v1
 const isshow = ref(false)
 const props= defineProps( {
 	  title: {
diff --git a/src/views/opk/yui/new/dialog.vue b/src/views/opk/yui/new/dialog.vue
index 0fd5f6f03..88d5cdaeb 100644
--- a/src/views/opk/yui/new/dialog.vue
+++ b/src/views/opk/yui/new/dialog.vue
@@ -55,10 +55,6 @@
   import {tarlist,addPostCont,addtarget,getgroupuser,addposttargetcont,search_orgpost,positionlist} from '@/api/opk/api'
   import {editPostCont} from '@/api/opk/pulic/api'
   import {govthree} from '@/api/opk/opk/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
   interface FormInfo {
 	id: string;
 	age: string;
diff --git a/src/views/opk/yui/new/diolog.vue b/src/views/opk/yui/new/diolog.vue
index 56f818f14..75c4f71bd 100644
--- a/src/views/opk/yui/new/diolog.vue
+++ b/src/views/opk/yui/new/diolog.vue
@@ -52,10 +52,7 @@
   import { reactive } from "vue";
   import {tarlist,addPostCont,addtarget,getgroupuser} from '@/api/opk/api'
   import {editPostCont} from '@/api/opk/pulic/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
   interface FormInfo {
 	id: string;
 	age: string;
diff --git a/src/views/opk/yui/new/edcialog.vue b/src/views/opk/yui/new/edcialog.vue
index 10cc7b4b7..43f158e1b 100644
--- a/src/views/opk/yui/new/edcialog.vue
+++ b/src/views/opk/yui/new/edcialog.vue
@@ -29,13 +29,11 @@
   import { reactive } from "vue";
   import { getgroupusers,positionlist,getgroupuser } from '@/api/opk/api'
   import {editPostCont} from '@/api/opk/pulic/api'
-<<<<<<< HEAD
+
   
 import form from "@/api/DesignForm/form";
 import { TableV2SortOrder } from "element-plus";
-=======
-  import { TableV2SortOrder } from "element-plus";
->>>>>>> luzhiqiang_v1
+
   interface FormInfo {
 	id: string;
 	age: string;
diff --git a/src/views/opk/yui/new/lc.vue b/src/views/opk/yui/new/lc.vue
index 497d334c6..3a1f92fd0 100644
--- a/src/views/opk/yui/new/lc.vue
+++ b/src/views/opk/yui/new/lc.vue
@@ -64,10 +64,7 @@
   import { reactive } from "vue";
   import { getsontarget,table_add,getnew_target,addtabledetail,get_organdpost } from '@/api/opk/opk/api'
   import { getgroupuser } from '@/api/opk/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
 const isshow = ref(false)
 const uio = ref("")
 const num = ref(1)
diff --git a/src/views/opk/yui/new/lzq.vue b/src/views/opk/yui/new/lzq.vue
index 687cd1482..a57277c4b 100644
--- a/src/views/opk/yui/new/lzq.vue
+++ b/src/views/opk/yui/new/lzq.vue
@@ -62,10 +62,7 @@
   import {get_target_details} from '@/api/opk/news/api'
   import { addPostCont,getgroupuser } from '@/api/opk/api'
   import { getonedetailedtarget,getcompany,edit_detail } from '@/api/opk/opk/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
 const isshow = ref(false)
 const num = (1)
 const props= defineProps( {
diff --git a/src/views/opk/yui/new/ta.vue b/src/views/opk/yui/new/ta.vue
index f4f147350..c7559ee74 100644
--- a/src/views/opk/yui/new/ta.vue
+++ b/src/views/opk/yui/new/ta.vue
@@ -25,10 +25,7 @@
   import { reactive } from "vue";
   import { getsontarget,table_add,edit_newson,getnew_target,get_organdpost } from '@/api/opk/opk/api'
   import { getgroupuser,addPostCont } from '@/api/opk/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
 const isshow = ref(false)
 const num = ref(0)
 const props= defineProps( {
diff --git a/src/views/opk/yui/new/wyc.vue b/src/views/opk/yui/new/wyc.vue
index 738a80ec8..714e2c579 100644
--- a/src/views/opk/yui/new/wyc.vue
+++ b/src/views/opk/yui/new/wyc.vue
@@ -54,10 +54,7 @@
   import { reactive } from "vue";
   import {getsontarget,table_add} from '@/api/opk/opk/api'
   import { getgroupuser } from '@/api/opk/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
 const isshow = ref(false)
 const uio = ref("")
 const num = ref(1)
diff --git a/src/views/opk/yui/new/xy.vue b/src/views/opk/yui/new/xy.vue
index 83251ba2b..0b971c57c 100644
--- a/src/views/opk/yui/new/xy.vue
+++ b/src/views/opk/yui/new/xy.vue
@@ -70,11 +70,9 @@
   <script lang="ts" setup>
   import { reactive } from "vue";
   import { getdetailscont,getnew_target,edit_post,get_organdpost } from '@/api/opk/opk/api'
-<<<<<<< HEAD
-  
-=======
+
 	import {getgroupuser} from '@/api/opk/api'
->>>>>>> luzhiqiang_v1
+
 const isshow = ref(false)
 const num = (1)
 const props= defineProps( {
diff --git a/src/views/opk/yui/new/zjr.vue b/src/views/opk/yui/new/zjr.vue
index cbae1fa27..6b849d3ad 100644
--- a/src/views/opk/yui/new/zjr.vue
+++ b/src/views/opk/yui/new/zjr.vue
@@ -92,10 +92,7 @@
   import Wyc from './wyc.vue'
   import Lzq from './lzq.vue'
   import Zz from './zz.vue'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
 const isshow = ref(false)
 const data = reactive({
 	lzqPostBox:false,
diff --git a/src/views/opk/yui/new/zz.vue b/src/views/opk/yui/new/zz.vue
index bdb7202ed..cbcb5798c 100644
--- a/src/views/opk/yui/new/zz.vue
+++ b/src/views/opk/yui/new/zz.vue
@@ -25,10 +25,7 @@
   import { reactive } from "vue";
   import { getsontarget,table_add,edit_table } from '@/api/opk/opk/api'
   import { getgroupuser,addPostCont } from '@/api/opk/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
 const isshow = ref(false)
 const num = ref(1)
 const props= defineProps( {
diff --git a/src/views/opk/yui/public/dialog.vue b/src/views/opk/yui/public/dialog.vue
index 3dca5bec1..21f57110e 100644
--- a/src/views/opk/yui/public/dialog.vue
+++ b/src/views/opk/yui/public/dialog.vue
@@ -26,10 +26,7 @@
   <script lang="ts" setup>
   import { reactive } from "vue";
   import {adddutyclass,editPostCont} from '@/api/opk/pulic/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
   interface FormInfo {
 	id: string;
 	age: string;
diff --git a/src/views/opk/yui/public/editduty.vue b/src/views/opk/yui/public/editduty.vue
index 79eb6e71b..88b0d6db3 100644
--- a/src/views/opk/yui/public/editduty.vue
+++ b/src/views/opk/yui/public/editduty.vue
@@ -24,10 +24,7 @@
   <script lang="ts" setup>
   import { reactive } from "vue";
   import {adddutyclass,editPostCont,getdutyclassinfo,eitedutyclassinfo} from '@/api/opk/pulic/api'
-<<<<<<< HEAD
-  
-=======
->>>>>>> luzhiqiang_v1
+
   interface FormInfo {
 	id: number;
 	sort: number;
diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue
index 258d10400..773ef5d1e 100644
--- a/src/views/sysworkflow/flow/flowDrawingBoard.vue
+++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue
@@ -71,12 +71,13 @@ const getFlowVerList = ()=>{
 		.then(({data})=>{
 			if(data){
 				if(data.length>0){
-					versionList.value = data;
-					data.forEach(item=>{
+					data.forEach((item:any)=>{
 						if(item.state == 1){
 							activeTabs.value = item.version
 						}
 					})
+					versionList.value = data;
+					
 				}
 			}
 		})