Merge branch 'ft_local_dev' into 'main'

pref：优化设备列表 弹出组织等

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

@@ -7,22 +7,97 @@
     width="30%"
     @ok="handleSubmit"
   >
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm">
+      <template #alarmContactSlot="{ model, field }">
+        <p style="display: none">{{ field }}</p>
+        <p>{{ orgFunc(model['organizationId']) }}</p>
+        <a-select
+          style="top: -13px"
+          placeholder="请选择告警联系人"
+          mode="multiple"
+          v-model:value="model[field]"
+          :options="alarmContactOptions.map((item) => ({ value: item.value, label: item.label }))"
+        >
+          <template #dropdownRender="{ menuNode: menu }">
+            <v-nodes :vnodes="menu" />
+            <a-divider style="margin: 4px 0" />
+            <div @click="handleOpenAlarmContact" style="padding: 4px 8px; cursor: pointer">
+              <plus-outlined />
+              新增告警联系人
+            </div>
+          </template>
+        </a-select>
+      </template>
+    </BasicForm>
   </BasicDrawer>
+  <AlarmContactDrawer @register="registerAlarmContactDrawer" @success="handleSuccess" />
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, reactive } from 'vue';
+  import { defineComponent, ref, computed, unref, reactive, watch } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { saveOrEditAlarmConfig, byOrgIdGetAlarmContact } from '/@/api/alarm/config/alarmConfig';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { useDrawer } from '/@/components/Drawer';
+  import AlarmContactDrawer from '../../alarm/contacts/ContactDrawer.vue';
 
   export default defineComponent({
     name: 'ContactDrawer',
-    components: { BasicDrawer, BasicForm },
+    components: {
+      BasicDrawer,
+      BasicForm,
+      AlarmContactDrawer,
+      PlusOutlined,
+      VNodes: (_, { attrs }) => {
+        return attrs.vnodes;
+      },
+    },
     emits: ['success', 'register'],
     setup(_, { emit }) {
+      const alarmContactOptions: any = ref([]);
+      const orgId = ref('');
+      const orgFunc = (e) => {
+        orgId.value = e;
+      };
+      watch(
+        () => orgId.value,
+        async (newValue: string) => {
+          if (newValue) {
+            setFieldsValue({ alarmContactId: [] });
+            //获取告警联系人
+            const res = await byOrgIdGetAlarmContact(newValue);
+            if (res) {
+              alarmContactOptions.value = res.map((m) => {
+                return { label: m.username, value: m.id };
+              });
+            } else {
+              alarmContactOptions.value = [];
+            }
+          } else {
+            alarmContactOptions.value = [];
+          }
+        }
+      );
+      const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
+      async function handleSuccess() {
+        //获取告警联系人
+        const res = await byOrgIdGetAlarmContact(orgId.value);
+        if (res) {
+          alarmContactOptions.value = res.map((m) => {
+            return { label: m.username, value: m.id };
+          });
+        } else {
+          alarmContactOptions.value = [];
+        }
+      }
+      // 新增或编辑
+      const handleOpenAlarmContact = () => {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      };
       const isUpdate = ref(true);
       let allData: any = reactive({});
       const editId = ref('');
@@ -112,6 +187,11 @@
         registerDrawer,
         registerForm,
         handleSubmit,
+        alarmContactOptions,
+        orgFunc,
+        handleOpenAlarmContact,
+        registerAlarmContactDrawer,
+        handleSuccess,
       };
     },
   });

