Merge branch 'fix/DEFECT-1529' into 'main_dev'

fix: 修改告警配置新增联系人成功但是显示无效参数

See merge request yunteng/thingskit-front!839

@@ -16,6 +16,7 @@
           mode="multiple"
           mode="multiple"
           v-model:value="model[field]"
           v-model:value="model[field]"
           :options="alarmContactOptions.map((item) => ({ value: item.value, label: item.label }))"
           :options="alarmContactOptions.map((item) => ({ value: item.value, label: item.label }))"
+          @change="handleChange"
         >
         >
           <template #dropdownRender="{ menuNode: menu }">
           <template #dropdownRender="{ menuNode: menu }">
             <v-nodes :vnodes="menu" />
             <v-nodes :vnodes="menu" />
@@ -82,6 +83,7 @@
       const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
       const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
       async function handleSuccess() {
       async function handleSuccess() {
         //获取告警联系人
         //获取告警联系人
+        if (!unref(orgId)) return;
         const res = await byOrgIdGetAlarmContact(orgId.value);
         const res = await byOrgIdGetAlarmContact(orgId.value);
         if (res) {
         if (res) {
           alarmContactOptions.value = res.map((m) => {
           alarmContactOptions.value = res.map((m) => {
@@ -91,6 +93,10 @@
           alarmContactOptions.value = [];
           alarmContactOptions.value = [];
         }
         }
       }
       }
+
+      const handleChange = () => {
+        validateFields(['alarmContactId']);
+      };
       // 新增或编辑
       // 新增或编辑
       const handleOpenAlarmContact = () => {
       const handleOpenAlarmContact = () => {
         openDrawer(true, {
         openDrawer(true, {
@@ -100,7 +106,10 @@
       const isUpdate = ref(true);
       const isUpdate = ref(true);
       let allData: any = reactive({});
       let allData: any = reactive({});
       const editId = ref('');
       const editId = ref('');
-      const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
+      const [
+        registerForm,
+        { validate, setFieldsValue, resetFields, updateSchema, validateFields },
+      ] = useForm({
         labelWidth: 120,
         labelWidth: 120,
         schemas: formSchema,
         schemas: formSchema,
         showActionButtonGroup: false,
         showActionButtonGroup: false,
@@ -191,6 +200,7 @@
         handleOpenAlarmContact,
         handleOpenAlarmContact,
         registerAlarmContactDrawer,
         registerAlarmContactDrawer,
         handleSuccess,
         handleSuccess,
+        handleChange,
       };
       };
     },
     },
   });
   });

@@ -86,6 +86,7 @@
         const deviceIdKeys = Object.keys(details);
         const deviceIdKeys = Object.keys(details);
         const detailObject = deviceIdKeys.map((key) => ({ label: key, value: details[key] }));
         const detailObject = deviceIdKeys.map((key) => ({ label: key, value: details[key] }));
         const dataFormat = await handleAlarmDetailFormat(deviceIdKeys);
         const dataFormat = await handleAlarmDetailFormat(deviceIdKeys);
+        console.log(detailObject, dataFormat, 'dataFormat');
         const dataFormats = detailObject.reduce((acc: any, curr: any) => {
         const dataFormats = detailObject.reduce((acc: any, curr: any) => {
           dataFormat.forEach((item) => {
           dataFormat.forEach((item) => {
             if (item.tbDeviceId === curr.label) {
             if (item.tbDeviceId === curr.label) {
@@ -130,10 +131,10 @@
       const handleAlarmDetailFormat = async (keys: string[]) => {
       const handleAlarmDetailFormat = async (keys: string[]) => {
         const temp: any = [];
         const temp: any = [];
         for (let item of keys) {
         for (let item of keys) {
-          if (item === 'key' || item === 'data') return; //旧数据则终止
+          if (item === 'key' || item === 'data') return []; //旧数据则终止
           const deviceDetailRes = await getDeviceDetail(item);
           const deviceDetailRes = await getDeviceDetail(item);
           const { deviceProfileId } = deviceDetailRes;
           const { deviceProfileId } = deviceDetailRes;
-          if (!deviceProfileId) return;
+          if (!deviceProfileId) return [];
           const attributeRes = await getAttribute(deviceProfileId);
           const attributeRes = await getAttribute(deviceProfileId);
           const dataFormat: any = handleDataFormat(deviceDetailRes, attributeRes);
           const dataFormat: any = handleDataFormat(deviceDetailRes, attributeRes);
           temp.push(dataFormat);
           temp.push(dataFormat);