Merge branch 'ft-dev' into 'main'

设备配置新增报警规则的弹窗（详情模板、启用规则、规则条件）

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

@@ -10,6 +10,7 @@ export type TDeviceConfigParams = {
 };
 
 export interface IDeviceConfigAddOrEditModel {
+  defaultQueueName?: string; //处理队列
   alarmProfile?: {
     alarmContactId: string;
     createTime: '2021-12-15T02:17:26.644Z';
@@ -45,6 +46,7 @@ export interface IDeviceConfigAddOrEditModel {
     provisionConfiguration: {
       provisionDeviceSecret: string;
     };
+    //报警类型字段
     alarms: [
       {
         id: 'highTemperatureAlarmID';

@@ -32,6 +32,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
     },
     {
       errorMessageMode: mode,
+      joinPrefix: false,
     }
   );
 }

@@ -37,8 +37,8 @@ export enum PageEnum {
   // basic login path
   BASE_LOGIN = '/login',
   // basic home path
-  BASE_HOME = '/system/account',
-  // BASE_HOME = '/dashboard',
+  // BASE_HOME = '/system/account',
+  BASE_HOME = '/dashboard',
   // error page path
   ERROR_PAGE = '/exception',
   // error log page path

@@ -74,7 +74,8 @@
       const getStepTwoData: any = ref({});
       const getStepThreeData: any = ref({});
       const editEchoData: any = ref({});
-      const isGetStepFourData: any = ref({});
+      const alarmProfileData: any = ref({});
+      // const isGetStepThreeData: any = ref({});
       const isGetStepThreeData: any = ref({});
       const postEditId = ref('');
       const current = ref(0);
@@ -113,17 +114,15 @@
       }
       const handleSubmit = async () => {
         if (!unref(isUpdate)) {
-          isGetStepThreeData.value.alarmProfile = getStepThreeData.value;
-          let getStep4Data = proxy.$refs.getStepData.getAllFields();
-          isGetStepFourData.value.alarmProfile = getStep4Data;
+          isGetStepThreeData.value.profileData = getStepThreeData.value;
+          alarmProfileData.value.alarmProfile = await proxy.$refs.getStepData.getAllFields();
           Object.assign(
             postDeviceConfogData.value,
             getStepOneData.value,
             getStepTwoData.value,
-            isGetStepFourData.value,
-            isGetStepThreeData.value
+            isGetStepThreeData.value,
+            alarmProfileData.value
           );
-          console.log('搜集的所有数据', postDeviceConfogData.value);
           await deviceConfigAddOrEdit(postDeviceConfogData.value);
           createMessage.success('新增设备配置成功');
           closeModal();
@@ -132,18 +131,16 @@
         if (unref(isUpdate)) {
           postDeviceConfogData.value.id = postEditId.value;
           isGetStepThreeData.value.alarmProfile = getStepThreeData.value;
-          let getStep4Data = proxy.$refs.getStepData.getAllFields();
-          isGetStepFourData.value.alarmProfile = getStep4Data;
+          alarmProfileData.value.alarmProfile = await proxy.$refs.getStepData.getAllFields();
           Object.assign(
             postDeviceConfogData.value,
             getStepOneData.value,
             getStepTwoData.value,
-            isGetStepFourData.value,
+            alarmProfileData.value,
             isGetStepThreeData.value
           );
-          console.log('搜集的所有数据', postDeviceConfogData.value);
           await deviceConfigAddOrEdit(postDeviceConfogData.value);
-          createMessage.success('新增设备配置成功');
+          createMessage.success('编辑设备配置成功');
           closeModal();
           emit('success');
         }

@@ -24,14 +24,23 @@
               <div>
                 <p style="color: #f5594e" class="mt-4 ml-4"
                   >请添加报警规则条件
-                  <PlusOutlined class="cursor-pointer ml-4" style="font-size: 20px"
+                  <PlusOutlined
+                    @click="handleOpenAlaramRuleConditions"
+                    class="cursor-pointer ml-4"
+                    style="font-size: 20px"
                 /></p>
                 <p class="mt-4 ml-4"
                   >启用规则：始终启用
-                  <EditOutlined class="cursor-pointer ml-4" style="font-size: 20px"
+                  <EditOutlined
+                    @click="handleOpenEnableRule"
+                    class="cursor-pointer ml-4"
+                    style="font-size: 20px"
                 /></p>
                 <p class="mt-4 ml-4"
-                  >详情：<EditOutlined class="cursor-pointer ml-4" style="font-size: 20px"
+                  >详情模板：<EditOutlined
+                    @click="handleOpenDetailTemplate"
+                    class="cursor-pointer ml-4"
+                    style="font-size: 20px"
                 /></p>
                 <p class="mt-4 ml-4">dashboard:</p>
               </div>
@@ -62,6 +71,12 @@
     <a-button @click="handleFormStep3toStep4Next">下一步</a-button>
     <a-button style="margin-left: 20px" type="primary" @click="addAlarmRule">添加报警规则</a-button>
   </div>
+  <!-- 详情模板 -->
+  <DetailTemplate v-if="isDetailTemplateEnableRuleAlarmRuleConditions" @register="registerModal" />
+  <!-- 启用规则 -->
+  <EnableRule v-if="!isDetailTemplateEnableRuleAlarmRuleConditions" @register="registerModal" />
+  <!-- 报警规则条件 -->
+  <AlarmRuleConditions v-if="isRuleAlarmRuleConditions == 1" @register="registerModal" />
 </template>
 
 <script lang="ts">
@@ -78,6 +93,10 @@
     EditOutlined,
   } from '@ant-design/icons-vue';
   import { Tooltip, Checkbox } from 'ant-design-vue';
+  import { useModal } from '/@/components/Modal';
+  import DetailTemplate from './cpns/detailtemplate/index.vue';
+  import EnableRule from './cpns/enablerule/index.vue';
+  import AlarmRuleConditions from './cpns/alarmruleconditions/index.vue';
 
   export default defineComponent({
     components: {
@@ -90,9 +109,14 @@
       EditOutlined,
       Checkbox,
       Tooltip,
+      DetailTemplate,
+      EnableRule,
+      AlarmRuleConditions,
     },
     emits: ['prev', 'next'],
     setup(_, { emit }) {
+      const isDetailTemplateEnableRuleAlarmRuleConditions = ref(true);
+      const isRuleAlarmRuleConditions = ref(1);
       const getAllFormData: any = ref({});
       //告警列表
       let alarms = ref<alarmListItem[]>([]);
@@ -111,7 +135,8 @@
         unref(alarms).push({
           id: Date.now(),
           messageMode: '',
-          enabled: false,
+          propagate: false,
+          propagateRelationTypes: [''],
           createRule: [
             {
               id: Date.now() + Math.random(),
@@ -124,6 +149,7 @@
           ],
           clearRule: [],
         });
+        console.log(alarms.value);
       };
 
       // 表单部分 报警类型
@@ -195,14 +221,45 @@
             valueRegisterForm,
             valueRegisterFormHighSetting,
             valueRegisterFormCreateAlarm,
-            valueRegisterFormClearAlarm
+            valueRegisterFormClearAlarm,
+            alarms.value
           );
           console.log('第三步的数据', getAllFormData.value);
           emit('next', getAllFormData.value);
         } catch (error) {}
       };
 
+      const [registerModal, { openModal }] = useModal();
+
+      const handleOpenDetailTemplate = () => {
+        openModal(true, {
+          isUpdate: false,
+        });
+        isDetailTemplateEnableRuleAlarmRuleConditions.value = true;
+        console.log(isDetailTemplateEnableRuleAlarmRuleConditions.value);
+      };
+      const handleOpenEnableRule = () => {
+        openModal(true, {
+          isUpdate: false,
+        });
+        isDetailTemplateEnableRuleAlarmRuleConditions.value = false;
+        console.log(isDetailTemplateEnableRuleAlarmRuleConditions.value);
+      };
+      const handleOpenAlaramRuleConditions = () => {
+        openModal(true, {
+          isUpdate: false,
+        });
+        isRuleAlarmRuleConditions.value = 1;
+        console.log(isRuleAlarmRuleConditions.value);
+      };
+
       return {
+        isRuleAlarmRuleConditions,
+        isDetailTemplateEnableRuleAlarmRuleConditions,
+        registerModal,
+        handleOpenEnableRule,
+        handleOpenAlaramRuleConditions,
+        handleOpenDetailTemplate,
         handleFormStep3toStep4Next,
         log,
         alarms,

+import { FormSchema } from '/@/components/Table';
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'detail',
+    label: '报警详细信息',
+    colProps: { span: 24 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入报警详细信息',
+    },
+  },
+];

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    width="55rem"
+    @register="register"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
+    <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchema } from './config';
+
+  export default defineComponent({
+    name: 'DetailTemplate',
+    components: {
+      BasicModal,
+      BasicForm,
+    },
+    emits: ['success', 'register'],
+    setup() {
+      const isUpdate = ref(true);
+      const [registerForm] = useForm({
+        labelWidth: 120,
+        schemas: formSchema,
+      });
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增报警规则条件' : '编辑报警规则条件'));
+      const [register] = useModalInner((data) => {
+        isUpdate.value = !!data?.isUpdate;
+      });
+      const handleSubmit = () => {
+        console.log(1);
+      };
+      return {
+        registerForm,
+        handleSubmit,
+        register,
+        getTitle,
+      };
+    },
+  });
+</script>

+import { FormSchema } from '/@/components/Table';
+
+/**
+ * 所使用的枚举值
+ */
+
+export enum TriggerEnum {
+  IS_DEVICE_ACT = 'DEVICE_ACT',
+  IS_TIME_ACT = 'TIME_ACT',
+  IS_SCENE_ACT = 'SCENE_ACT',
+}
+
+export const isShiDu = (type: string) => {
+  return type === TriggerEnum.IS_DEVICE_ACT;
+};
+export const isWenDu = (type: string) => {
+  return type === TriggerEnum.IS_TIME_ACT;
+};
+
+export const isTimeAll = (type: string) => {
+  return type === TriggerEnum.IS_SCENE_ACT;
+};
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'detail',
+    label: '条件类型',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择报警日程表',
+      options: [
+        { label: '简单', value: 'DEVICE_ACT' },
+        { label: '持续时间', value: 'TIME_ACT' },
+        { label: '重复', value: 'SCENE_ACT' },
+      ],
+    },
+  },
+  {
+    field: 'type1',
+    label: '动态源类型',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择动态源类型',
+      options: [
+        { label: '无动态值', value: 'second' },
+        { label: '当前租户', value: 'minute' },
+        { label: '当前客户', value: 'hour' },
+        { label: '当前设备', value: 'day' },
+      ],
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time1',
+    label: '源属性',
+    colProps: { span: 24 },
+    component: 'Input',
+    componentProps: {
+      placeholder: '源属性',
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'type1',
+    label: '动态源类型',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择动态源类型',
+      options: [
+        { label: '无动态值', value: 'second' },
+        { label: '当前租户', value: 'minute' },
+        { label: '当前客户', value: 'hour' },
+        { label: '当前设备', value: 'day' },
+      ],
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time1',
+    label: '源属性',
+    colProps: { span: 24 },
+    component: 'Input',
+    componentProps: {
+      placeholder: '源属性',
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    label: '持续时间值',
+    colProps: { span: 24 },
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入持续时间值',
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'r',
+    label: '时间单位',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择报警日程表',
+      options: [
+        { label: '秒', value: 'second' },
+        { label: '分钟', value: 'minute' },
+        { label: '小时', value: 'hour' },
+        { label: '天', value: 'day' },
+      ],
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    label: '事件计数值必填',
+    colProps: { span: 24 },
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入事件计数值必填',
+    },
+    rules: [{ message: '事件计数应在1到2147483637之间', trigger: 'blur' }],
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+];

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    width="55rem"
+    @register="register"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
+    <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchema } from './config';
+
+  export default defineComponent({
+    name: 'DetailTemplate',
+    components: {
+      BasicModal,
+      BasicForm,
+    },
+    emits: ['success', 'register'],
+    setup() {
+      const isUpdate = ref(true);
+      const [registerForm] = useForm({
+        labelWidth: 120,
+        schemas: formSchema,
+      });
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增详情模板' : '编辑详情模板'));
+      const [register] = useModalInner((data) => {
+        isUpdate.value = !!data?.isUpdate;
+      });
+      const handleSubmit = () => {
+        console.log(1);
+      };
+      return {
+        registerForm,
+        handleSubmit,
+        register,
+        getTitle,
+      };
+    },
+  });
+</script>

