bill 1 месяц назад
Родитель
Сommit
3f6bc5cf25

+ 3 - 1
src/api/animation.ts

@@ -109,7 +109,9 @@ export const fetchAnimationModels = async () => {
   const ams = await axios.get<ServiceAnimationModel[]>(AM_MODEL_LIST, {
     params: { fusionId: params.caseId },
   });
-  return ams.map(serviceToLocal);
+  const nams = ams.map(serviceToLocal);
+  console.error('nams', nams)
+  return nams
 };
 
 export const fetchAnimationActions = async () => {

+ 1 - 1
src/api/fuse-model.ts

@@ -110,7 +110,7 @@ const serviceToLocal = (
     size: serviceModel.sceneData?.modelSize,
     raw: {
       ...serviceModel.sceneData,
-      sourceName: ui18n.t(`sys.camera${serviceModel.sceneData.type}`),
+      sourceName: ui18n.t(`sys${params.ga ? '.ga' : ''}.camera${serviceModel.sceneData.type}`),
       mapping: offline ? '' : serviceModel.sceneData.mapping,
       laserOSSRoot: offline ? './' : params.root ,
       // + '/' + serviceModel.sceneData.mapping + '',

+ 1 - 3
src/components/tagging/sign-new.vue

@@ -111,7 +111,6 @@ const queryItems = computed(() =>
     url: getResources(getFileUrl(image)),
   }))
 );
-console.log(props.tagging.styleId);
 const taggingStyle = computed(() => getTaggingStyle(props.tagging.styleId));
 const tag = markRaw(
   sdk.createTagging({
@@ -130,8 +129,7 @@ tag.showDelete = (show) => {
 tag.changeCanMove(false);
 
 const changePos = () => {
-  const old = { localPos: tag.getImageCenter(), modelId: props.scenePos.modelId };
-  console.log(pos.value, old);
+  pos.value = { localPos: tag.getImageCenter(), modelId: props.scenePos.modelId };
 };
 
 watch(taggingStyle, (icon) => icon && tag.changeImage(getFileUrl(icon.icon)));

+ 3 - 0
src/env/index.ts

@@ -72,6 +72,9 @@ export const params = reactive(
 params.caseId = Number(params.caseId);
 params.share = Boolean(Number(params.share));
 params.single = Boolean(Number(params.single));
+if ('ga' in params) {
+  params.ga = 'true'
+}
 
 export type Params = {
   caseId: number;

+ 10 - 1
src/lang/locales/en.json

@@ -356,6 +356,12 @@
     "addData": "Add data",
     "address": "Address\n",
     "all": "All",
+    "camera1": "4DKankan Minion/Mesh",
+    "camera2": "4DKankan Mega/Point Cloud",
+    "camera4": "4DKankan Mega/Mesh",
+    "camera5": "4DKankan Meta/Point Cloud",
+    "camera6": "4DKankan Meta/Mesh",
+    "camera7": "Panox",
     "cancel": "Cancel",
     "caseTitle": "Case\n",
     "copy": "Copy\n",
@@ -421,7 +427,10 @@
       "scaleErr": "The scaled part of {name} is not {scale}",
       "sizeErr": "The size of {name} exceeds {sizeStr}"
     },
-    "viewPWD": "Access password"
+    "viewPWD": "Access password",
+    "其他": "Other",
+    "高德影像地图": "Amap Imagery Map",
+    "高德矢量地图": "Amap Vector Map"
   },
   "tagging": {
     "apply": "Apply to all",

+ 10 - 1
src/lang/locales/ja.json

@@ -356,6 +356,12 @@
     "addData": "データ追加",
     "address": "アドレス\n",
     "all": "全て",
+    "camera1": "4DKankan Minion/Mesh",
+    "camera2": "4DKankan Mega/Point Cloud",
+    "camera4": "4DKankan Mega/Mesh",
+    "camera5": "4DKankan Meta/Point Cloud",
+    "camera6": "4DKankan Meta/Mesh",
+    "camera7": "Panox",
     "cancel": "キャンセル",
     "caseTitle": "案件\n",
     "copy": "コピー\n",
@@ -421,7 +427,10 @@
       "scaleErr": "{name}の比率が{scale}ではありません",
       "sizeErr": "{name}のサイズが{sizeStr}を超えています"
     },
-    "viewPWD": "アクセスパスワード"
+    "viewPWD": "アクセスパスワード",
+    "其他": "その他",
+    "高德影像地图": "Amap イメージ地図",
+    "高德矢量地图": "Amap ベクトル地図"
   },
   "tagging": {
     "apply": "全てに適用",

+ 10 - 1
src/lang/locales/ko.json

@@ -356,6 +356,12 @@
     "addData": "데이터 추가",
     "address": "주소\n",
     "all": "전부",
+    "camera1": "4DKankan Minion/Mesh",
+    "camera2": "4DKankan Mega/Point Cloud",
+    "camera4": "4DKankan Mega/Mesh",
+    "camera5": "4DKankan Meta/Point Cloud",
+    "camera6": "4DKankan Meta/Mesh",
+    "camera7": "Panox",
     "cancel": "취소하다",
     "caseTitle": "사건\n",
     "copy": "복사\n",
@@ -421,7 +427,10 @@
       "scaleErr": "{name}의 비율 부위는 {scale}이 아닙니다",
       "sizeErr": "{name}의 크기가 {sizeStr}를 초과했습니다"
     },
-    "viewPWD": "액세스 비밀번호"
+    "viewPWD": "액세스 비밀번호",
+    "其他": "기타",
+    "高德影像地图": "Amap 이미지 지도",
+    "高德矢量地图": "Amap 벡터 지도"
   },
   "tagging": {
     "apply": "전체에 적용하다",

+ 2 - 1
src/lang/locales/zh.json

@@ -430,7 +430,8 @@
     },
     "viewPWD": "访问密码",
     "其他": "其他",
-    "高德影像地图": "高德影像地图"
+    "高德影像地图": "高德影像地图",
+    "高德矢量地图": "高德矢量地图"
   },
   "tagging": {
     "apply": "应用到全部",

+ 2 - 2
src/store/tagging-positions.ts

@@ -45,8 +45,8 @@ export const getTaggingPositions = (tagging: Tagging) =>
   taggingPositions.value.filter(position => position.taggingId === tagging.id) || []
 
 export const getTaggingPositionIsShow = (position: TaggingPosition) => {
-    const model = getFuseModel(position.modelId)
-    return custom.showTaggings && model && model.loaded && getFuseModelShowVariable(model).value
+  const model = getFuseModel(position.modelId)
+  return custom.showTaggings && model && model.loaded && getFuseModelShowVariable(model).value
 }