Commit ea182ad626b40f9a8cc07fb32ea28e8c41754ccf

Authored by fengtao
1 parent 3a59108a

fix:修改场景联动获取设备属性-如果没有传设备,则传空数组

... ... @@ -111,7 +111,8 @@ export const getOrganizationAlarmConfig = (params: { organizationId }) => {
111 111 * 获取设备属性列表
112 112 */
113 113 export const getAttribute = (orgId, deviceIds) => {
  114 + const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
114 115 return defHttp.get({
115   - url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + '?' + deviceIds,
  116 + url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
116 117 });
117 118 };
... ...
... ... @@ -169,7 +169,6 @@
169 169 organizationId,
170 170 triggers.map((m) => m.entityId).join(',')
171 171 );
172   -
173 172 // 生成回显时对应得组件数量
174 173 triggerData.value = [...new Array(triggers.length).keys()];
175 174 conditionData.value = [...new Array(doConditions.length).keys()];
... ... @@ -194,6 +193,8 @@
194 193 };
195 194 });
196 195 deviceList.value = editEntryIdData.value;
  196 + deviceExcludeDoAction.value = editEntryIdExcludeDoActionData.value;
  197 +
197 198 //回显属性列表
198 199 editAttrIdData = attrList;
199 200 nextTick(() => {
... ... @@ -538,7 +539,6 @@
538 539 function setFields(linkAge, isOrganizationChange = false) {
539 540 unref(linkAge).map((item) => {
540 541 isOrganizationChange && item.resetFieldsValueFunc();
541   - console.log(item);
542 542 if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
543 543 item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
544 544 } else {
... ...