Merge branch 'main' into ft

 <template>
   <BasicModal
     v-bind="$attrs"
-    width="55rem"
+    width="50rem"
     :title="getTitle"
     @register="register"
     @cancel="handleCancel"
@@ -19,7 +19,6 @@
       <DeviceStep1
         @next="handleStep1Next"
         ref="DeviceStep1Ref"
-        :deviceInfo="deviceInfo"
         v-show="current === 0"
         :isUpdate="!isUpdate"
       />
@@ -77,13 +76,12 @@
             profile: record.deviceProfile.name,
             profileId: record.profileId,
             deviceType: record.deviceType,
+            deviceInfo: record.deviceInfo,
           });
-          deviceInfo.value = record.deviceInfo;
           unref(DeviceStep1Ref)?.disabledDeviceType(true);
         } else {
           unref(DeviceStep1Ref)?.disabledDeviceType(false);
           unref(DeviceStep1Ref)?.parentResetPositionState();
-          deviceInfo.value = {};
         }
         setModalProps({ loading: false });
       });

@@ -74,7 +74,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, nextTick, unref, reactive, watch } from 'vue';
+  import { defineComponent, ref, nextTick, unref, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from '../../config/data';
   import { useScript } from '/@/hooks/web/useScript';
@@ -101,10 +101,6 @@
       Col,
     },
     props: {
-      deviceInfo: {
-        type: Object,
-        default: () => ({}),
-      },
       isUpdate: {
         type: Boolean,
       },
@@ -298,6 +294,11 @@
       };
       // 父组件调用更新字段值的方法
       function parentSetFieldsValue(data) {
+        const { deviceInfo } = data;
+        positionState.longitude = deviceInfo.longitude;
+        positionState.latitude = deviceInfo.latitude;
+        positionState.address = deviceInfo.address;
+        devicePic.value = deviceInfo.avatar;
         setFieldsValue(data);
       }
       // 父组件调用获取字段值的方法
@@ -330,17 +331,6 @@
           },
         });
       }
-
-      watch(
-        () => props.deviceInfo,
-        (newValue) => {
-          positionState.longitude = newValue.longitude;
-          positionState.latitude = newValue.latitude;
-          positionState.address = newValue.address;
-          devicePic.value = newValue.avatar;
-        }
-      );
-
       return {
         resetFields,
         positionState,
@@ -370,36 +360,8 @@
   });
 </script>
 <style lang="less" scoped>
