Merge branch 'ww' into 'main'

fix: DEFECT-1010 alarm profile not has options

See merge request huang/yun-teng-iot-front!473

@@ -6,7 +6,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="renderer" content="webkit" />
     <meta name="renderer" content="webkit" />
     <meta http-equiv="Expires" content="0" />
     <meta http-equiv="Expires" content="0" />
-    <meta http-equiv="Pragma" content="no-cache" />
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta
     <meta

@@ -33,7 +33,9 @@
         </div>
         </div>
       </div>
       </div>
       <div style="float: right" v-if="isViewStatus">
       <div style="float: right" v-if="isViewStatus">
-        <Button type="primary" @click="handleSubmit" class="mr-2">确认</Button>
+        <Button type="primary" @click="handleSubmit" v-show="current === 1" class="mr-2"
+          >确认</Button
+        >
         <Button type="default" @click="handleCancel" class="mr-2">取消</Button>
         <Button type="default" @click="handleCancel" class="mr-2">取消</Button>
       </div>
       </div>
     </BasicModal>
     </BasicModal>

@@ -565,9 +565,10 @@
     //TODO fengtao
     //TODO fengtao
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
-    setFields(skipUnwrap.actionItemRefs, true);
+    // setFields(skipUnwrap.actionItemRefs, true);
     const data = await getOrganizationAlarmConfig({ organizationId: newValue });
     const data = await getOrganizationAlarmConfig({ organizationId: newValue });
     alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
     alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
+    setFields(skipUnwrap.actionItemRefs, true);
     // console.log(unref(organizationIdRef));
     // console.log(unref(organizationIdRef));
     // setAlarmConfig(skipUnwrap.actionItemRefs, true);
     // setAlarmConfig(skipUnwrap.actionItemRefs, true);
   });
   });