Merge branch 'v1.8.2-dev' of http://192.168.0.115:3000/bill/fuse-code into v1.8.2-dev

.env

@@ -1,4 +1,4 @@
-VITE_LASER_HOST=//uat-laser.4dkankan.com
+VITE_LASER_HOST=//laser.4dkankan.com/backend
 VITE_LASER_OSS=//laser-oss.4dkankan.com/
 VITE_OSS=//4dkk.4dage.com/
 VITE_PANO_OSS=//4dkk.4dage.com

.env copy

@@ -0,0 +1,5 @@
+VITE_LASER_HOST=//laser.4dkankan.com/backend
+VITE_LASER_OSS=//laser-oss.4dkankan.com/
+VITE_OSS=//4dkk.4dage.com/
+VITE_PANO_OSS=//4dkk.4dage.com
+

.production.env

@@ -1,5 +1,4 @@
-VITE_LASER_HOST=//uat-laser.4dkankan.com
+VITE_LASER_HOST=//laser.4dkankan.com/backend
 VITE_LASER_OSS=//laser-oss.4dkankan.com/
 VITE_OSS=//4dkk.4dage.com/
 VITE_PANO_OSS=//4dkk.4dage.com
-

src/api/constant.ts

@@ -5,7 +5,7 @@ export enum ResCode {
 }
 
 export const ResCodeDesc: { [key in ResCode]: string } = {
-  [ResCode.UN_AUTH] : '您没有访问权限',
+  [ResCode.UN_AUTH]: '您没有访问权限',
   [ResCode.TOKEN_INVALID]: 'token已失效',
   [ResCode.SUCCESS]: '请求成功'
 }
@@ -92,3 +92,16 @@ export const FLODER_LIST = `/fusion/caseFiles/allList`
 
 // 文件上传
 export const UPLOAD_FILE = `/fusion/upload/file`
+
+///fusion/caseImg/getFfmpegImage
+export const FFMPEG_IMAGE = `/fusion/caseImg/getFfmpegImage`
+
+export const CASE_INQUEST = "/fusion/caseInquest/info"
+
+export const CASE_DETAIL = "/fusion/caseExtractDetail/info"
+
+export const DOWN_DOCX = "/fusion/caseInquest/downDocx"
+
+export const DOWN_DOCX1 = "/fusion/caseExtractDetail/downDocx"
+
+export const MODEL_GETINFO = '/fusion/model/getInfo'

src/api/instance.ts

@@ -3,7 +3,7 @@ import { Dialog, Message } from "bill/index";
 import { showLoad, hideLoad } from "@/utils";
 import * as URL from "./constant";
 import { ResCode, ResCodeDesc } from "./constant";
-import { baseURL, params } from "@/env";
+import { appBackRoot, baseURL, params } from "@/env";
 import GAxios from "axios";
 
 const instance = axiosFactory();
@@ -27,27 +27,20 @@ export const {
 } = instance;
 
 const gotoLogin = () => {
-  GAxios.post("/service/manage/login", {
-    password: "MRinIEn3ExMjM0NTY=Q5Lm39urQWzN7k4oCG",
-    userName: "super-admin",
-    username: "super-admin",
-  }).then((res) => {
-    setToken(res.data.data.token)
-    setTimeout(() => location.reload())
-  });
-  // if (import.meta.env.DEV) {
-  //   GAxios.post("/service/manage/login", {
-  //     password: "MRinIEn3ExMjM0NTY=Q5Lm39urQWzN7k4oCG",
-  //     userName: "super-admin",
-  //     username: "super-admin",
-  //   }).then((res) => {
-  //     setToken(res.data.data.token)
-  //     setTimeout(() => location.reload())
-  //   });
-  // } else {
-  //   const loginHref = `/admin/#/statistics/scene`
-  //   location.href = loginHref + '?redirect=' + escape(location.href)
-  // }
+  if (import.meta.env.DEV) {
+    // GAxios.post("/service/manage/login", {
+    //   password: "MRinIEn3ExMjM0NTY=Q5Lm39urQWzN7k4oCG",
+    //   userName: "super-admin",
+    //   username: "super-admin",
+    // }).then((res) => {
+    //   setToken(res.data.data.token)
+    //   setTimeout(() => location.reload())
+    // });
+  } else {
+    const appID = params.app
+    const loginHref = `${appBackRoot[appID]}/#/login`
+    location.href = loginHref + '?redirect=' + escape(location.href)
+  }
 };
 
 addReqErrorHandler((err) => {

src/api/setup.ts

@@ -132,12 +132,12 @@ export const axiosFactory = () => {
 
       if (!matchURL(axiosConfig.unTokenSet, config)) {
         if (!axiosConfig.token) {
-          if (!matchURL(axiosConfig.unReqErrorSet, config)) {
-            console.log(config.url)
-            const error = new Error('缺少token')
-            callErrorHandler('req', error, config)
-            throw error
-          }
+          // if (!matchURL(axiosConfig.unReqErrorSet, config)) {
+          //   console.log(config.url)
+          //   const error = new Error('缺少token')
+          //   callErrorHandler('req', error, config)
+          //   throw error
+          // }
         } else {
           config.headers = {
             ...config.headers,

src/main.ts

@@ -40,7 +40,12 @@ watchEffect((onCleanup) => {
         URL.FLODER_LIST,
         URL.MODEL_SIGN,
         URL.CASE_INFO,
-        URL.AUTH_PWD
+        URL.AUTH_PWD,
+        URL.FFMPEG_IMAGE,
+        URL.CASE_INQUEST,
+        URL.CASE_DETAIL,
+        URL.DOWN_DOCX,
+        URL.DOWN_DOCX1
       ]
       : [URL.AUTH_PWD]