Merge branch 'master' of http://182.92.126.35:3000/hrx/vent-forewarn-micro

src/views/vent/monitor/site/components/siteForm.vue

@@ -36,7 +36,7 @@
   import { SensorDict, SystemSourceDict } from '../const';
 
   // props & emits
-  defineProps<{ site: Partial<MonitorSiteTreeNode> }>();
+  const props = defineProps<{ site: Partial<MonitorSiteTreeNode> }>();
   const emit = defineEmits<{
     save: [value: SaveMonitorSiteParams];
     operation: [value: MonitorSiteOperationParams];
@@ -49,12 +49,14 @@
     span = 5,
     placeholder,
     required = false,
+    disabled = false,
   }: {
     field: string;
     label: string;
     span?: number;
     placeholder?: string;
     required?: boolean;
+    disabled?: boolean;
   }): FormSchema {
     return {
       component: 'Input',
@@ -66,6 +68,7 @@
       },
       componentProps: {
         placeholder: placeholder || `请输入${label}`,
+        disabled,
       },
     };
   }
@@ -125,21 +128,21 @@
     generateButtonSchema({ slot: 'create-btn' }),
     generateInputSchema({ field: 'id', label: '测点编号', required: true }),
     generateSelectSchema({ field: 'sensorType', label: '测点类型', dict: SensorDict }),
-    generateInputSchema({ field: 'sensorStatus', label: '测点使用状态', required: true }),
-    generateInputSchema({ field: 'pos', label: '所属位置', required: true }),
+    generateInputSchema({ field: 'sensorStatus', label: '测点使用状态' }),
+    generateInputSchema({ field: 'label', label: '所属位置', required: true }),
     generateInputSchema({ field: 'x', label: 'X', required: true, span: 3 }),
     generateButtonSchema({ slot: 'edit-btn' }),
-    generateSelectSchema({ field: 'srouce', label: '系统来源', dict: SystemSourceDict }),
-    generateInputSchema({ field: 'data_type', label: '数据类型', required: true }),
-    generateInputSchema({ field: 'nuit', label: '单位', required: true }),
+    generateSelectSchema({ field: 'systemSource', label: '系统来源', dict: SystemSourceDict }),
+    generateInputSchema({ field: 'data_type', label: '数据类型' }),
+    generateInputSchema({ field: 'nuit', label: '单位' }),
     generateInputSchema({ field: 'distance', label: '巷道距离' }),
     generateInputSchema({ field: 'y', label: 'Y', required: true, span: 3 }),
     // generateButtonSchema({ slot: 'copy-btn' }),
     generateButtonSchema({ slot: 'pick-btn' }),
     generateInputSchema({ field: 'max_messure', label: '高量程' }),
     generateInputSchema({ field: 'min_messure', label: '低量程' }),
-    generateInputSchema({ field: 'warn_limit', label: '报警上限', required: true }),
-    generateInputSchema({ field: 'warn_deadline', label: '报警下限', required: true }),
+    generateInputSchema({ field: 'warn_limit', label: '报警上限' }),
+    generateInputSchema({ field: 'warn_deadline', label: '报警下限' }),
     generateInputSchema({ field: 'z', label: 'Z', span: 3 }),
   ];
 
@@ -149,21 +152,21 @@
   // 提交创建测点所需的数据
   function createSite() {
     validate().then((v) => {
-      emit('save', v as SaveMonitorSiteParams);
+      emit('save', { ...props.site, ...v } as SaveMonitorSiteParams);
     });
   }
 
   // 提交复制测点所需的数据
   // function copySite() {
   //   validate().then((v) => {
-  //     emit('save', v as SaveMonitorSiteParams);
+  //     emit('save', { ...props.site, ...v } as SaveMonitorSiteParams);
   //   });
   // }
 
   // 提交编辑测点所需的数据
   function editSite() {
     validate().then((v) => {
-      emit('save', v as SaveMonitorSiteParams);
+      emit('save', { ...props.site, ...v } as SaveMonitorSiteParams);
     });
   }