@@ -2,7 +2,6 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { byOrgIdGetAlarmContact } from '/@/api/alarm/config/alarmConfig';
 
 // 表格列数据
 export const columns: BasicColumn[] = [
@@ -101,8 +100,7 @@ export const formSchema: FormSchema[] = [
     label: '所属组织',
     component: 'ApiTreeSelect',
     required: true,
-    componentProps: ({ formActionType }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
+    componentProps: () => {
       return {
         maxLength: 250,
         placeholder: '请选择所属组织',
@@ -111,25 +109,6 @@ export const formSchema: FormSchema[] = [
           copyTransFun(data as any as any[]);
           return data;
         },
-        async onChange(e) {
-          setFieldsValue({
-            alarmContactId: [],
-          });
-          const res = await byOrgIdGetAlarmContact(e);
-          let opts = [];
-          if (res.length !== 0) {
-            opts = res.map((m) => {
-              return { label: m.username, value: m.id };
-            });
-            updateSchema({
-              field: 'alarmContactId',
-              componentProps: {
-                mode: 'multiple',
-                options: opts,
-              },
-            });
-          }
-        },
       };
     },
   },
@@ -137,6 +116,7 @@ export const formSchema: FormSchema[] = [
     field: 'alarmContactId',
     label: '告警联系人',
     component: 'Select',
+    slot: 'alarmContactSlot',
     required: true,
   },
   {

@@ -19,7 +19,7 @@
               <ListItemMeta>
                 <template #avatar>
                   <Avatar
-                    :src="item.sysNotice.avatar ?? 'https://q1.qlogo.cn/g?b=qq&nk=190848757&s=640'"
+                    :src="item.sysNotice.avatar ?? defaultAvatar(item.receiverId)"
                     size="large"
                   />
                 </template>
@@ -169,6 +169,8 @@
   import { BasicTable, useTable } from '/@/components/Table';
   import { isAdmin } from '/@/enums/roleEnum';
   import { getTenantExpireTimeList, getTenantTop10 } from '/@/api/dashboard';
+  import headerImg from '/@/assets/images/logo.png';
+
   export default defineComponent({
     components: {
       Card,
@@ -255,6 +257,12 @@
       });
 
       const userStore = useUserStore();
+      console.log(userStore.getUserInfo);
+      const defaultAvatar = (uid) => {
+        if (uid === userStore.getUserInfo?.userId) {
+          return userStore.getUserInfo?.avatar || headerImg;
+        }
+      };
       const getContacts = computed(() => {
         return userStore.enterPriseInfo?.contacts;
       });
@@ -295,6 +303,7 @@
         registerTable,
         isAdmin,
         Empty,
+        defaultAvatar,
       };
     },
   });
@@ -303,12 +312,15 @@
   .noticeTitle:hover {
     border-bottom: 1px solid #ccc;
   }
+
   :deep(.ant-anchor-link-active > .ant-anchor-link-title) {
     color: #666;
   }
+
   :deep(.ant-pagination-prev) {
     display: none;
   }
