gemercheung преди 1 година
родител
ревизия
ea84f9eb90
променени са 9 файла, в които са добавени 36 реда и са изтрити 13 реда
  1. 2 0
      .env
  2. 2 0
      .env.development
  3. 2 0
      .env.production
  4. 2 0
      .env.uat
  5. 1 0
      package.json
  6. 4 1
      src/request/URL.ts
  7. 6 0
      src/request/index.ts
  8. 8 3
      src/store/scene.ts
  9. 9 9
      vite.config.ts

+ 2 - 0
.env

@@ -0,0 +1,2 @@
+VITE_QJ_URL=https://test.4dkankan.com/panorama
+VITE_API=https://uat-sp.4dkankan.com/

+ 2 - 0
.env.development

@@ -0,0 +1,2 @@
+VITE_QJ_URL=https://test.4dkankan.com/panorama
+VITE_API=https://uat-sp.4dkankan.com/

+ 2 - 0
.env.production

@@ -0,0 +1,2 @@
+VITE_QJ_URL=https://test.4dkankan.com/panorama
+VITE_API=https://uat-sp.4dkankan.com/

+ 2 - 0
.env.uat

@@ -0,0 +1,2 @@
+VITE_QJ_URL=https://test.4dkankan.com/panorama
+VITE_API=https://uat-sp.4dkankan.com/

+ 1 - 0
package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc && vite build",
+    "build-uat": "vue-tsc && vite build --mode uat",
     "preview": "vite preview"
   },
   "dependencies": {

+ 4 - 1
src/request/URL.ts

@@ -47,4 +47,7 @@ export const addOrUpdateDrawing = `/relics/relics/drawing/saveOrUpdate`;
 export const delDrawing = `/relics/relics/drawing/del`;
 export const getDrawingDetail = `/relics/relics/drawing/info/:drawingId`;
 export const getDrawingInfoByRelicsId = `/relics/relics/drawing/infoByRelicsId/:drawingId`;
-export const updateDrawing = `/relics/relics/drawing/update`;
+export const updateDrawing = `/relics/relics/drawing/update`;
+
+//token
+export const getFdTokenByNum = `/relics/scene/getFdTokenByNum?num=`;

+ 6 - 0
src/request/index.ts

@@ -419,5 +419,11 @@ export const addDeviceFetch = (sn: string) =>
   });
 
 
+
+export const getTokenFetch = (num: string) =>
+  sendFetch(URL.getFdTokenByNum + num, {
+    method: "get",
+  });
+
 export * from './organization'
 export * from './users'

+ 8 - 3
src/store/scene.ts

@@ -5,6 +5,7 @@ import { gHeaders } from "@/request/state";
 import { relics } from "./relics";
 import { DeviceType, DeviceType as SceneType } from "./device";
 import { conversionFactory } from "@/helper/coord-transform";
+import { getTokenFetch } from '@/request'
 
 export type { Scene, ScenePoint };
 
@@ -101,7 +102,7 @@ export const updateScenePointName = async (
   relicsId.value && (await refreshScenes());
 };
 
-export const gotoScene = (scene: Scene, edit = false) => {
+export const gotoScene = async (scene: Scene, edit = false) => {
   const params = new URLSearchParams();
   if (edit) {
     params.set("token", gHeaders.token);
@@ -109,9 +110,13 @@ export const gotoScene = (scene: Scene, edit = false) => {
   params.set("lang", "zh");
   if (scene.sceneCode.startsWith("KJ")) {
     params.set("id", scene.sceneCode);
+    const qjURL = import.meta.env.VITE_QJ_URL
+    const res = await getTokenFetch(scene.sceneCode);
+    params.set("token", (res as any).token);
+    // console.log('')
     window.open(
-      `https://www.4dkankan.com/panorama/${edit ? "edit" : "show"}.html?` +
-        params.toString()
+      `${qjURL}/${edit ? "edit" : "show"}.html?` +
+      params.toString()
     );
   } else {
     params.set("m", scene.sceneCode);

+ 9 - 9
vite.config.ts

@@ -1,9 +1,9 @@
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import { resolve } from "path";
 import vue from "@vitejs/plugin-vue";
 
 // https://vitejs.dev/config/
-export default defineConfig({
+export default ({ mode }) => defineConfig({
   base: "./",
   plugins: [vue()],
   resolve: {
@@ -33,18 +33,18 @@ export default defineConfig({
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/gear1/, "/gear1"),
       },
-      // "/api": {
-      //   target: `https://sp.4dkankan.com/`,
-      //   // target: `http://192.168.0.11:8324/relics/`,
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, "/api"),
-      // },
       "/api": {
-        target: `https://uat-sp.4dkankan.com/`,
+        target: loadEnv(mode, process.cwd()).VITE_API,
         // target: `http://192.168.0.11:8324/relics/`,
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, "/api"),
       },
+      // "/api": {
+      //   target: `https://uat-sp.4dkankan.com/`,
+      //   // target: `http://192.168.0.11:8324/relics/`,
+      //   changeOrigin: true,
+      //   rewrite: (path) => path.replace(/^\/api/, "/api"),
+      // },
  
     },
   },