tangning 4 月之前
父节点
当前提交
71d0a53f0e
共有 4 个文件被更改,包括 15 次插入9 次删除
  1. 1 0
      src/request/urls.ts
  2. 8 7
      src/store/case.ts
  3. 5 1
      src/store/system.ts
  4. 1 1
      src/view/case/draw/board/index.js

+ 1 - 0
src/request/urls.ts

@@ -181,6 +181,7 @@ export const insertCaseFile = "/fusion/caseFiles/add";
 export const deleteCaseFile = "/fusion/caseFiles/delete";
 export const updateCaseFile = "/fusion/caseFiles/updateTitle";
 export const newFileupload = "/service/manage/common/upload/fileNew";
+export const newupload = "/service/manage/common/upload/files";
 //勘验笔录信息
 export const caseInquestInfoOld = "/fusion/caseInquestCriminal/info";
 export const caseInquestOpt = "/fusion/caseInquestCriminal/saveOrUpdate";

+ 8 - 7
src/store/case.ts

@@ -1,6 +1,7 @@
 import {
   axios,
   caseInfo,
+  newupload,
   getMapConfig,
   caseSceneList,
   getCasePsw,
@@ -240,17 +241,17 @@ export const getCaseScenes = (scenes: Scene[]) => {
 export const replaceCaseScenes = (caseId: number, caseScenes: CaseScenes) =>
   axios.post(repCaseScenes, { sceneNumParam: caseScenes, caseId });
 
-export const uploadNewFile = (data) => {
-  console.log('uploadNewFile',data);
-  return axios<undefined>({
+export const uploadNewFile = (data) => axios<undefined>({
     method: "POST",
     url: newFileupload,
     data: data,
-    // onUploadProgress(event: any) {
-    //   data.onProgress(Math.round((event.loaded / event.total) * 100) || 0);
-    // },
   });
-}
+
+export const uploadFiles = (data) => axios<undefined>({
+  method: "POST",
+  url: newupload,
+  data: data,
+});
 
 export type CaseImg = {
   id: number;

+ 5 - 1
src/store/system.ts

@@ -3,6 +3,7 @@ import {
   userLogin,
   uploadFile as uploadFileUrl,
   setLoginHook,
+  newupload,
   userInfo,
 } from "@/request";
 import { encodePwd } from "@/util";
@@ -10,6 +11,7 @@ import { user } from "./user";
 import { refreshRole } from "./role";
 import { changSaveLocal } from "@/util/localUtil";
 import { appConstant } from "@/app";
+import { router } from "@/router";
 import { ref, watchEffect } from "vue";
 function randomWord(randomFlag, min, max?) {
   let str = '';
@@ -150,7 +152,9 @@ if (user.value.token) {
 }
 
 export const uploadFile = async (file: File) => {
-  return (await axios.post<string>(uploadFileUrl, { file })).data;
+  const route = router.currentRoute.value;
+  const url = route.name !== 'drawShareFile'?uploadFileUrl:newupload
+  return (await axios.post<string>(url, { file })).data;
 };
 
 

+ 1 - 1
src/view/case/draw/board/index.js

@@ -3,7 +3,7 @@ import { text, table, compass, title, bgImage, customImage } from "./shape";
 import Layer from "./editCAD/Layer";
 import { history } from "./editCAD/History/History.js";
 import { uploadFile } from "@/store/system";
-import { uploadNewFile } from "@/store/case";
+import { uploadNewFile, uploadFiles } from "@/store/case";
 
 // const toStore = (refs) => {
 //   return {