fix：修改场景联动弹窗组件页面属性回显和清除告警数据回显问题

fengtao
1 parent a478cc95
Showing 1 changed file with 31 additions and 3 deletions
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @d1898ee
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @d1898ee
@@ -67,7 +67,8 @@
               :actionData="actionData"
               :triggerData="triggerData"
               :ref="skipUnwrap.actionItemRefs"
-              :deviceList="deviceList"
+              :provideOrgid="provideOrgid"
+              :deviceList="getMasterDeviceList"
               :arr="arr"
               @deleteAction="deleteAction"
               @getActionFormArr="getActionFormArr"
@@ -188,7 +189,7 @@
       nextTick(() => {
         setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
-        setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
+        setEditFields(skipUnwrap.actionItemRefs, getMasterDeviceList);
         setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
       });
@@ -281,6 +282,7 @@
       doConditions.forEach((condition, index) => {
         nextTick(async () => {
+          const selectDeviceId = ref('');
           // 回显启用规则
           unref(skipUnwrap.conditionItemRefs)[index].currentIndex =
             map[condition.triggerCondition.schedule.type];
@@ -302,6 +304,15 @@
             time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             timeUnit: condition?.triggerCondition?.condition?.spec?.unit,
           });
+          if (condition?.entityId != undefined) {
+            selectDeviceId.value = condition?.entityId;
+          }
+          //fengtao-把设备id回传给子组件
+          unref(skipUnwrap.conditionItemRefs)[index].updateFieldAttributeFunc(
+            selectDeviceId.value,
+            provideOrgid.value
+          );
+          //fengtao
           // 设置值operationType
           unref(skipUnwrap.conditionItemRefs)[index].operationType =
             condition.triggerCondition?.condition.condition[0].valueType;
@@ -353,6 +364,7 @@
       doActions.forEach((action, index) => {
         nextTick(() => {
+          const selectDeviceId = ref('');
           // 设置执行动作外层值
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
             outTarget: action.outTarget,
@@ -407,6 +419,18 @@
                     timeUnit:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.unit,
                   });
+                  if (action.doContext.clearRule[index].entityId != undefined) {
+                    selectDeviceId.value = action.doContext.clearRule[index].entityId;
+                  }
+                  //fengtao-把设备id回传给子组件
+                  item.updateFieldAttributeFunc(selectDeviceId.value, provideOrgid.value);
+                  item.updateFieldDeviceId(
+                    deviceList.value,
+                    provideOrgid.value,
+                    isUpdate.value,
+                    getMasterDeviceList.value
+                  );
+                  //fengtao
                   // 单独设置operationType值 操作符类型 NUMERIC|String|Boolean|DATE_TIME
                   item.operationType =
                     action.doContext.clearRule[
@@ -432,6 +456,7 @@
                 nextTick(() => {
                   const richTextList = [];
                   rule.triggerCondition.condition.condition.forEach((item, conditionIndex) => {
+                    //TODO-fengtao之前是Number( item.predicate.value.defaultValue)-发现回显是Invalide Time
                     const formItem = {
                       operation: item.predicate.operation,
                       value:
@@ -444,18 +469,20 @@
                       ignoreCase:
                         item.valueType === 'STRING' ? item.predicate.ignoreCase : undefined,
                     };
+                    //TODO-fengtao之前是Number( item.predicate.value.defaultValue)-发现回显是Invalide Time
                     richTextList.push({
                       // 查询中文操作符
                       operation: findOperation(item.valueType, item.predicate.operation).label,
                       value:
                         item.valueType === 'DATE_TIME'
                           ? formatToDateTime(
-                              Number(item.predicate.value.defaultValue),
+                              item.predicate.value.defaultValue,
                               'YYYY-MM-DD HH:mm:ss'
                             )
                           : String(item.predicate.value.defaultValue),
                       attribute: item?.key?.key,
                     });
+                    //TODO-fengtao之前是Number( item.predicate.value.defaultValue)-发现回显是Invalide Time
                     ConditionScreeningForm[ruleIndex].value[conditionIndex].setFieldsValue(
                       formItem
                     );
@@ -597,6 +624,7 @@
         return type;
       });
       if (typeBoolean) return createMessage.error('请填写条件筛选');
+      //TODO 先暂时不加验证--设备-属性-填了加验证
       //TODO fengtao
       await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate));
       createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);