+
   :deep(.ant-pagination-next) {
     display: none;
   }

 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile, getGATEWAYdevice } from '/@/api/device/deviceManager';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
 
 export enum TypeEnum {
   IS_GATEWAY = 'GATEWAY',
@@ -82,25 +80,10 @@ export const step1Schemas: FormSchema[] = [
   },
   {
     field: 'organizationId',
-    required: true,
     label: '所属组织',
-    component: 'ApiTreeSelect',
-    componentProps({ formActionType }) {
-      const { setFieldsValue } = formActionType;
-      return {
-        api: async () => {
-          const data = await getOrganizationList();
-          copyTransFun(data as any as any[]);
-          return data;
-        },
-
-        onChange() {
-          setFieldsValue({
-            gatewayId: null,
-          });
-        },
-      };
-    },
+    component: 'Input',
+    required: true,
+    slot: 'addOrg',
   },
   {
     field: 'gatewayId',

@@ -2,6 +2,25 @@
   <div class="step1">
     <div class="step1-form">
       <BasicForm @register="register">
+        <template #addOrg="{ model, field }">
+          <div style="display: flex; align-items: center">
+            <div style="width: 245px">
+              <a-tree-select
+                v-model:value="model[field]"
+                show-search
+                style="width: 100%"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                placeholder="请选择组织"
+                allow-clear
+                tree-default-expand-all
+                :tree-data="treeData"
+              />
+            </div>
+            <div>
+              <a-button type="link" @click="handleOpenOrgDrawer">新增组织</a-button>
+            </div>
+          </div>
+        </template>
         <template #iconSelect>
           <Upload
             name="avatar"
@@ -86,10 +105,11 @@
         <div ref="wrapRef" style="height: 300px; width: 90%" class="ml-6"></div>
       </div>
     </Modal>
+    <DeptDrawer @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, nextTick, unref, reactive } from 'vue';
+  import { defineComponent, ref, nextTick, unref, reactive, toRefs, onMounted } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from '../../config/data';
   import { useScript } from '/@/hooks/web/useScript';
@@ -102,6 +122,10 @@
   import icon from '/@/assets/images/wz.png';
   import { useDebounceFn } from '@vueuse/core';
   import { validatorLongitude, validatorLatitude } from '/@/utils/rules';
+  import { getOrganizationList } from '/@/api/system/system';
+  import { copyTransFun } from '/@/utils/fnUtils';
+  import { useDrawer } from '/@/components/Drawer';
+  import DeptDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
 
   export default defineComponent({
     components: {
@@ -117,6 +141,7 @@
       Row,
       Col,
       LoadingOutlined,
+      DeptDrawer,
     },
     props: {
       isUpdate: {
@@ -125,6 +150,27 @@
     },
     emits: ['next'],
     setup(props, { emit }) {
+      const orgData: any = reactive({
+        treeData: [],
+      });
+      const getOrganizationListFunc = async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        orgData.treeData = data;
+      };
+      onMounted(async () => {
+        await getOrganizationListFunc();
+      });
+      const { treeData } = toRefs(orgData);
+      const [registerModal, { openDrawer }] = useDrawer();
+      const handleOpenOrgDrawer = () => {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      };
+      const handleSuccess = async () => {
+        await getOrganizationListFunc();
+      };
       const redirectPosition = () => {
         if (positionState.longitude && positionState.latitude) {
           var pt = new BMap.Point(positionState.longitude, positionState.latitude);
@@ -152,6 +198,7 @@
       async function nextStep() {
         try {
           let values = await validate();
+          console.log(values);
           values = { devicePic: devicePic.value, ...positionState, ...values };
           delete values.icon;
           delete values.deviceAddress;
@@ -400,6 +447,10 @@
         loading,
         rules,
         redirectPosition,
+        treeData,
+        registerModal,
+        handleOpenOrgDrawer,
+        handleSuccess,
       };
     },
   });

@@ -21,18 +21,18 @@
       <template #outputParamSlot>
         <div>
           <template v-for="(item, index) in outputParamData" :key="item">
-            <span style="display: none">{{ item }}</span>
+            <span style="display: none">{{ item + index }}</span>
             <InputParamItem
               :title="item.name"
               :item="item"
               class="mt-4"
-              :index="index"
+              :index="item.id"
               :ref="dynamicBindRef.outputParamItemRef"
               @delete="deleteOutParItem"
               @edit="editOutParItem"
             />
           </template>
-          <div style="display: flex" class="mt-2">
+          <div style="display: flex" :class="{ 'mt-2': outputParamData.length > 0 }">
             <span style="color: #0170cc; cursor: pointer">+</span>
             <span style="color: #0170cc; cursor: pointer" @click="handleAddOutParam">增加参数</span>
           </div>
@@ -50,7 +50,11 @@
   import InputParamItem from './components/InputParamItem.vue';
   import AddParamsModal from './components/AddParamsModal.vue';
   import { Input } from 'ant-design-vue';
-  import { validateValueRangeAndStep, validateValueBool } from '../hook/useValidateParital';
+  import {
+    validateValueRangeAndStep,
+    validateValueBool,
+    validateValueStruct,
+  } from '../hook/useValidateParital';
   import { buildUUID } from '/@/utils/uuid';
 
   const outputParamData: any = ref([]);
@@ -138,6 +142,9 @@
     const values = await validate();
     if (!values) return;
     const dataSpecsList = getStructList();
+    if (values.dataType === 'STRUCT') {
+      validateValueStruct(dataSpecsList as any);
+    }
     validateValueRangeAndStep(Number(minMaxObj.min), Number(values.step), Number(minMaxObj.max));
     validateValueBool(Number(values.boolClose), Number(values.boolOpen));
     const dataSpecs = {

@@ -237,6 +237,7 @@
   };
   const resetFormData = () => {
     resetFields();
+    outputParamData.value = [];
     minMaxObj.min = '';
     minMaxObj.max = '';
   };

@@ -17,6 +17,7 @@
   import { ref, computed, reactive } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import AddParamForm from './AddParamForm.vue';
+  import { validateValueStruct } from '../../hook/useValidateParital';
 
   const emits = defineEmits(['register', 'data']);
   const setEditData: any = reactive({
@@ -53,6 +54,9 @@
   const handleSubmit = async () => {
     const value = await AddParamFormRef.value?.getFormData();
     if (!value) return;
+    if (value.dataType === 'STRUCT') {
+      validateValueStruct(value.dataSpecsList as any);
+    }
     emits(
       'data',
       {

@@ -21,3 +21,10 @@ export const validateValueBool = (boolClose, boolOpen) => {
     throw '布尔值不能相同';
   }
 };
+
+export const validateValueStruct = (data: []) => {
+  if (data.length === 0) {
+    createMessage.error('struct不能为空');
+    throw 'struct不能为空';
+  }
+};

@@ -17,7 +17,6 @@
               @click="handleCreateOrEdit('add')"
               class="ml-2"
               style="color: #409eff; cursor: pointer"
-              type="primary"
               size="small"
               >新建转换脚本</span
             >

@@ -98,6 +98,7 @@
               :arr="arr"
               @deleteAction="deleteAction"
               @getActionFormArr="getActionFormArr"
+              @dynamicChangeAlarmConfig="handleDynamicChangeAlarmConfig"
             />
           </template>
           <!-- 按钮 -->
@@ -550,8 +551,14 @@
   const getMasterDeviceList = ref([]);
   const orgId = ref('');
   const alarmConfigList = ref([]);
+  //FT add 2022-10-27
+  const addOrgId = ref('');
+  //FT add 2022-10-27
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
+    //FT add 2022-10-27
+    addOrgId.value = newValue;
+    //FT add 2022-10-27
     const { items = [] } = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
     //TODO fengtao
     getMasterDeviceList.value = await byOganizationIdGetMasterDevice(newValue);
@@ -567,13 +574,33 @@
     alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
     setAlarmConfig(skipUnwrap.actionItemRefs, true);
   });
-
+  //FT add 2022-10-27
+  const handleDynamicChangeAlarmConfig = async () => {
+    const data = await getOrganizationAlarmConfig({
+      organizationId: isUpdate.value ? provideOrgid.value : addOrgId.value,
+    });
+    const res = data.map((item) => ({ label: item.name, value: item.id }));
+    isUpdate.value ? (editAlarmConfigData.value = res) : (alarmConfigList.value = res);
+    unref(skipUnwrap.actionItemRefs)?.map((item: any) => {
+      if (isUpdate.value) {
+        item.updateEditFieldAlarmConfig(editAlarmConfigData);
+      } else {
+        item.updateFieldAlarmConfig(alarmConfigList);
+      }
+    });
+  };
+  //FT add 2022-10-27
   // 根据上面组织变化动态改变触发器，执行条件,执行动作的设备值
   function setFields(linkAge, isOrganizationChange = false) {
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
       //TODO fengtao
       item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
+      if (isUpdate.value) {
+        item.updateEditFieldAlarmConfig(editAlarmConfigData);
+      } else {
+        item.updateFieldAlarmConfig(alarmConfigList);
+      }
       //TODO fengtao
     });
   }

@@ -3,7 +3,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
 import { scheduleOptions } from './formatData';
 import { copyTransFun } from '/@/utils/fnUtils';
-import { numberAndNonegativeRule,numberAndEngLishRule } from '/@/utils/rules';
+import { numberAndNonegativeRule } from '/@/utils/rules';
 
 /**
  * 所使用的枚举值
@@ -265,7 +265,7 @@ export const trigger_condition_schema: FormSchema[] = [
     },
     ifShow: ({ values }) => isDevice(values.triggerType),
     colProps: { span: 6 },
-    rules: numberAndEngLishRule,
+    // rules: numberAndEngLishRule,
   },
   {
     field: 'operationType',
@@ -334,10 +334,11 @@ export const actionSchema: FormSchema[] = [
   {
     field: 'alarm_config',
     label: '',
-    component: 'Select',
+    component: 'Input',
     componentProps: {
       placeholder: '请选择告警配置',
     },
+    slot: 'alarmConfigSlot',
     ifShow: ({ values }) => values.outTarget === 'MSG_NOTIFY',
     colProps: { span: 6 },
   },

@@ -292,6 +292,17 @@
     currentIndex.value = index;
   };
   const scheduleData = ref(null);
+  //FT add 2022-10-27
+  const updateFieldAlarmConfig = (alarmConfigList) => {
+    //什么也不做
+    console.log(alarmConfigList);
+  };
+  //FT add 2022-10-27
+  const updateEditFieldAlarmConfig = (alarmConfigList) => {
+    //什么也不做
+    console.log(alarmConfigList);
+  };
+
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,
@@ -307,13 +318,15 @@
     isUpdate,
     alarmScheduleRef,
     updateFieldAttributeFunc,
+    updateFieldAlarmConfig,
+    updateEditFieldAlarmConfig,
   });
 </script>
 
 <style lang="less" scoped>
   ///移除选择框默认样式（24px）否则超出默认宽度会造成页面样式错乱
   :deep(.ant-select-selector) {
-    padding-right: 0px !important;
+    padding-right: 0 !important;
   }
 </style>
 

@@ -19,6 +19,24 @@
           placeholder="请选择执行动作"
           allowClear
       /></template>
+      <template #alarmConfigSlot="{ model, field }">
+        <a-select
+          allowClear
+          placeholder="请选择告警配置"
+          v-model:value="model[field]"
+          style="width: 205px; margin-left: 10px"
+          :options="alarmConfigOptions.map((item) => ({ value: item.value, label: item.label }))"
+        >
+          <template #dropdownRender="{ menuNode: menu }">
+            <v-nodes :vnodes="menu" />
+            <a-divider style="margin: 4px 0" />
+            <div @click="handleOpenAlarmConfig" style="padding: 4px 0; cursor: pointer">
+              <plus-outlined />
+              新增告警配置
+            </div>
+          </template>
+        </a-select>
+      </template>
       <template #doContext>
         <div class="flex">
           <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
@@ -56,19 +74,34 @@
       >新增清除告警</a-button
     >
   </CollapseContainer>
+  <AlarmConfigDrawer @register="registerAlarmContactDrawer" @success="handleSuccess" />
 </template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  export default defineComponent({
+    components: {
+      VNodes: (_, { attrs }) => {
+        return attrs.vnodes;
+      },
+    },
+    inheritAttrs: false,
+  });
+</script>
 <script lang="ts" setup>
   import { ref, onMounted, nextTick, unref, computed, provide } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Tooltip, Select, Checkbox, Card } from 'ant-design-vue';
   import { Icon } from '/@/components/Icon';
-  import { actionSchema } from '../config/config.data.ts';
+  import { actionSchema } from '../config/config.data';
   import jsoneditor from 'jsoneditor';
   import 'jsoneditor/dist/jsoneditor.min.css';
-  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+  import { QuestionCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
   import ClearAlarm from './ClearAlarm.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { useDrawer } from '/@/components/Drawer';
+  import AlarmConfigDrawer from '/@/views/alarm/config/ContactDrawer.vue';
 
   const props = defineProps({
     actionIndex: {
@@ -96,13 +129,24 @@
       default: '',
     },
   });
+  const alarmConfigOptions: any = ref([]);
+  const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
+  async function handleSuccess() {
+    emit('dynamicChangeAlarmConfig');
+  }
+  // 新增或编辑
+  const handleOpenAlarmConfig = () => {
+    openDrawer(true, {
+      isUpdate: false,
+    });
+  };
   const isAddClearRule = computed(() => clearRuleList.value.length < props.triggerData.length);
   const refItem = {
     clearRuleRefs: ref([]),
   };
   const { createMessage } = useMessage();
 
-  const emit = defineEmits(['deleteAction', 'getActionFormArr']);
+  const emit = defineEmits(['deleteAction', 'getActionFormArr', 'dynamicChangeAlarmConfig']);
   const options = computed(() => {
     return [
       { label: '设备输出', value: 'DEVICE_OUT' },
@@ -228,23 +272,14 @@
       },
     });
   };
-  //TODO-fengtao
+  //FT add 2022-10-27
   const updateEditFieldAlarmConfig = (alarmConfigList) => {
-    updateSchema({
-      field: 'alarm_config',
-      componentProps: {
-        options: alarmConfigList,
-      },
-    });
+    alarmConfigOptions.value = alarmConfigList.value;
   };
   const updateFieldAlarmConfig = (alarmConfigList) => {
-    updateSchema({
-      field: 'alarm_config',
-      componentProps: {
-        options: alarmConfigList,
-      },
-    });
+    alarmConfigOptions.value = alarmConfigList.value;
   };
+  //FT add 2022-10-27
 
   const checked = ref(false);
   const validateForm = () => {