diff --git a/src/views/operation-platform/data-processing/data-storage/index.vue b/src/views/operation-platform/data-processing/data-storage/index.vue
index e881a02..23de01b 100644
--- a/src/views/operation-platform/data-processing/data-storage/index.vue
+++ b/src/views/operation-platform/data-processing/data-storage/index.vue
@@ -92,12 +92,8 @@
 import { ref, reactive, computed, onMounted } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import type { TableColumnData } from '@arco-design/web-vue'
-<<<<<<< HEAD
 import PreviewModal from './components/PreviewModal.vue'
 import rawData from './components/raw-data.vue'
-=======
-
->>>>>>> 16743cfc7f885acdff70e08f20ddb7795d638a83
 import {
   getProjectList,
   getTurbineList,
@@ -330,12 +326,9 @@ const getImageUrl = (imagePath: string): string => {
 
 // 预览文件（待重新设计预览弹窗）
 const previewFile = (file: any) => {
-<<<<<<< HEAD
   /* previewFileData.value = file
    previewModalVisible.value = true*/
 
-=======
->>>>>>> 16743cfc7f885acdff70e08f20ddb7795d638a83
   const fileObj = {
     id: file.id,
     name: file.name,