bill 1 viikko sitten
vanhempi
commit
1bfb9204a4
4 muutettua tiedostoa jossa 8 lisäystä ja 4 poistoa
  1. 2 0
      src/api/material.ts
  2. 1 1
      src/sdk/cover/index.js
  3. 3 1
      src/views/tagging/index.vue
  4. 2 2
      vite.config.ts

+ 2 - 0
src/api/material.ts

@@ -29,6 +29,7 @@ type ServiceMaterial = {
   fileFormat: string;
   fileName: string;
   fileSize: string;
+  useType: string;
   fileType: FileType;
   fileUrl: string;
   id: number;
@@ -65,6 +66,7 @@ export type Material = {
   group: string;
   uploadId?: number;
   isSystem?: number;
+  useType: string;
   dictId?: number
   modelId?: number;
   fileType: FileType,

+ 1 - 1
src/sdk/cover/index.js

@@ -2412,7 +2412,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
 
             viewer.backgroundOpacity = 0
             //密钥
-            Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ZGM2YzY0ZC1kNWE0LTRiYTgtYTkwNS1kYmJiODRjMWUwMmQiLCJpZCI6MjMzMTQ1LCJpYXQiOjE3MjI5OTUwNTB9.niqpkl6xOkQ2KeJjelyDDDydmSGqKXKb5cX2NyxSNAw'
+            Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIxOGJlY2NkYy04NGZiLTQ2MzYtYWJmZi0xNzNlNDk0N2Q2YjAiLCJpZCI6MjUyOTI2LCJpYXQiOjE3MzA3ODY3MTN9.GiCzHsI5RCIWSPp5aiI7mvsu0emeCtjrTNOpwyIK7zw'
             
  
             window.cesiumViewer = new Cesium.Viewer('app', {

+ 3 - 1
src/views/tagging/index.vue

@@ -114,7 +114,8 @@ const exposeTagging = async () => {
       tagging.audioName = item.name;
     }
 
-    if (item.dictId) {
+    console.log(item);
+    if (item.dictId && item.useType === "trace_evidence") {
       const typeId = getStyleTypeId(item.dictId);
       const styles = taggingStyles.value.filter((item) => item.typeId === typeId);
       if (styles.length) {
@@ -124,6 +125,7 @@ const exposeTagging = async () => {
       const styles = taggingStyles.value.filter(
         (item) => item.typeId === defStyleType.id
       );
+      console.log(defStyleType);
       if (styles.length) {
         tagging.styleId = styles[0].id;
       }

+ 2 - 2
vite.config.ts

@@ -5,8 +5,8 @@ import mkcert from 'vite-plugin-mkcert'
 
 import { resolve } from 'path'
 
-const oss = `http://192.168.0.125:1804/`
-const ip = `http://192.168.0.125:1804/`
+const oss = `https://phx.4dkankan.com/`
+const ip = `https://phx.4dkankan.com/`
 const proxy = {
   '/offlineData': {
     target: 'http://192.168.0.43:9000/',