tw_zh

src/editor/propEditors/JsonPreview.vue

@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { reactive, useAttrs } from 'vue'
+import { useFormItem } from 'element-plus'
+
+defineOptions({
+  name: 'JsonPreview'
+})
+
+// 定义 Props 类型
+interface JsonPreviewProps {
+  modelValue: any;
+}
+
+// 读取组件 props 属性
+const props = withDefaults(defineProps<JsonPreviewProps>(), {})
+
+// 定义 State 类型
+interface JsonPreviewState {
+
+}
+
+// state 属性
+const state = reactive<JsonPreviewState>({})
+
+// 定义 Data 类型
+interface JsonPreviewData {
+}
+
+// 内部数据
+const data: JsonPreviewData = {}
+const { formItem } = useFormItem()
+
+interface JsonPreviewExpose {
+  state: JsonPreviewState;
+  data: JsonPreviewData;
+}
+
+const expose: JsonPreviewExpose = {
+  state,
+  data
+}
+// 定义组件公开内容
+defineExpose(expose)
+
+export type {
+  JsonPreviewProps,
+  JsonPreviewState
+}
+</script>
+
+<template>
+  <div class="yvan-json-preview">
+    <pre>{{ JSON.stringify(props.modelValue, null, 2) }}</pre>
+  </div>
+</template>
+
+<style scoped>
+.yvan-json-preview {
+  flex: 1;
+}
+</style>

src/editor/widgets/property/PropertyPanelConstant.ts

@@ -6,6 +6,7 @@ import TransformEditor from "@/editor/propEditors/TransformEditor.vue";
 import InOutCenterEditor from "@/editor/propEditors/InOutCenterEditor.vue";
 import BayEditor from "@/editor/propEditors/BayEditor.vue";
 import PtrController from "@/editor/propEditors/PtrController.vue";
+import JsonPreview from "@/editor/propEditors/JsonPreview.vue";
 
 const defDataFormProps: DataFormProps = {
     columnCount: 1,
@@ -18,6 +19,7 @@ dataFormInputComponents.TransformEditor = markRaw<any>(TransformEditor);
 dataFormInputComponents.InOutCenterEditor = markRaw<any>(InOutCenterEditor);
 dataFormInputComponents.BayEditor = markRaw<any>(BayEditor);
 dataFormInputComponents.PtrController = markRaw<any>(PtrController);
+dataFormInputComponents.JsonPreview = markRaw<any>(JsonPreview);
 
 const basicFieldsSetter: Array<PropertyFieldSetter> = [
     {

src/modules/way/WayPropertySetter.ts

@@ -14,9 +14,78 @@ const propertySetter: PropertySetter = {
         inputProps: {}
       },
       {
-        dataPath: 'originId', label: 'originId', input: 'InputNumber',
+        dataPath: 'dt.agvRotation', label: '旋转', input: 'SelectV2',
-        inputProps: {}
+        inputProps: {
+          placeholder: '请选择',
+          multiple: true,
+          clearable: true,
+          options: [
+            {
+              label: 'FitBot300',
+              value: 'SlamFitBot300'
+            },
+            {
+              label: 'FitBot500',//肥波500
+              value: 'FitBot500'
+            },
+            {
+              label: 'FitBot1000',//肥波1000
+              value: 'FitBot1000'
+            },
+            {
+              label: 'CL', //侧叉车型
+              value: 'CY'
+            },
+            {
+              label: 'CLX', //侧叉车型
+              value: 'CLX'
+            },
+            {
+              label: 'CC5', //侧叉车型
+              value: 'CC'
+            },
+            {
+              label: 'CC8', //侧叉车型
+              value: 'CCX'
+            }, {
+              label: 'FreeShuttle',//飞梭车型
+              value: 'FreeShuttle'
+            },
+            {
+              label: 'NZ',//
+              value: 'NZ'
+            },
+            {
+              label: 'FreeRoller',//滚筒车
+              value: 'FreeRoller'
+            },
+            {
+              label: 'SlamFitRoller',//
+              value: 'SlamFitRoller'
+            },
+            {
+              label: 'ForkSeer',
+              value: 'ForkSeer'
+            },
+            {
+              label: 'SurayRGV',
+              value: 'SurayRGV'
+            },
+            {
+              label: 'BroachAGV',
+              value: 'BroachAGV'
             },
+            {
+              label: 'NYRGV',
+              value: 'NYRGV'
+            }
+          ]
+        }
+      },
+      {
+        dataPath: 'dt.linkStore', input: 'JsonPreview',
+        inputProps: {}
+      }
     ]
   }
 }

src/utils/AmrMapConvert.ts

@@ -318,12 +318,12 @@ export function AmrMapConvert(from: any): Array<ItemJson> {
       }
 
       // 这是潜伏AGV货位
-      if(amrNode.type === 'CODE' && amrNode.attribute[0]?.rackTypeId === 3) {
+      if (amrNode.type === 'CODE' && amrNode.attribute[0]?.rackTypeId === 3 && amrNode.attribute[0]?.attrValue === 'CellTypeRackLocation') {
         lccMap.set(lccId + 'C', {
-          "id": lccId+'C',
+          'id': lccId + 'C',
-          "t": "gstore",
+          't': 'gstore',
-          "v": true,
+          'v': true,
-          "tf": [
+          'tf': [
             [
               new Decimal(amrNode.x).div(d100).toNumber(),
               0,
@@ -332,14 +332,14 @@ export function AmrMapConvert(from: any): Array<ItemJson> {
             [0, 0, 0],
             [0.5, 0.01, 0.5]
           ],
-          "dt": {
+          'dt': {
-            "in": [],
+            'in': [],
-            "out": [],
+            'out': [],
-            "center": [],
+            'center': [],
-            "strokeWidth": 0.05
+            'strokeWidth': 0.05
           },
-          "logicX": amrNode.logicX,
+          'logicX': amrNode.logicX,
-          "logicY": amrNode.logicY
+          'logicY': amrNode.logicY
         })
 
         insertNode.dt.linkStore = []
@@ -498,6 +498,8 @@ function convertAmrDirectToLinkStoreDirection(direct: number): string {
     return 'right'
   } else if (direct === 4) {
     return 'left'
+  } else if (direct === 5) {
+    return 'right'
   } else {
     throw new Error('未知的方向: ' + direct)
   }