简柏林 / thingskit-front · Commits

Commit be48d6dffc3f8b4ef5d39e232a5dcaa025e6d5ec

Authored by fengtao
1 parent c5d8baa7

fix

Inline Side-by-side
Showing 5 changed files with 246 additions and 121 deletions
... ... @@ -103,7 +103,6 @@
103 103 const postDeviceConfogData: any = ref({});
104 104 let getStepOneData: any = reactive({});
105 105 let getStepTwoData: any = reactive({});
106   - const getStepThreeData = ref([]);
107 106 const editData: any = ref({});
108 107 let getStepFourData: any = reactive({});
109 108 const alarmProfileData = reactive({
... ... @@ -222,12 +221,19 @@
222 221 }
223 222 }
224 223 //第三步
225   - function handleStep3Next(v, v1) {
  224 + async function handleStep3Next(_, v1) {
226 225 try {
227 226 isNextStatus.value = true;
228 227 isEditAndChange.value = v1;
229 228 current.value++;
230   - getStepThreeData.value = v;
  229 + let step3NextVal = await proxy.$refs.DeviceProfileStep3Ref?.getStep3AllDataFunc(
  230 + isUpdate.value
  231 + );
  232 + if (step3NextVal.length === 0) {
  233 + isGetStepThreeData.profileData.alarms = null;
  234 + } else {
  235 + isGetStepThreeData.profileData.alarms = step3NextVal;
  236 + }
231 237 proxy.$refs.DeviceProfileStep4Ref?.step3LinkStep4DefalutClose();
232 238 if (isUpdate.value == 2) {
233 239 if (
... ... @@ -277,7 +283,9 @@
277 283 };
278 284 Object.assign(getStepOneData, getStep1Obj.key);
279 285 }
280   - let step3Val = await proxy.$refs.DeviceProfileStep3Ref?.getStep3AllDataFunc();
  286 + let step3Val = await proxy.$refs.DeviceProfileStep3Ref?.getStep3AllDataFunc(
  287 + isUpdate.value
  288 + );
281 289 if (step3Val.length === 0) {
282 290 isGetStepThreeData.profileData.alarms = null;
283 291 } else {
... ...
... ... @@ -11,10 +11,7 @@
11 11 <template
12 12 v-for="(item, index) in !getIsEchoEditStatus ? alarmsData : echoEditData"
13 13 :key="index"
14   - :ref="item"
15 14 >
16   - <span style="display: none">{{ item }}</span>
17   - <span style="display: none">{{ index }}</span>
18 15 <div class="cursor-pointer" style="position: relative; top: 3.5vh; right: -41.6vw">
19 16 <img
20 17 style="cursor: pointer"
... ... @@ -34,7 +31,7 @@
34 31 "
35 32 >
36 33 <CommonCpns
37   - ref="commonCpnsRef"
  34 + :ref="`commonCpnsRef${index}`"
38 35 :step3FatherEmitCpnData="!getIsEchoEditStatus ? 1 : item"
39 36 :step3FatherEmitCpnStatus="
40 37 !getIsEchoEditStatus ? !getIsEchoEditStatus : getIsEchoEditStatus
... ... @@ -75,44 +72,55 @@
75 72 const { proxy } = getCurrentInstance() as any;
76 73 const commonCpnsRef = ref(null);
77 74 const alarmsData: any = ref([]);
78   - let profileData: any = reactive({});
79 75 const echoEditData: any = ref([]);
80 76 const getIsEchoEditStatus = ref(false);
81 77 const btnClose = ref(true);
82   - let getO = reactive({});
  78 + let editObj = reactive({});
  79 + let addObj = reactive({});
  80 +
83 81 const prevStepFunc = () => {
84 82 emit('prev');
85 83 };
86 84 const nextStepFunc = async () => {
87   - profileData = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
88   - alarmsData.value.push(profileData);
89 85 emit('next', {
90 86 alarms: alarmsData.value,
91 87 });
92 88 };
93   - const getStep3AllDataFunc = async () => {
94   - profileData = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
95   - alarmsData.value.push(profileData);
96   - console.log(await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc());
97   - if (getIsEchoEditStatus.value) {
98   - for (let i = 0; i < echoEditData.value.length; i++) {
99   - getO = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
100   - alarmsData.value.push(getO);
  89 + const getStep3AllDataFunc = async (e) => {
  90 + try {
  91 + if (e == 1) {
  92 + for (let i = 0; i < alarmsData.value.length; i++) {
  93 + const ii = i;
  94 + addObj = await proxy.$refs['commonCpnsRef' + ii].getStep3AllDataFunc(e);
  95 + alarmsData.value.push(addObj);
  96 + alarmsData.value.shift();
  97 + }
  98 + } else {
  99 + if (getIsEchoEditStatus.value) {
  100 + /**
  101 + * 编辑
  102 + */
  103 + for (let i = 0; i < echoEditData.value.length; i++) {
  104 + const ii = i;
  105 + editObj = await proxy.$refs['commonCpnsRef' + ii].getStep3AllDataFunc(e);
  106 + alarmsData.value.push(editObj);
  107 + }
  108 + }
101 109 }
102   - }
103   - console.log(alarmsData.value);
104   - alarmsData.value = alarmsData.value.filter((i) => i);
105   - alarmsData.value = deteleObject(alarmsData.value);
106   - console.log(alarmsData.value);
107   - return alarmsData.value;
  110 + /**
  111 + * 过滤null和重复对象和1
  112 + */
  113 + alarmsData.value = alarmsData.value.filter((i) => i);
  114 + alarmsData.value = deteleObject(alarmsData.value);
  115 + alarmsData.value = alarmsData.value.filter((f) => f !== 1);
  116 + return alarmsData.value;
  117 + } catch {}
108 118 };
109 119 const clickAddAlaramRuleFunc = async () => {
110 120 try {
111   - profileData = await proxy.$refs.commonCpnsRef?.getStep3AllDataFunc();
112   - alarmsData.value.push(profileData);
  121 + alarmsData.value.push(1);
113 122 if (getIsEchoEditStatus.value) {
114   - echoEditData.value.push(profileData);
115   - // proxy.$refs.commonCpnsRef?.clearStep3CpnDataFunc();
  123 + echoEditData.value.push(1);
116 124 }
117 125 } catch {}
118 126 };
... ... @@ -120,6 +128,11 @@
120 128 const key = alarmsData.value.indexOf(e);
121 129 console.log(i);
122 130 alarmsData.value.splice(key, 1);
  131 + if (getIsEchoEditStatus.value) {
  132 + const key1 = echoEditData.value.indexOf(e);
  133 + console.log(i);
  134 + echoEditData.value.splice(key1, 1);
  135 + }
123 136 };
124 137 /**
125 138 * 清空数据
... ... @@ -128,10 +141,8 @@
128 141 try {
129 142 alarmsData.value.length = 0;
130 143 echoEditData.value.length = 0;
131   - // profileData = {};
132 144 proxy.$refs.commonCpnsRef?.clearStep3CpnDataFunc();
133 145 getIsEchoEditStatus.value = false;
134   - getO = {};
135 146 } catch {}
136 147 };
137 148 /**
... ...
... ... @@ -27,20 +27,17 @@
27 27 style="text-align: center; font-size: large"
28 28 >请添加创建报警规则</p
29 29 >
30   - <div v-if="createAlarmRuleData.length > 0">
  30 + <div v-if="createAlarmRuleData.length > 0 || createEditAlarmRuleData.length > 0">
31 31 <template
32 32 v-for="(item, index) in !isStep3FatherAddOrEditStatus
33 33 ? createAlarmRuleData
34 34 : createEditAlarmRuleData"
35 35 :key="index"
36   - :ref="item"
37 36 >
38   - <span style="display: none">{{ item }}</span>
39   - <span style="display: none">{{ index }}</span>
40 37 <div class="cursor-pointer" style="position: relative; top: 15.5vh; right: -40.8vw">
41 38 <img
42 39 style="cursor: pointer"
43   - @click="removeAddCreateRuleFunc(index)"
  40 + @click="removeAddCreateRuleFunc(item, index)"
44 41 alt="移除"
45 42 src="../../../../../../src/assets/images/close.png"
46 43 />
... ... @@ -48,20 +45,20 @@
48 45 <div style="width: 38vw; height: 30vh; border: 1px solid grey; border-radius: 4px">
49 46 <div style="margin-top: 1vh">
50 47 <AlarmSeverityCpn
51   - ref="AlarmSeverityRef"
  48 + :ref="`AlarmSeverityRef${index}`"
52 49 :AlarmSeverityCpnData="!isStep3FatherAddOrEditStatus ? 1 : item"
53 50 />
54 51 <DetailTemplateCpn
55   - ref="DetailTemplateRef"
  52 + :ref="`DetailTemplateRef${index}`"
56 53 :DetailTemplateCpnData="!isStep3FatherAddOrEditStatus ? 1 : item"
57 54 />
58 55 <AlarmRuleConditionsCpn
59   - ref="AlarmRuleConditionsRef"
  56 + :ref="`AlarmRuleConditionsRef${index}`"
60 57 @register="registerAlarmRuleConditionsModal"
61 58 @getAllFieldsRule="getAlarmRuleConditionsValFunc"
62 59 />
63 60 <EnableRuleCpn
64   - ref="EnableRuleRef"
  61 + :ref="`EnableRuleRef${index}`"
65 62 @register="registerEnableRuleModal"
66 63 @getAllFieldsEnab="getEnableRuleFunc"
67 64 />
... ... @@ -70,7 +67,7 @@
70 67 <a-button
71 68 style="border-radius: 10px"
72 69 class="mt-5"
73   - @click="clickAddAlarmRuleConditionsFunc"
  70 + @click="clickAddAlarmRuleConditionsFunc(isStep3FatherAddOrEditStatus, index)"
74 71 ><PlusCircleOutlined
75 72 /></a-button>
76 73 <div>
... ... @@ -81,14 +78,30 @@
81 78 : []"
82 79 :key="index1"
83 80 >
84   - <p v-if="index1 == index">
  81 + <p v-if="index1 == index && !isStep3FatherAddOrEditStatus">
85 82 报警规则条件：{{ formatAlarmRuleConditionsFunc(item1) }}
86 83 </p>
87 84 </template>
88 85 </div>
89   - <div v-if="isStep3FatherAddOrEditStatus">
  86 + <div v-if="isStep3FatherAddOrEditStatus && formatEditRuleData.length == 0">
90 87 <p> 报警规则条件：{{ formatAlarmRuleConditionsDataFunc(item) }} </p>
91 88 </div>
  89 + <template
  90 + v-for="(item11, index11) in !isStep3FatherAddOrEditStatus
  91 + ? []
  92 + : formatEditRuleData"
  93 + :key="index11"
  94 + >
  95 + <div
  96 + v-if="
  97 + index11 == index &&
  98 + isStep3FatherAddOrEditStatus &&
  99 + formatEditRuleData.length > 0
  100 + "
  101 + >
  102 + <p> 报警规则条件：{{ formatEditRuleDataFunc(item11) }} </p>
  103 + </div>
  104 + </template>
92 105 </div>
93 106 </div>
94 107 <div style="margin-left: 0.5vw">
... ... @@ -110,9 +123,25 @@
110 123 <p v-if="index2 == index"> 启用规则：{{ formatEnableRuleFunc(item2) }} </p>
111 124 </template>
112 125 </div>
113   - <div v-if="isStep3FatherAddOrEditStatus">
  126 + <div v-if="isStep3FatherAddOrEditStatus && formatEditEnableData.length == 0">
114 127 <p> 启用规则：{{ formatEnableRuleFuncData(item) }} </p>
115 128 </div>
  129 + <template
  130 + v-for="(item111, index111) in !isStep3FatherAddOrEditStatus
  131 + ? []
  132 + : formatEditEnableData"
  133 + :key="index111"
  134 + >
  135 + <div
  136 + v-if="
  137 + index111 == index &&
  138 + isStep3FatherAddOrEditStatus &&
  139 + formatEditEnableData.length > 0
  140 + "
  141 + >
  142 + <p> 启用规则：{{ formatEditEnableRuleFunc(item111) }} </p>
  143 + </div>
  144 + </template>
116 145 </div>
117 146 </div>
118 147 <div></div>
... ... @@ -150,12 +179,12 @@
150 179 <BasicForm @register="registerFormChangeClearDetail" />
151 180 </div>
152 181 <AlarmRuleConditionsCpn
153   - ref="AlarmRuleConditionsRef"
  182 + ref="AlarmClearRuleConditionsRef"
154 183 @register="registerClearAlarmRuleConditionsModal"
155 184 @getAllFieldsRule="getClearAlarmRuleConditionsValFunc"
156 185 />
157 186 <EnableRuleCpn
158   - ref="EnableRuleRef"
  187 + ref="EnableClearRuleRef"
159 188 @register="registerClearEnableRuleModal"
160 189 @getAllFieldsEnab="getClearEnableRuleFunc"
161 190 />
... ... @@ -240,6 +269,7 @@
240 269 import EnableRuleCpn from '../cpns/enablerule/index.vue';
241 270 import { useModal } from '/@/components/Modal';
242 271 import { generateUUID } from '/@/hooks/web/useGenerateUUID';
  272 +
243 273 import {
244 274 formatAlarmRuleConditionsData,
245 275 formatEnableRuleData,
... ... @@ -263,6 +293,8 @@
263 293 const createEditAlarmRuleData: any = ref([]);
264 294 const AlarmRuleConditionsRef = ref(null);
265 295 const EnableRuleRef = ref(null);
  296 + const AlarmClearRuleConditionsRef = ref(null);
  297 + const EnableClearRuleRef = ref(null);
266 298 const formatAlarmRuleConditions: any = ref([]);
267 299 const formatClearAlarmRuleConditions: any = ref([]);
268 300 const formatEditClearAlarmRuleConditions: any = ref([]);
... ... @@ -282,6 +314,14 @@
282 314 const tempDetailTemplateData: any = ref([]);
283 315 const isClearStatus = ref(false);
284 316 const isStep3FatherAddOrEditStatus = ref(false);
  317 + let val4: any = reactive({});
  318 + let val5: any = reactive({});
  319 + let val6: any = ref([]);
  320 + let val7 = ref(null);
  321 + let val9: any = ref([]);
  322 + let val10: any = ref(null);
  323 + const formatEditRuleData: any = ref([]);
  324 + const formatEditEnableData: any = ref([]);
285 325
286 326 const [registerAlarmRuleConditionsModal, { openModal: openModalAlarmRuleConditions }] =
287 327 useModal();
... ... @@ -337,80 +377,53 @@
337 377 },
338 378 });
339 379 const clickAddCreateRuleFunc = () => {
  380 + let i = 1;
  381 + i++;
  382 + console.log(i);
340 383 createAlarmRuleData.value.push(1);
341   - getAddCreateRuleFunc();
  384 + nextTick(() => {
  385 + proxy.$refs.AlarmRuleConditionsRef?.resetDataFunc();
  386 + });
342 387 if (isStep3FatherAddOrEditStatus.value) {
343 388 createEditAlarmRuleData.value.push(1);
344   - getAddCreateRuleFunc();
345 389 }
346 390 };
347 391 /**
348   - * 获取创建报警规则数据
349   - */
350   - const getAddCreateRuleFunc = () => {
351   - const val4 = proxy.$refs.AlarmSeverityRef?.getFieldsValueFunc();
352   - const val5 = proxy.$refs.DetailTemplateRef?.getFieldsValueFunc();
353   - let kongDetail = {};
354   - let kongRule = {};
355   - let kongEnable = {};
356   - tempDetailTemplateData.value.push(val5 as never);
357   - tempDetailTemplateData.value.forEach((f) => {
358   - kongDetail = f;
359   - });
360   - formatAlarmRuleConditions.value.forEach((f) => {
361   - kongRule = f;
362   - });
363   - formatEnableRule.value.forEach((f) => {
364   - kongEnable = f;
365   - });
366   - alaramsObj.createRules[val4?.default] = {
367   - ...kongDetail,
368   - ...{ condition: Object.keys(kongRule).length == 0 ? null : kongRule },
369   - ...{ schedule: Object.keys(kongEnable).length == 0 ? null : kongEnable },
370   - };
371   - };
372   - /**
373 392 * 获取清除报警规则数据
374 393 */
375 394 const clickAddClearRuleFunc = () => {
376 395 isClearStatus.value = true;
377   - const val6 = getRegisterFormClearChangeDetailFunc();
378   - let kongClearRule = {};
379   - let kongClearEnable = {};
380   - formatClearAlarmRuleConditions.value.forEach((f) => {
381   - kongClearRule = f;
382   - });
383   - formatClearEnableRule.value.forEach((f) => {
384   - kongClearEnable = f;
385   - });
386   - alaramsObj.clearRule = {
387   - ...val6,
388   - ...{
389   - schedule: formatClearEnableRule.value.length == 0 ? null : kongClearEnable,
390   - },
391   - ...{
392   - condition: formatClearAlarmRuleConditions.value.length == 0 ? null : kongClearRule,
393   - },
394   - };
395 396 };
396 397 const removeAddClearRuleFunc = () => {
397 398 isClearStatus.value = false;
398 399 alaramsObj.clearRule = null;
399 400 };
400   - const removeAddCreateRuleFunc = (i) => {
401   - let delI = i;
402   - createAlarmRuleData.value.splice(delI, 1);
403   - for (let i1 in alaramsObj.createRules) {
404   - if (delI) {
  401 + const removeAddCreateRuleFunc = (e, i) => {
  402 + const key = createAlarmRuleData.value.indexOf(e);
  403 + createAlarmRuleData.value.splice(key, 1);
  404 + console.log(i);
  405 + Object.keys(alaramsObj.createRules).forEach((i1, e) => {
  406 + if (e == i) {
405 407 delete alaramsObj.createRules[i1];
406 408 }
  409 + });
  410 + if (isStep3FatherAddOrEditStatus.value) {
  411 + const key1 = createEditAlarmRuleData.value.indexOf(e);
  412 + createEditAlarmRuleData.value.splice(key1, 1);
407 413 }
408 414 };
409   - const clickAddAlarmRuleConditionsFunc = () => {
410   - nextTick(() => {
411   - openModalAlarmRuleConditions(true);
412   - proxy.$refs.AlarmRuleConditionsRef?.resetDataFunc();
413   - });
  415 + const clickAddAlarmRuleConditionsFunc = (e, i) => {
  416 + openModalAlarmRuleConditions(true);
  417 + console.log(i);
  418 + if (e === true) {
  419 + nextTick(() => {
  420 + proxy.$refs.AlarmRuleConditionsRef?.resetDataFunc();
  421 + });
  422 + } else {
  423 + nextTick(() => {
  424 + proxy.$refs.AlarmRuleConditionsRef?.resetDataFunc();
  425 + });
  426 + }
414 427 };
415 428 const clickAddEnableRuleFunc = () => {
416 429 nextTick(() => {
... ... @@ -434,6 +447,9 @@
434 447 formatAlarmRuleConditions.value.push({
435 448 condition: e,
436 449 } as never);
  450 + formatEditRuleData.value.push({
  451 + condition: e,
  452 + } as never);
437 453 };
438 454 const getClearAlarmRuleConditionsValFunc = (e) => {
439 455 formatClearAlarmRuleConditions.value.push({
... ... @@ -444,12 +460,17 @@
444 460 let formatMap = e.condition.map((f: any) => formatAlarmRuleConditionsData(f));
445 461 return formatMap;
446 462 };
  463 + const formatEditRuleDataFunc = (e) => {
  464 + let formatMap = e.condition.map((f: any) => formatAlarmRuleConditionsData(f));
  465 + return formatMap;
  466 + };
447 467 const formatClearAlarmRuleConditionsFunc = (e) => {
448 468 let formatMap = e.condition.map((f: any) => formatAlarmRuleConditionsData(f));
449 469 return formatMap;
450 470 };
451 471 const getEnableRuleFunc = (e) => {
452 472 formatEnableRule.value.push(e);
  473 + formatEditEnableData.value.push(e);
453 474 };
454 475 const getClearEnableRuleFunc = (e) => {
455 476 formatClearEnableRule.value.push(e);
... ... @@ -458,30 +479,96 @@
458 479 let formatMap = formatEnableRuleData(e);
459 480 return formatMap;
460 481 };
  482 + const formatEditEnableRuleFunc = (e) => {
  483 + let formatMap = formatEnableRuleData(e);
  484 + return formatMap;
  485 + };
  486 +
461 487 const formatClearEnableRuleFunc = (e) => {
462 488 let formatMap = formatEnableRuleData(e);
463 489 return formatMap;
464 490 };
465   - const getStep3AllDataFunc = async () => {
466   - const val1 = await getAlarmTypeValFunc();
467   - const val2 = getDeliverAlertsValFunc();
468   - const val3 = [];
469   - val3.push(val2.propagateRelationTypes as never);
470   - alaramsObj.alarmType = val1.alarmType;
471   - alaramsObj.propagate = val2.propagate;
472   - alaramsObj.id = generateUUID();
473   - if (val2.propagateRelationTypes == undefined) {
474   - alaramsObj.propagateRelationTypes = null;
475   - } else {
476   - alaramsObj.propagateRelationTypes = val3;
477   - }
478   - getAddCreateRuleFunc();
479   - clickAddClearRuleFunc();
480   - if (alaramsObj.clearRule.condition == null || alaramsObj.clearRule.schedule == null) {
481   - isClearStatus.value = false;
482   - alaramsObj.clearRule = null;
  491 + /**
  492 + * 获取第三步所有的数据
  493 + */
  494 + const getStep3AllDataFunc = async (e) => {
  495 + try {
  496 + const UUID = generateUUID();
  497 + const val1 = await getAlarmTypeValFunc();
  498 + const val2 = getDeliverAlertsValFunc();
  499 + const val3 = [];
  500 + val3.push(val2.propagateRelationTypes as never);
  501 + alaramsObj.alarmType = val1.alarmType;
  502 + alaramsObj.propagate = val2.propagate;
  503 + alaramsObj.id = UUID;
  504 + if (val2.propagateRelationTypes == undefined) {
  505 + alaramsObj.propagateRelationTypes = null;
  506 + } else {
  507 + alaramsObj.propagateRelationTypes = val3;
  508 + }
  509 + const val8 = getRegisterFormClearChangeDetailFunc();
  510 + val9.value = proxy.$refs['AlarmClearRuleConditionsRef']?.getFieldsValueFunc();
  511 + val10.value = proxy.$refs['EnableClearRuleRef']?.getFieldsValueFunc();
  512 + if (val9.value == undefined || val10.value == undefined) {
  513 + alaramsObj.clearRule = null;
  514 + isClearStatus.value = false;
  515 + } else {
  516 + alaramsObj.clearRule = {
  517 + ...val8,
  518 + ...{
  519 + schedule: val10.value == undefined ? undefined : val10.value,
  520 + },
  521 + ...{
  522 + condition: {
  523 + condition: val9.value == undefined ? undefined : val9.value,
  524 + },
  525 + },
  526 + };
  527 + }
  528 + if (e == 1) {
  529 + for (let i = 0; i < createAlarmRuleData.value.length; i++) {
  530 + const iii = i;
  531 + val4 = proxy.$refs['AlarmSeverityRef' + iii].getFieldsValueFunc();
  532 + val5 = proxy.$refs['DetailTemplateRef' + iii].getFieldsValueFunc();
  533 + val6.value = proxy.$refs['AlarmRuleConditionsRef' + iii].getFieldsValueFunc();
  534 + val7.value = proxy.$refs['EnableRuleRef' + iii].getFieldsValueFunc();
  535 + alaramsObj.createRules[val4?.default] = {
  536 + ...val5,
  537 + ...{
  538 + schedule: val7.value == undefined ? undefined : val7.value,
  539 + },
  540 + ...{
  541 + condition: {
  542 + condition: val6.value == undefined ? undefined : val6.value,
  543 + },
  544 + },
  545 + };
  546 + }
  547 + } else {
  548 + for (let i = 0; i < createEditAlarmRuleData.value.length; i++) {
  549 + const iiii = i;
  550 + val4 = proxy.$refs['AlarmSeverityRef' + iiii].getFieldsValueFunc();
  551 + val5 = proxy.$refs['DetailTemplateRef' + iiii].getFieldsValueFunc();
  552 + val6.value = proxy.$refs['AlarmRuleConditionsRef' + iiii].getFieldsValueFunc();
  553 + val7.value = proxy.$refs['EnableRuleRef' + iiii].getFieldsValueFunc();
  554 + console.log(val6.value);
  555 + alaramsObj.createRules[val4?.default] = {
  556 + ...val5,
  557 + ...{
  558 + schedule: val7.value,
  559 + },
  560 + ...{
  561 + condition: {
  562 + condition: val6.value,
  563 + },
  564 + },
  565 + };
  566 + }
  567 + }
  568 + return alaramsObj;
  569 + } catch (e) {
  570 + console.log(e);
483 571 }
484   - return alaramsObj;
485 572 };
486 573 /**
487 574 * 清空第三步数据
... ... @@ -509,6 +596,8 @@
509 596 alaramsObj.clearRule = {};
510 597 alaramsObj.createRules = {};
511 598 alaramsObj.id = '';
  599 + formatEditRuleData.value.length = 0;
  600 + formatEditEnableData.value.length = 0;
512 601 } catch {}
513 602 };
514 603 /**
... ... @@ -621,6 +710,12 @@
621 710 createEditAlarmRuleData,
622 711 formatAlarmRuleConditionsDataFunc,
623 712 formatEnableRuleFuncData,
  713 + AlarmClearRuleConditionsRef,
  714 + EnableClearRuleRef,
  715 + formatEditRuleData,
  716 + formatEditRuleDataFunc,
  717 + formatEditEnableData,
  718 + formatEditEnableRuleFunc,
624 719 };
625 720 },
626 721 });
... ...
... ... @@ -160,11 +160,16 @@
160 160 emit('getAllFieldsRule', getKeyAndValueChildData.value, lastValues.value);
161 161 closeModal();
162 162 };
  163 +
  164 + const getFieldsValueFunc = () => {
  165 + return getKeyAndValueChildData.value;
  166 + };
163 167 const resetDataFunc = () => {
164 168 getTableApiData.value = [];
165 169 getTableApiData.value.length = 0;
166 170 detailData.value = [];
167 171 detailData.value.length = 0;
  172 + getKeyAndValueChildData.value.length = 0;
168 173 resetFields();
169 174 };
170 175
... ... @@ -221,6 +226,7 @@
221 226 handleSubmit,
222 227 register,
223 228 getTitle,
  229 + getFieldsValueFunc,
224 230 };
225 231 },
226 232 });
... ...
... ... @@ -40,12 +40,17 @@
40 40 emit('getAllFieldsEnab', values);
41 41 closeModal();
42 42 };
  43 + const getFieldsValueFunc = () => {
  44 + const val = getFieldsValue();
  45 + return val;
  46 + };
43 47 return {
44 48 resetDataFunc,
45 49 registerForm,
46 50 handleSubmit,
47 51 register,
48 52 getTitle,
  53 + getFieldsValueFunc,
49 54 };
50 55 },
51 56 });
... ...