Merge branch 'liuqiang' into v3

src/api/upload/upload.js

@@ -10,6 +10,17 @@ function uploadFile(data) {
         },
     })
 }
+// 上传文字识别图片
+function uploadImg(data) {
+    return request({
+        url: `/upload`,
+        method: "post",
+        data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        },
+    })
+}
 // 上传多文件
 function uploadFileMany(data) {
     return request({
@@ -21,4 +32,5 @@ function uploadFileMany(data) {
 export default {
     uploadFile,
     uploadFileMany,
+    uploadImg
 }

src/components/IdentifyFont/IdentifyFont.vue

@@ -4,12 +4,12 @@
     <div v-if="thisStep === 'start'" class="up_box">
       <div class="left_box">
         <div class="upimg_box boder_box">
-          <!-- TODO 拖拽设置不生效问题 ,但是测试那里可以实现拖拽，离大谱-->
           <el-upload
             v-if="!showImg"
             class="avatar-uploader"
             :drag="true"
             :action="actionUrl"
+            :headers="headersObj"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeUp"
@@ -25,6 +25,7 @@
           <el-upload
             class="avatar-uploader"
             :action="actionUrl"
+            :headers="headersObj"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeUp"
@@ -119,6 +120,7 @@ import Loading from "@/components/Loading/Loading.vue";
 import PicTree from "@/components/PicTree/PicTree.vue"; //选择文件发送的列表
 import { picTree } from "@/api/search/search.js";
 import { ocrRemark, preview } from "@/api/common/common.js";
+import Cookies from "js-cookie";
 const textData = ref(""); //解析出来的文字
 const showImg = ref(); //上传的图片
 const isOpen = ref(props.openFile);
@@ -126,8 +128,11 @@ const thisStep = ref("start"); //解析进度 start,loading,end,
 const openFile = ref(false); //控制tree显示
 const treeData = ref(); //树节点数据
 const actionUrl = ref(
-  `${window.location.origin}${import.meta.env.VITE_APP_BASE_API}/upload`
+  `${window.location.origin}${import.meta.env.VITE_APP_BASE_API}/api/upload`
 );
+const headersObj = ref({
+   Authorization:Cookies.get("Admin-Token")
+})
 // const actionUrl = ref(`${window.location.origin}/upload`);
 const loadingPreview = ref(true);
 const addFolderAdd = inject("addFolderAdd");

src/views/collect/index.vue

@@ -604,6 +604,11 @@ const addCollectFn = async () => {
     tabName.value = "";
     return ElMessage.error("已到最大数量，请先删除其他收藏标签！")
   }
+  const hasIt = list.some(item=>item.labelName === tabName.value)
+  if(hasIt){
+
+    return ElMessage.error("标签名已存在！")
+    } 
   let order = 0;
   if (list.length > 0) {
     order = getBigOrder(list);

src/views/department/MyFile.vue

@@ -468,7 +468,7 @@ import BreadMenu from './components/BreadMenu.vue'
 import FileEdit from '@/views/myfile/components/FileEdit.vue'
 import TransferModal from './modalComponebts/Transfer.vue'
 import CreateFloder from './modalComponebts/CreateFloder.vue'
-import FileCollect from './modalComponebts/FileCollect.vue'
+import FileCollect from '@/views/myfile/modalComponebts/FileCollect.vue'
 import FolderReName from './modalComponebts/FolderReName.vue'
 import SpaceBig from './modalComponebts/SpaceBig.vue'
 // import PlaceGridFolder from './components/PlaceGridFolder.vue'

src/views/myfile/modalComponebts/FileCollect.vue

@@ -88,6 +88,10 @@ export default {
             }
             const res = await listLabel();
             if(res.rows.length >= 10) return ElMessage.error("已到最大数量，请先删除其他收藏标签！")
+            const hasIt = res.rows.some(item=>item.labelName === newTag.value)
+            if(hasIt){
+                return ElMessage.error("标签名已存在！")
+                } 
             collect.addNewTag({ labelName: newTag.value, orderNum: sortNum.value + 1 }).then(res => {
                 if (res.code === 200) {
                     ElMessage({