Merge branch 'ft-dev' into 'main'

style:修改设备配置，feat:告警管理新增uuid

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

@@ -158,11 +158,25 @@
       function handleRedo() {
       function handleRedo() {
         current.value = 0;
         current.value = 0;
       }
       }
+      //用于生成uuid
+      function generateUUID() {
+        let d = new Date().getTime();
+        if (window.performance && typeof window.performance.now === 'function') {
+          d += performance.now(); //use high-precision timer if available
+        }
+        let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let r = (d + Math.random() * 16) % 16 | 0;
+          d = Math.floor(d / 16);
+          return (c == 'x' ? r : (r & 0x3) | 0x8).toString(16);
+        });
+        return uuid;
+      }
       const handleSubmit = async () => {
       const handleSubmit = async () => {
         if (!unref(isUpdate)) {
         if (!unref(isUpdate)) {
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           alarmProfileData.value.alarmProfile =
           alarmProfileData.value.alarmProfile =
             await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
             await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
+          alarmProfileData.value.alarmProfile.id = generateUUID();
           Object.assign(
           Object.assign(
             postDeviceConfogData.value,
             postDeviceConfogData.value,
             getStepOneData.value,
             getStepOneData.value,

@@ -4,15 +4,21 @@
       <CollapseContainer class="border mb-1" :canExpan="false">
       <CollapseContainer class="border mb-1" :canExpan="false">
         <template #action>
         <template #action>
           <div @click="deleteAlarmRule(index)" class="cursor-pointer">
           <div @click="deleteAlarmRule(index)" class="cursor-pointer">
-            <DeleteOutlined style="font-size: 20px" class="mr-2" />
+            <img
+              style="cursor: pointer"
+              @click="deleteAlarmRule(index)"
+              alt="移除"
+              src="../../../../assets/images/close.png"
+            />
+            <!-- <DeleteOutlined style="font-size: 20px" class="mr-2" /> -->
           </div>
           </div>
         </template>
         </template>
-        <div class="alert-type" style="margin-left: -30px; margin-top: -10px">
+        <div class="alert-type" style="margin-left: -26px; margin-top: -10px">
           <BasicForm @register="registerForm"
           <BasicForm @register="registerForm"
         /></div>
         /></div>
         <CollapseContainer style="margin-top: -20px">
         <CollapseContainer style="margin-top: -20px">
           <template #action> </template>
           <template #action> </template>
-          <div style="margin-left: 10px">
+          <div style="margin-left: 10px; margin-top: -10px">
             <BasicForm @register="registerFormHighSetting">
             <BasicForm @register="registerFormHighSetting">
               <template #checkBox="{ model, field }">
               <template #checkBox="{ model, field }">
                 <Checkbox v-model:checked="model[field]">传递报警</Checkbox>
                 <Checkbox v-model:checked="model[field]">传递报警</Checkbox>
@@ -27,7 +33,7 @@
               <div style="margin-left: -30px; margin-top: 20px"
               <div style="margin-left: -30px; margin-top: 20px"
                 ><BasicForm @register="registerFormCreateAlarm" />
                 ><BasicForm @register="registerFormCreateAlarm" />
               </div>
               </div>
-              <div style="margin-left: 5px; position: relative">
+              <div style="margin-left: 5px">
                 <div style="color: #f5594e" class="mt-4 ml-4"
                 <div style="color: #f5594e" class="mt-4 ml-4"
                   >报警规则条件：
                   >报警规则条件：
                   <Button size="small" type="primary" @click="handleOpenAlaramRuleConditions"
                   <Button size="small" type="primary" @click="handleOpenAlaramRuleConditions"
@@ -61,12 +67,15 @@
                     style="font-size: 20px"
                     style="font-size: 20px"
                   /> -->
                   /> -->
                   </div>
                   </div>
-                  <div style="margin-left: 0px">
+                  <div style="margin-left: 0px; position: relative">
                     <BasicForm @register="dashboardForm" />
                     <BasicForm @register="dashboardForm" />
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>
-              <div class="remove-type" style="position: absolute; top: -10px; right: 10px">
+              <div
+                class="remove-type"
+                style="display: inline-block; position: relative; top: -304px; left: 800px"
+              >
                 <img
                 <img
                   style="cursor: pointer"
                   style="cursor: pointer"
                   @click="deleteCondition(index, createIndex)"
                   @click="deleteCondition(index, createIndex)"
@@ -133,21 +142,21 @@
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>
-              <div class="w-1/4 flex justify-center">
+              <!-- <div class="w-1/4 flex justify-center">
                 <img
                 <img
                   style="cursor: pointer"
                   style="cursor: pointer"
                   @click="deleteClearCondition(index, createIndex)"
                   @click="deleteClearCondition(index, createIndex)"
                   alt="移除"
                   alt="移除"
                   src="../../../../assets/images/close.png"
                   src="../../../../assets/images/close.png"
                 />
                 />
-                <!-- <Tooltip title="移除">
+                <Tooltip title="移除">
                 <MinusCircleOutlined
                 <MinusCircleOutlined
                   style="font-size: 25px; color: #305680"
                   style="font-size: 25px; color: #305680"
                   class="cursor-pointer"
                   class="cursor-pointer"
                   @click="deleteClearCondition(index, createIndex)"
                   @click="deleteClearCondition(index, createIndex)"
                 />
                 />
-              </Tooltip> -->
-              </div>
+              </Tooltip>
+              </div> -->
             </div>
             </div>
           </div>
           </div>
         </template>
         </template>
@@ -315,7 +324,7 @@
       };
       };
 
 
       const addAlarmRule = () => {
       const addAlarmRule = () => {
-        console.log(typeof unref(profileData));
+        // console.log(profileData.value.alarms.length)
         unref(profileData).push({
         unref(profileData).push({
           configuration: {},
           configuration: {},
           transportConfiguration: {},
           transportConfiguration: {},
@@ -877,7 +886,7 @@
   :deep(.vben-collapse-container__header) {
   :deep(.vben-collapse-container__header) {
     border: none;
     border: none;
   }
   }
-  :deep(.anticon svg) {
-    display: none !important;
-  }
+  // :deep(.anticon svg) {
+  //   display: none !important;
+  // }
 </style>
 </style>