From 573244aac2489a1a097d6f06c68c545ac8b042cb Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 2 Sep 2024 20:22:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B7=AF=E5=BE=84=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B92.=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/device/fileService/index.vue | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/views/govern/device/fileService/index.vue b/src/views/govern/device/fileService/index.vue
index 9beefbe..149b0fd 100644
--- a/src/views/govern/device/fileService/index.vue
+++ b/src/views/govern/device/fileService/index.vue
@@ -27,21 +27,49 @@
                 ></el-input>
                 <el-button type="primary" @click="handleSearch">搜索</el-button>
                 <el-button @click="handleRefresh">重置</el-button>
+                <el-upload
+                        action=""
+                        :auto-upload="false"
+                        :show-file-list="false"
+                        :on-change="
+                                    (file:any, fileList:any) => {
+                                        handleUpload(file, fileList, activePath)
+                                    }
+                                "
+                    >
+                        <el-button>
+                                文件上传<el-icon class="el-icon--right"><Upload /></el-icon>
+                        </el-button>
+                    </el-upload>
             </div>
             <div class="list" v-if="dirList.length != 0 && !loading">
+                <!-- <div class="list_upload">
+                    <el-upload
+                        action=""
+                        :auto-upload="false"
+                        :on-change="
+                                    (file:any, fileList:any) => {
+                                        handleUpload(file, fileList, activePath)
+                                    }
+                                "
+                    >
+                        <el-button>
+                                文件上传<el-icon class="el-icon--right"><Upload /></el-icon>
+                        </el-button>
+                    </el-upload>
+                </div> -->
                 <div class="list_item" v-for="(item, index) in dirList" :key="index">
                     <div class="item_download">
                         <el-button v-if="item?.type == 'file'" size="small" @click="handleDownLoad(item)" circle>
                             <el-icon><Download /></el-icon>
                         </el-button>
                     </div>
-                    <div class="item_upload">
+                    <!-- <div class="item_upload">
                         <el-upload
                             v-if="item?.type == 'dir'"
                             style="display: inline-block"
                             action=""
                             class="upload-demo"
-                            :show-file-list="true"
                             :auto-upload="false"
                             :on-change="
                                     (file:any, fileList:any) => {
@@ -53,7 +81,7 @@
                                 <el-icon><Upload /></el-icon>
                             </el-button>
                         </el-upload>
-                    </div>
+                    </div> -->
                     <img v-if="item?.type == 'dir'" @click="handleIntoDir(item)" src="@/assets/img/wenjianjia.svg" />
                     <img
                         class="img_file"
@@ -221,7 +249,7 @@ const handleUpload = (e: any, fileList: any, row: any) => {
     const obj = {
         id: nDid.value,
         file: e.raw,
-        filePath: row.prjDataPath
+        filePath: row|| row.prjDataPath
     }
     uploadDeviceFile(obj).then(res => {
         console.log(res, '上传文件毁掉')
@@ -297,6 +325,14 @@ watch(
             height: 100%;
             padding-bottom: 200px;
             z-index: 100;
+            position: relative;
+            .list_upload {
+                position: absolute;
+                width: 100px;
+                height: 40px;
+                right: 20px;
+                top: 10px;
+            }
             .list_item {
                 flex: none;
                 width: 23.3%;