+import { FormSchema } from '/@/components/Table';
+
+/**
+ * 所使用的枚举值
+ */
+
+export enum TriggerEnum {
+  IS_DEVICE_ACT = 'DEVICE_ACT',
+  IS_TIME_ACT = 'TIME_ACT',
+  IS_SCENE_ACT = 'SCENE_ACT',
+}
+
+export const isShiDu = (type: string) => {
+  return type === TriggerEnum.IS_DEVICE_ACT;
+};
+export const isWenDu = (type: string) => {
+  return type === TriggerEnum.IS_TIME_ACT;
+};
+
+export const isTimeAll = (type: string) => {
+  return type === TriggerEnum.IS_SCENE_ACT;
+};
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'detail',
+    label: '报警日程表',
+    colProps: { span: 24 },
+    required: true,
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择报警日程表',
+      options: [
+        { label: '始终启用', value: 'DEVICE_ACT' },
+        { label: '定时启用', value: 'TIME_ACT' },
+        { label: '自定义启用', value: 'SCENE_ACT' },
+      ],
+    },
+  },
+  {
+    field: 'time',
+    label: '时区',
+    colProps: { span: 24 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: 'Asia/Shanghai (UTC+08:00)',
+    },
+    ifShow: ({ values }) =>
+      isWenDu(Reflect.get(values, 'detail')) || isTimeAll(Reflect.get(values, 'detail')),
+  },
+
+  {
+    field: 'data1',
+    component: 'Checkbox',
+    label: '星期一',
+    colProps: {
+      span: 8,
+    },
+    renderComponentContent: '',
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+
+  {
+    field: 'data2',
+    component: 'Checkbox',
+    label: '星期二',
+    colProps: {
+      span: 8,
+    },
+    renderComponentContent: '',
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'data3',
+    component: 'Checkbox',
+    label: '星期三',
+    colProps: {
+      span: 8,
+    },
+    renderComponentContent: '',
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'data4',
+    component: 'Checkbox',
+    label: '星期四',
+    colProps: {
+      span: 8,
+    },
+    renderComponentContent: '',
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'data5',
+    component: 'Checkbox',
+    label: '星期五',
+    colProps: {
+      span: 8,
+    },
+    renderComponentContent: '',
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'data6',
+    component: 'Checkbox',
+    label: '星期六',
+    colProps: {
+      span: 8,
+    },
+    renderComponentContent: '',
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'data7',
+    component: 'Checkbox',
+    label: '星期七',
+    colProps: {
+      span: 8,
+    },
+    renderComponentContent: '',
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+
+  {
+    field: 'weekday',
+    component: 'CheckboxGroup',
+    label: '天',
+    colProps: {
+      span: 24,
+    },
+    rules: [
+      {
+        message: '每周至少选择一天',
+        trigger: 'blur',
+      },
+    ],
+    componentProps: {
+      options: [
+        {
+          label: '星期一',
+          value: '1',
+        },
+        {
+          label: '星期二',
+          value: '2',
+        },
+        {
+          label: '星期三',
+          value: '3',
+        },
+        {
+          label: '星期四',
+          value: '4',
+        },
+        {
+          label: '星期五',
+          value: '5',
+        },
+        {
+          label: '星期六',
+          value: '6',
+        },
+        {
+          label: '星期七',
+          value: '7',
+        },
+      ],
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    component: 'TimePicker',
+    label: '时间选择',
+    colProps: {
+      span: 8,
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+];

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    width="55rem"
+    @register="register"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
+    <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchema } from './config';
+
+  export default defineComponent({
+    name: 'DetailTemplate',
+    components: {
+      BasicModal,
+      BasicForm,
+    },
+    emits: ['success', 'register'],
+    setup() {
+      const isUpdate = ref(true);
+      const [registerForm] = useForm({
+        labelWidth: 120,
+        schemas: formSchema,
+      });
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增报警日程表' : '编辑报警日程表'));
+      const [register] = useModalInner((data) => {
+        isUpdate.value = !!data?.isUpdate;
+      });
+      const handleSubmit = () => {
+        console.log(1);
+      };
+      return {
+        registerForm,
+        handleSubmit,
+        register,
+        getTitle,
+      };
+    },
+  });
+</script>

 import { FormSchema } from '/@/components/Form';
-// import { findDictItemByCode } from '/@/api/system/dict';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
+import { findDictItemByCode } from '/@/api/system/dict';
+// import { getOrganizationList } from '/@/api/system/system';
+// import { copyTransFun } from '/@/utils/fnUtils';
 import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
 
 export const step1Schemas: FormSchema[] = [
@@ -14,19 +14,7 @@ export const step1Schemas: FormSchema[] = [
       maxLength: 30,
     },
   },
-  {
-    required: true,
-    field: 'organizationId',
-    label: '请选择组织',
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-    },
-  },
+  //规则链(string)
   {
     field: 'defaultRuleChainId',
     label: '请选择规则链',
@@ -49,19 +37,19 @@ export const step1Schemas: FormSchema[] = [
   //     // api: uploadApi,
   //   },
   // },
-  // {
-  //   field: 'defaultConfig',
-  //   label: '队列优先级',
-  //   component: 'ApiSelect',
-  //   componentProps: {
-  //     api: findDictItemByCode,
-  //     params: {
-  //       dictCode: 'queen_execute_sequence',
-  //     },
-  //     labelField: 'itemText',
-  //     valueField: 'itemValue',
-  //   },
-  // },
+  {
+    field: 'defaultQueueName',
+    label: '处理队列',
+    component: 'ApiSelect',
+    componentProps: {
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'queen_execute_sequence',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+  },
   {
     label: '描述',
     field: 'description',
@@ -79,7 +67,9 @@ export const step2Schemas: FormSchema[] = [
       options: [
         { label: 'MQTT', value: 'MQTT' },
         { label: 'TCP', value: 'TCP' },
-        { label: 'COAP', value: 'COAP' },
+        { label: 'CoAP', value: 'CoAP' },
+        { label: 'LWM2M', value: 'LWM2M' },
+        { label: 'SNMP', value: 'SNMP' },
       ],
     },
   },
@@ -87,7 +77,7 @@ export const step2Schemas: FormSchema[] = [
 
 export const step3Schemas: FormSchema[] = [
   {
-    field: 'description',
+    field: 'alarmType',
     component: 'Input',
     label: '报警类型',
     colProps: {
@@ -102,19 +92,19 @@ export const step3Schemas: FormSchema[] = [
 
 export const step3HighSetting: FormSchema[] = [
   {
-    field: 'enabled',
+    field: 'propagate',
     component: 'Checkbox',
     label: '',
     slot: 'checkBox',
   },
   {
-    field: 'defaultConfig',
+    field: 'propagateRelationTypes',
     component: 'Input',
     label: '关联类型',
     componentProps: {
       placeholder: '要传递的关联类型',
     },
-    ifShow: ({ values }) => !!values.enabled,
+    ifShow: ({ values }) => !!values.propagate,
   },
 ];
 

@@ -15,11 +15,10 @@ interface clearRule {
 }
 export interface alarmListItem {
   id?: number;
-  messageMode?: string;
   alarmType?: string;
-  enabled?: boolean;
-  createRule?: createRule[];
-  clearRule?: clearRule[];
+  messageMode?: string;
   propagate?: boolean;
   propagateRelationTypes?: string[];
+  createRule?: createRule[];
+  clearRule?: clearRule[];
 }

@@ -126,13 +126,14 @@ export const formSchema: FormSchema[] = [
       api: async () => {
         const data = await getOrganizationList();
         copyTransFun(data as any as any[]);
-        const filterData = data.map((m) => {
-          return {
-            label: m.label,
-            value: m.value,
-          };
-        });
-        return filterData;
+        // const filterData = data.map((m) => {
+        //   return {
+        //     label: m.label,
+        //     value: m.value,
+        //   };
+        // });
+        // return filterData;
+        return data;
       },
       onChange: (v) => {
         isDeptId.value = v;