文件同步

src/api/modules/other.js

@@ -83,19 +83,13 @@ export const getSameGradeNode = (form, msg = true) => httpApi({
 export const submitArchiveTreeSort = (form, msg = true) => httpApi({
     url: '/api/blade-manager/archiveTreeContract/submit-tree-sort',
     method: 'post',
-<<<<<<< HEAD
     data: form,
 }, msg)
-=======
-    data: form
-}, msg);
->>>>>>> bc916ec67c2e92e4f871e0ef5d9f4d8be2dcf804
 
 //同步
 export const syncProjectTree = (form, msg = true) => httpApi({
     url: '/api/blade-manager/archiveTreeContract/syncProjectTree',
     method: 'post',
-<<<<<<< HEAD
     params: form,
 }, msg)
 //文件同步
@@ -104,36 +98,20 @@ export const syncFileTree = (form, msg = true) => httpApi({
     method: 'post',
     params: form,
 }, msg)
-=======
-    params: form
-}, msg);
-
->>>>>>> bc916ec67c2e92e4f871e0ef5d9f4d8be2dcf804
 
 //所属角色
 export const roletree = (form, msg = true) => httpApi({
     url: '/api/blade-system/role/tree',
       method: 'get',
       params: {
-<<<<<<< HEAD
         tenantId: '',
       },
 }, msg)
-=======
-        tenantId: ''
-      }
-}, msg);
->>>>>>> bc916ec67c2e92e4f871e0ef5d9f4d8be2dcf804
 
 
 //获取更新信息
 export const getVersionJson = () => httpApi({
     url: 'version.json?time=' + new Date().getTime(),
-<<<<<<< HEAD
     method: 'get',
 }, false)
-=======
-    method: 'get'
-}, false);
->>>>>>> bc916ec67c2e92e4f871e0ef5d9f4d8be2dcf804
 

src/views/file/collection.vue

@@ -14,7 +14,6 @@
             </div>
             <div v-loading="treeLoading" class="hc-tree-box" element-loading-text="加载中...">
                 <el-scrollbar>
-<<<<<<< HEAD
                     <HcTree
                         ref="treeRef" 
                         :project-id="projectId" 
@@ -25,9 +24,6 @@
                         @nodeLoading="treeNodeLoading" 
                         @menuTap="ElTreeMenuClick"
                     />
-=======
-                    <HcTree ref="treeRef" :project-id="projectId" :contract-id="contractId" :auto-expand-keys="treeAutoExpandKeys" @nodeTap="projectTreeClick" @nodeLoading="treeNodeLoading" @menuTap="ElTreeMenuClick" />
->>>>>>> bc916ec67c2e92e4f871e0ef5d9f4d8be2dcf804
                 </el-scrollbar>
             </div>
             <!-- 左右拖动 -->
@@ -470,7 +466,6 @@ onMounted(() => {
     treeLoading.value = true
     setTableColumns()
 })
-<<<<<<< HEAD
 //设置树菜单数据
 const ElTreeMenu = ref([
     { icon: 'add-circle', label: '新增', key: 'add' },
@@ -479,9 +474,6 @@ const ElTreeMenu = ref([
     { icon: 'refresh', label: '目录同步', key: 'sync' },
     { icon: 'sort-asc', label: '排序', key: 'sort' },
 ])
-=======
-
->>>>>>> bc916ec67c2e92e4f871e0ef5d9f4d8be2dcf804
 //上传配置
 const UploadFileOptions = {
     headers: getTokenHeader(),