From a1966feef6c13e9ad440fac9cbee9671b0b4f9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E5=BE=B7=E8=B6=85?=
 <13143889+he-dechao@user.noreply.gitee.com>
Date: Sun, 10 Aug 2025 20:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=B5=8B=E5=8E=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=E5=8E=9F=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-processing/data-storage/index.vue                 | 7 -------
 1 file changed, 7 deletions(-)

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,