|
@@ -169,7 +169,6 @@ |
|
@@ -169,7 +169,6 @@ |
169
|
organizationId,
|
169
|
organizationId,
|
170
|
triggers.map((m) => m.entityId).join(',')
|
170
|
triggers.map((m) => m.entityId).join(',')
|
171
|
);
|
171
|
);
|
172
|
-
|
|
|
173
|
// 生成回显时对应得组件数量
|
172
|
// 生成回显时对应得组件数量
|
174
|
triggerData.value = [...new Array(triggers.length).keys()];
|
173
|
triggerData.value = [...new Array(triggers.length).keys()];
|
175
|
conditionData.value = [...new Array(doConditions.length).keys()];
|
174
|
conditionData.value = [...new Array(doConditions.length).keys()];
|
|
@@ -194,6 +193,8 @@ |
|
@@ -194,6 +193,8 @@ |
194
|
};
|
193
|
};
|
195
|
});
|
194
|
});
|
196
|
deviceList.value = editEntryIdData.value;
|
195
|
deviceList.value = editEntryIdData.value;
|
|
|
196
|
+ deviceExcludeDoAction.value = editEntryIdExcludeDoActionData.value;
|
|
|
197
|
+
|
197
|
//回显属性列表
|
198
|
//回显属性列表
|
198
|
editAttrIdData = attrList;
|
199
|
editAttrIdData = attrList;
|
199
|
nextTick(() => {
|
200
|
nextTick(() => {
|
|
@@ -538,7 +539,6 @@ |
|
@@ -538,7 +539,6 @@ |
538
|
function setFields(linkAge, isOrganizationChange = false) {
|
539
|
function setFields(linkAge, isOrganizationChange = false) {
|
539
|
unref(linkAge).map((item) => {
|
540
|
unref(linkAge).map((item) => {
|
540
|
isOrganizationChange && item.resetFieldsValueFunc();
|
541
|
isOrganizationChange && item.resetFieldsValueFunc();
|
541
|
- console.log(item);
|
|
|
542
|
if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
|
542
|
if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
|
543
|
item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
|
543
|
item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
|
544
|
} else {
|
544
|
} else {
|