-  .step1 {
-    &-form {
-      width: 450px;
-      margin: 0 auto;
-    }
-
-    h3 {
-      margin: 0 0 12px;
-      font-size: 16px;
-      line-height: 32px;
-      color: @text-color;
-    }
-
-    h4 {
-      margin: 0 0 4px;
-      font-size: 14px;
-      line-height: 22px;
-      color: @text-color;
-    }
-
-    p {
-      color: @text-color;
-    }
-  }
-
-  .pay-select {
-    width: 20%;
-  }
-
-  .pay-input {
-    width: 70%;
+  .step1-form {
+    width: 450px;
+    margin: 0 auto;
   }
 </style>

@@ -99,6 +99,7 @@
   import Action from './cpns/Action.vue';
   import { useUserStore } from '/@/store/modules/user';
   import { findOperation } from './config/formatData.ts';
+  import { formatToDateTime } from '/@/utils/dateUtil';
 
   const emit = defineEmits(['register', 'success']);
 
@@ -230,12 +231,25 @@
             trigger.triggerCondition.condition.condition.forEach((item, index) => {
               const formItem = {
                 operation: item.predicate.operation,
-                value: String(item.predicate.value.defaultValue),
+                value:
+                  valueType === 'DATE_TIME'
+                    ? formatToDateTime(
+                        Number(item.predicate.value.defaultValue),
+                        'YYYY-MM-DD HH:mm:ss'
+                      )
+                    : String(item.predicate.value.defaultValue),
+                ignoreCase: item.valueType === 'STRING' ? item.predicate.ignoreCase : undefined,
               };
               richTextList.push({
                 // 查询中文操作符
                 operation: findOperation(valueType, item.predicate.operation).label,
-                value: String(item.predicate.value.defaultValue),
+                value:
+                  valueType === 'DATE_TIME'
+                    ? formatToDateTime(
+                        Number(item.predicate.value.defaultValue),
+                        'YYYY-MM-DD HH:mm:ss'
+                      )
+                    : String(item.predicate.value.defaultValue),
                 attribute: trigger.triggerCondition?.condition.condition[0]?.key?.key,
               });
               ConditionScreeningForm.value[index].setFieldsValue(formItem);
@@ -289,12 +303,25 @@
             condition.triggerCondition.condition.condition.forEach((item, index) => {
               const formItem = {
                 operation: item.predicate.operation,
-                value: String(item.predicate.value.defaultValue),
+                value:
+                  valueType === 'DATE_TIME'
+                    ? formatToDateTime(
+                        Number(item.predicate.value.defaultValue),
+                        'YYYY-MM-DD HH:mm:ss'
+                      )
+                    : String(item.predicate.value.defaultValue),
+                ignoreCase: item.valueType === 'STRING' ? item.predicate.ignoreCase : undefined,
               };
               richTextList.push({
                 // 查询中文操作符
                 operation: findOperation(valueType, item.predicate.operation).label,
-                value: String(item.predicate.value.defaultValue),
+                value:
+                  valueType === 'DATE_TIME'
+                    ? formatToDateTime(
+                        Number(item.predicate.value.defaultValue),
+                        'YYYY-MM-DD HH:mm:ss'
+                      )
+                    : String(item.predicate.value.defaultValue),
                 attribute: condition.triggerCondition?.condition.condition[0]?.key?.key,
               });
               ConditionScreeningForm.value[index].setFieldsValue(formItem);
@@ -389,12 +416,26 @@
                   rule.triggerCondition.condition.condition.forEach((item, conditionIndex) => {
                     const formItem = {
                       operation: item.predicate.operation,
-                      value: String(item.predicate.value.defaultValue),
+                      value:
+                        item.valueType === 'DATE_TIME'
+                          ? formatToDateTime(
+                              Number(item.predicate.value.defaultValue),
+                              'YYYY-MM-DD HH:mm:ss'
+                            )
+                          : String(item.predicate.value.defaultValue),
+                      ignoreCase:
+                        item.valueType === 'STRING' ? item.predicate.ignoreCase : undefined,
                     };
                     richTextList.push({
                       // 查询中文操作符
                       operation: findOperation(item.valueType, item.predicate.operation).label,
-                      value: String(item.predicate.value.defaultValue),
+                      value:
+                        item.valueType === 'DATE_TIME'
+                          ? formatToDateTime(
+                              Number(item.predicate.value.defaultValue),
+                              'YYYY-MM-DD HH:mm:ss'
+                            )
+                          : String(item.predicate.value.defaultValue),
                       attribute: item?.key?.key,
                     });
                     ConditionScreeningForm[ruleIndex].value[conditionIndex].setFieldsValue(

@@ -404,8 +404,7 @@ export const alarmScheduleSchemas: FormSchema[] = [
       return {
         options: scheduleOptions,
         allowClear: false,
-        onChange(value) {
-          console.log(value);
+        onChange() {
           resetFields();
         },
       };

@@ -28,6 +28,7 @@ export const genTriggerOrConditionData = (triggerData) => {
       predicate: {
         type: operationType === 'DATE_TIME' ? 'NUMERIC' : operationType,
         operation: item.operation,
+        ignoreCase: operationType === 'STRING' ? item.ignoreCase : undefined,
         value: {
           defaultValue:
             operationType === 'DATE_TIME' ? Number(formatToDateTime(item.value, 'x')) : item.value,
@@ -75,7 +76,6 @@ export const genActionData = (actionData) => {
     device,
     deviceId,
   } = actionData;
-  console.log(actionData);
   const clearRule = clearRules.map((item) => {
     const mapPredicate = item.predicate.map((pred) => {
       return {
@@ -88,6 +88,7 @@ export const genActionData = (actionData) => {
         predicate: {
           type: item.operationType,
           operation: pred.operation,
+          ignoreCase: item.operationType === 'STRING' ? pred.ignoreCase : undefined,
           value: {
             defaultValue: pred.value,
             // userValue: null,
@@ -205,6 +206,8 @@ export function findOperation(valueType, operation) {
   switch (valueType) {
     case 'NUMERIC' || 'DATE_TIME':
       return operationNumber_OR_TIME.find((item) => item.value === operation);
+    case 'DATE_TIME':
+      return operationNumber_OR_TIME.find((item) => item.value === operation);
     case 'STRING':
       return operationString.find((item) => item.value === operation);
     case 'BOOLEAN':
@@ -244,9 +247,8 @@ export function isType(operationType) {
           field: 'ignoreCase',
           label: '忽略大小写',
           component: 'Checkbox',
-          labelWidth: 150,
           colProps: {
-            span: 7,
+            span: 6,
           },
         },
         {
@@ -254,6 +256,7 @@ export function isType(operationType) {
           label: '执行操作',
           component: 'Select',
           required: true,
+
           componentProps: {
             options: operationString,
           },
@@ -265,6 +268,7 @@ export function isType(operationType) {
           field: 'value',
           label: '操作值',
           required: true,
+
           component: 'Input',
           colProps: {
             span: 7,
@@ -318,7 +322,7 @@ export function isType(operationType) {
             options: operationNumber_OR_TIME,
           },
           colProps: {
-            span: 8,
+            span: 7,
           },
         },
         {
@@ -330,7 +334,7 @@ export function isType(operationType) {
             showTime: true,
           },
           colProps: {
-            span: 8,
+            span: 10,
           },
         },
       ];

@@ -11,19 +11,19 @@
     <BasicForm @register="registerForm" ref="basicFormRef">
       <template #customEnable>
         <template v-for="(item, optionIndex) in options" :key="item.flag">
-          <div :class="optionIndex >= 1 ? 'mt-4' : ''">
-            <Checkbox v-model:checked="item.enabled">星期{{ item.flag }}</Checkbox>
+          <div :class="optionIndex >= 1 ? 'mt-4' : ''" class="flex">
+            <div class="ml-4 mr-4 flex items-center">
+              <Checkbox v-model:checked="item.enabled">星期{{ item.flag }}</Checkbox>
+            </div>
             <TimePicker
-              size="small"
               placeholder="开始时间"
               v-model:value="item.startsOn"
               value-format="x"
               format="HH:mm"
               :disabled="!item.enabled"
             />
-            ~
+            <span class="ml-4 mr-4 flex items-center">~</span>
             <TimePicker
-              size="small"
               placeholder="结束时间"
               v-model:value="item.endsOn"
               value-format="x"
@@ -34,15 +34,13 @@
       </template>
       <template #timing>
         <TimePicker
-          size="small"
           placeholder="开始时间"
           v-model:value="timeState.startsOn"
           value-format="x"
           format="HH:mm"
         />
-        ~
+        <span class="ml-4 mr-4">~</span>
         <TimePicker
-          size="small"
           placeholder="结束时间"
           v-model:value="timeState.endsOn"
           value-format="x"
@@ -59,6 +57,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { alarmScheduleSchemas } from '../config/config.data.ts';
   import { Checkbox, TimePicker } from 'ant-design-vue';
+
   const emit = defineEmits(['register', 'cancel']);
   const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
     showActionButtonGroup: false,
@@ -238,4 +237,8 @@
   });
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  :deep(.ant-time-picker) {
+    width: 12rem;
+  }
+</style>

@@ -54,7 +54,7 @@
         label: '和',
         component: 'Input',
         slot: 'and',
-        labelWidth: 50,
+        // labelWidth: 50,
         colProps: { span: 3 },
       },
       'value'

@@ -36,7 +36,4 @@
     padding: 0 5px;
     margin: 0 5px;
   }
-  .parentheses {
-    font-size: 16px;
-  }
 </style>

@@ -92,7 +92,6 @@
     const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
       (item) => item.getFieldsValue()
     );
-
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
   const updateFieldDeviceId = (deviceList: any[]) => {