Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

# Conflicts:
#	frontend/src/views/machine/device/components/monitorTab.vue

frontend/src/api/device/interface/device.ts

@@ -89,8 +89,8 @@ export namespace Device {
         boundPlanName?: string | null
         assign?: number ////是否分配给检测人员 0否 1是
         monitorList: Monitor.ResPqMon[]
-        checked: boolean // 是否已选择
-        disabled: boolean // 是否禁用
+        checked?: boolean // 是否已选择
+        disabled?: boolean // 是否禁用
     }
 
     export interface SelectOption {

frontend/src/views/machine/device/components/devicePopup.vue

@@ -479,7 +479,6 @@ const close = () => {
 
 //子组件监测点变化通知父组件设备台账
 const getParameter = (data: Monitor.ResPqMon[]) => {
-    console.log('子组件监测点变化通知父组件设备台账', data)
     monitor.value = data
     //保存监测点信息自动更新设备台账的被检通道
     formContent.inspectChannel = monitor.value
@@ -619,6 +618,7 @@ const open = async (
         }
         monitor.value = data.monitorList
     } else {
+        monitor.value = []
         resetFormContent()
         //只有比对式设备ID由前端传
         if (currentMode === '比对式') formContent.id = generateUUID().replaceAll('-', '')

frontend/src/views/machine/device/components/monitorTab.vue

@@ -215,7 +215,6 @@ watch(
     () => props.DevFormContent.monitorList,
     newVal => {
         tableData.value = newVal || []
-      console.log(newVal)
     },
     { immediate: true }
 )