Merge branch 'dev' of http://192.168.0.115:3000/4dkankan/4dkankan_bim into dev

src/components/files/TagEditor.vue

@@ -174,8 +174,11 @@ const handlerUpload = async data => {
                 pushData.members = tag.members
                 pushData.createTime = response.data.createTime
                 pushData.createBy = response.data.createBy
+                if (window.kankan) {
+                    tags.value.push(pushData)
+                } else {
+                }
 
-                tags.value.push(pushData)
                 pushData = null
             }
             isEdit.value = false

src/components/files/index.vue

@@ -231,7 +231,7 @@ const onAddConfirm = () => {
         if (tag) {
             if (isAdd) {
                 tag.__temp = true
-                // tag._add = true
+                tag._add = true
                 isAdd = false
             }
 
@@ -242,6 +242,7 @@ const onAddConfirm = () => {
     }
     editTag = null
     tempTag = null
+
 }
 const onOutside = () => {
     if (showMoreSid.value) {

src/locales/ja.json

@@ -87,9 +87,9 @@
   },
   "toast.name": "ヒント",
   "common": {
-    "high": "高",
+    "high": "高い",
     "middle": "中",
-    "low": "低",
+    "low": "低い",
     "input": "入力してください",
     "publish": "送信",
     "submit": "提出",

src/utils/ConvertViews.js

@@ -32,7 +32,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
         
         //this.syncPosRot(sourceFakeApp.viewInfo, targetApp , convertInfo) //修改好位置朝向 这个4dkk的会报错但上一版是用这句
         if(sourceApp.sceneType == 'kankan' || sourceFakeApp.viewInfo.isAtPano){
-            this.flyToPano(targetApp, sourceFakeApp.viewInfo.currentPano?.id, null, {duration:0, zoomLevel:sourceFakeApp.viewInfo.zoomLevel})
+            this.flyToPano(targetApp, sourceFakeApp.viewInfo.currentPano, null, {duration:0, zoomLevel:sourceFakeApp.viewInfo.zoomLevel})
         }
          this.syncView(sourceApp, targetApp, convertInfo)//这个不记得有什么bug了
         
@@ -609,6 +609,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
             matrix.premultiply(moveBackMatrix)//再移动到realPosition的点0处
             return matrix
         }
+        let length = Math.min(panoPos1.length,  panoPos2.length)
         if(length == 0){
             convertInfo.convertMatrix = new THREE.Matrix4
             convertInfo.convertMatrixInvert = new THREE.Matrix4
@@ -619,7 +620,7 @@ export default class ConvertViews extends THREE.EventDispatcher{
             
         //检查是否重合。直接将matrix作用于pos1中，理想情况是会和pos2完全一样。
 
-        let length = Math.min(panoPos1.length,  panoPos2.length)
+        
         if(length>2){
             let diffVecs = panoPos1.slice(0,length).map((e,i)=>{
                 let newPos = e.clone().applyMatrix4(matrix) //旋转过后。