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

src/layout/edit/scene-select.vue

@@ -100,11 +100,21 @@ const Search = Input.Search;
 const selectIds = computed(() => fuseModels.value.map((item) => item.modelId));
 const visible = ref(false);
 const keyword = ref("");
+const SceneGroupTypeDesc: any = {
+  [SceneType.SWKK]: 'Mesh场景',
+  [SceneType.SWKJ]: 'Mesh场景',
+  [SceneType.SWSS]: '点云场景',
+  [SceneType.SWSSMX]: 'Mesh场景',
+  [SceneType.SWYDSS]: '点云场景',
+  [SceneType.SWYDMX]: 'Mesh场景',
+  [SceneType.DSFXJ]: 'Mesh场景'
+}
+
 const origin = computed(() =>
   scenes.value.filter(scene => scene.type !== SceneType.SWMX).map((scene) => ({
     ...scene,
     createTime: scene.createTime.substr(0, 16),
-    type: SceneTypeDesc[scene.type],
+    type: SceneGroupTypeDesc[scene.type],
   }))
 );
 
@@ -115,7 +125,6 @@ const typeFilterScenes = computed(() => {
       .filter((item) => item.name && item.modelId && item.name.includes(keyword.value))
       .filter((item) => item.type === type);
   }
-  console.log(typeScenes, origin.value);
   return typeScenes;
 });
 

src/views/proportion/index.vue

@@ -6,6 +6,7 @@
       width="120px"
       class="leng-input"
       :ctrl="false"
+      :max="10000000"
       v-model="length"
     >
       <template #icon>m</template>