Merge branch 'liuqiang' into v3

src/components/FileTreeChoice/index.vue

@@ -17,7 +17,8 @@
         >
           <template #default="{ node,data }">
             <span style="display: flex;align-items: center;">
-              <img :src="fileImg" alt="" style="width: 20px;height: 20px;margin-right: 5px;"/>
+              <img v-if="!data.remark" :src="folderImg" alt="" style="width: 20px;height: 20px;margin-right: 5px;"/>
+              <img v-else :src="fileIcon" alt="" style="width: 20px;height: 20px;margin-right: 5px;"/>
               <!-- 放置图片 -->
               <span>{{ node.label }}</span>
               <!-- 显示节点标签 -->
@@ -41,7 +42,8 @@
   <script setup>
 import { reactive, ref, toRaw, toRefs, watch } from "vue";
 import { ElMessage } from "element-plus";
-import fileImg from "@/assets/images/file-img.png";
+import folderImg from "@/assets/images/file-img.png";
+import fileIcon from "@/assets/images/fileIcon.png";
 import useUserStore from "@/store/modules/user";
 import { defineEmits } from "vue";
 const opent = ref(true);
@@ -82,6 +84,7 @@ watchEffect(() => {
 const clickData = ref({});
 const handleNodeClick = (data) => {
   clickData.value = data;
+  // console.log('data',data);
 };
 //确定按钮
   const emit = defineEmits(["fileChangeMsg"]);

src/components/addFileDrop/addFileDrop.vue

@@ -0,0 +1,13 @@
+<template>
+    <div>
+
+    </div>
+</template>
+
+<script setup>
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/myfile/MyFile.vue

@@ -531,6 +531,8 @@
      <iframe :key="nowTime" :src="hisIfarmeData.src" :name="nowTime" id="iframeHis" frameborder="0" width="1200px"
      height="800px" class="iframeBox" ></iframe>
     </el-dialog>
+    <!-- 文件文件下拉框 -->
+    <addFileDrop></addFileDrop>
     <!-- <iframe v-if="hisIfarmeData?.src" :src="hisIfarmeData.src" id="iframeHis" frameborder="1" width="1200px"
      height="800px" class="iframeBox" ></iframe> -->
 </template>
@@ -589,6 +591,7 @@ import { getLevel } from '@/api/level/level.js';
 import { listInfo,selectInfo ,getFileByScanerId} from '@/api/scanner/info.js';
 import { getConfigKey } from "@/api/system/config.js"
 import TreeMenu from '@/components/TreeMenu/TreeMenu.vue'
+import addFileDrop from '@/components/addFileDrop/addFileDrop.vue'
 
 export default {
     directives: {