fix：场景联动-触发器和执行条件的获取设备接口，改回之前的，解决设备id回显问题

@@ -17,7 +17,7 @@ enum ScreenManagerApi {
   SCREEN_UPDATE_URL = '/sceneLinkage/update',
   SCREEN_UPDATE_URL = '/sceneLinkage/update',
   SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_CHANGE_STATUS = '/convert/update/scene',
   SCREEN_CHANGE_STATUS = '/convert/update/scene',
-  SCREEN_GET_BY_DEPTID = '/sceneLinkage/device',
+  SCREEN_GET_BY_DEPTID = '/sceneLinkage/device/',
   GET_ATTRBUTELIST = '/device/keys',
   GET_ATTRBUTELIST = '/device/keys',
   ALARM_PROFILE = '/alarm/profile/',
   ALARM_PROFILE = '/alarm/profile/',
   MASTER_GET_DEVICE = '/device/list/master',
   MASTER_GET_DEVICE = '/device/list/master',

@@ -96,7 +96,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import {
   import {
     screenLinkPageAddApi,
     screenLinkPageAddApi,
-    // screenLinkPageByDeptIdGetDevice,
+    screenLinkPageByDeptIdGetDevice,
     getOrganizationAlarmConfig,
     getOrganizationAlarmConfig,
     byOganizationIdGetMasterDevice,
     byOganizationIdGetMasterDevice,
     getAttribute,
     getAttribute,
@@ -125,6 +125,7 @@
   let getConditionFormValue = ref([]);
   let getConditionFormValue = ref([]);
   let getActionFormValue = ref([]);
   let getActionFormValue = ref([]);
   const editEntryIdData = ref([]);
   const editEntryIdData = ref([]);
+  const editEntryIdExcludeDoActionData = ref([]);
   let editAttrIdData = [];
   let editAttrIdData = [];
   const editAlarmConfigData = ref([]);
   const editAlarmConfigData = ref([]);
   const isUpdate = ref(false);
   const isUpdate = ref(false);
@@ -160,6 +161,7 @@
       provideOrgid.value = organizationId;
       provideOrgid.value = organizationId;
       // 获取当前组织下的设备列表
       // 获取当前组织下的设备列表
       const options = await byOganizationIdGetMasterDevice(organizationId);
       const options = await byOganizationIdGetMasterDevice(organizationId);
+      const optionsExcludeDoAction = await screenLinkPageByDeptIdGetDevice({ organizationId });
       // 获取当前组织下的告警配置
       // 获取当前组织下的告警配置
       const alarmConfig = await getOrganizationAlarmConfig({ organizationId });
       const alarmConfig = await getOrganizationAlarmConfig({ organizationId });
       // 获取当前组织下的属性列表
       // 获取当前组织下的属性列表
@@ -179,6 +181,12 @@
           label: item.name,
           label: item.name,
         };
         };
       });
       });
+      editEntryIdExcludeDoActionData.value = optionsExcludeDoAction.items.map((item) => {
+        return {
+          value: item.tbDeviceId,
+          label: item.name,
+        };
+      });
       editAlarmConfigData.value = alarmConfig.map((item) => {
       editAlarmConfigData.value = alarmConfig.map((item) => {
         return {
         return {
           value: item.id,
           value: item.id,
@@ -189,8 +197,8 @@
       //回显属性列表
       //回显属性列表
       editAttrIdData = attrList;
       editAttrIdData = attrList;
       nextTick(() => {
       nextTick(() => {
-        setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
-        setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
+        setEditFields(skipUnwrap.triggerItemRefs, editEntryIdExcludeDoActionData);
+        setEditFields(skipUnwrap.conditionItemRefs, editEntryIdExcludeDoActionData);
         setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
         setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
         setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
         setEditAttr(skipUnwrap.triggerItemRefs, editAttrIdData);
         setEditAttr(skipUnwrap.triggerItemRefs, editAttrIdData);
@@ -482,7 +490,11 @@
   // 设置设备的options
   // 设置设备的options
   const setEditFields = (linkAge, deviceList) => {
   const setEditFields = (linkAge, deviceList) => {
     unref(linkAge).map((item) => {
     unref(linkAge).map((item) => {
-      item.updateFieldDeviceId(deviceList);
+      if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
+        item.updateExcludeActionFieldDeviceId(deviceList);
+      } else {
+        item.updateFieldDeviceId(deviceList);
+      }
     });
     });
   };
   };
   // 设置告警配置options
   // 设置告警配置options
@@ -502,10 +514,16 @@
   const deviceList = ref([]);
   const deviceList = ref([]);
   const alarmConfigList = ref([]);
   const alarmConfigList = ref([]);
   let watchAttrList = [];
   let watchAttrList = [];
+  const deviceExcludeDoAction = ref([]);
   watch(organizationId, async (newValue: string) => {
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
     if (!newValue) return;
     provideOrgid.value = newValue;
     provideOrgid.value = newValue;
     const items = await byOganizationIdGetMasterDevice(newValue);
     const items = await byOganizationIdGetMasterDevice(newValue);
+    const itemExcludeDoAction = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
+    deviceExcludeDoAction.value = itemExcludeDoAction.items.map((item) => ({
+      label: item.name,
+      value: item.tbDeviceId,
+    }));
     deviceList.value = items.map((item) => ({ label: item.name, value: item.id }));
     deviceList.value = items.map((item) => ({ label: item.name, value: item.id }));
     watchAttrList = await getAttribute(newValue, null);
     watchAttrList = await getAttribute(newValue, null);
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.triggerItemRefs, true);
@@ -520,7 +538,12 @@
   function setFields(linkAge, isOrganizationChange = false) {
   function setFields(linkAge, isOrganizationChange = false) {
     unref(linkAge).map((item) => {
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
       isOrganizationChange && item.resetFieldsValueFunc();
-      item.updateFieldDeviceId(deviceList);
+      console.log(item);
+      if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
+        item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
+      } else {
+        item.updateFieldDeviceId(deviceList);
+      }
       // item.updateFieldAttr(watchAttrList);
       // item.updateFieldAttr(watchAttrList);
     });
     });
   }
   }

@@ -98,7 +98,7 @@
     );
     );
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
   };
-  const updateFieldDeviceId = (deviceList: any[]) => {
+  const updateExcludeActionFieldDeviceId = (deviceList: any[]) => {
     updateSchema({
     updateSchema({
       field: 'entityId',
       field: 'entityId',
       componentProps: {
       componentProps: {
@@ -195,9 +195,11 @@
     currentIndex.value = index;
     currentIndex.value = index;
   };
   };
   const scheduleData = ref(null);
   const scheduleData = ref(null);
+  const isTriggerAndConditionFlag = 'isTriggerAndConditionFlag';
   defineExpose({
   defineExpose({
+    isTriggerAndConditionFlag,
     getFieldsValueFunc,
     getFieldsValueFunc,
-    updateFieldDeviceId,
+    updateExcludeActionFieldDeviceId,
     updateFieldAttr,
     updateFieldAttr,
     resetFieldsValueFunc,
     resetFieldsValueFunc,
     setFieldsFormValueFun,
     setFieldsFormValueFun,