Merge branch 'ft' into 'main'

fix:修改告警管理表格名字,默认配置不可删除和编辑 See merge request huang/yun-teng-iot-front!174

Merge branch 'ft' into 'main'
fix:修改告警管理表格名字,默认配置不可删除和编辑 See merge request huang/yun-teng-iot-front!174
xp.Huang
2 parents 3ef67b0f bbef30c5
Showing 11 changed files with 221 additions and 40 deletions
src/views/alarm/config/config.data.ts
src/views/alarm/config/index.vue
src/views/device/profiles/device.profile.data.ts
src/views/device/profiles/index.vue
src/views/device/profiles/step/DeviceProfileStep2.vue
src/views/device/profiles/step/cpns/coap/Coap.ts
src/views/device/profiles/step/cpns/lwm2m/index.ts
src/views/device/profiles/step/cpns/lwm2m/index.vue
src/views/device/profiles/step/data.ts
src/views/rule/dataFlow/addDataTransferDrawer.vue
src/views/system/menu/MenuDrawer.vue
--- a/src/views/alarm/config/config.data.ts
View file @67d50a5
+++ b/src/views/alarm/config/config.data.ts
View file @67d50a5
@@ -11,25 +11,25 @@ import { useMessage } from '/@/hooks/web/useMessage';
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
-    title: '告警配置名称',
+    title: '配置名称',
     dataIndex: 'name',
     width: 120,
   },
   {
     title: '所属组织',
     dataIndex: 'organizationName',
-    width: 160,
+    width: 150,
   },
   {
-    title: '告警通知联系人',
+    title: '告警联系人',
     dataIndex: 'alarmContactId',
-    width: 160,
+    width: 155,
     slots: { customRender: 'alarmContact' },
   },
   {
-    title: '告警联系方式',
+    title: '联系方式',
     dataIndex: 'messageMode',
-    width: 160,
+    width: 155,
     slots: { customRender: 'messageMode' },
   },
   {
@@ -42,8 +42,8 @@ export const columns: BasicColumn[] = [
       }
       return h(Switch, {
         checked: record.status === 1,
-        checkedChildren: '配置',
-        unCheckedChildren: '未配置',
+        checkedChildren: '启用',
+        unCheckedChildren: '未启用',
         loading: record.pendingStatus,
         onChange(checked: boolean) {
           record.pendingStatus = true;
@@ -53,9 +53,9 @@ export const columns: BasicColumn[] = [
             .then(() => {
               record.status = newStatus;
               if (record.status == 1) {
-                createMessage.success(`已配置`);
+                createMessage.success(`启用`);
               } else {
-                createMessage.error('未配置');
+                createMessage.success('未启用');
               }
             })
             .finally(() => {
@@ -88,7 +88,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'name',
     label: '告警配置名称',
     component: 'Input',
-    colProps: { span: 8 },
+    colProps: { span: 6 },
     componentProps: {
       maxLength: 36,
       placeholder: '请输入告警配置名称',
@@ -98,15 +98,15 @@ export const searchFormSchema: FormSchema[] = [
     field: 'status',
     label: '告警配置状态',
     component: 'Select',
-    colProps: { span: 8 },
+    colProps: { span: 6 },
     componentProps: {
       options: [
         {
-          label: '已配置',
+          label: '启用',
           value: 1,
         },
         {
-          label: '未配置',
+          label: '未启用',
           value: 0,
         },
       ],
--- a/src/views/alarm/config/index.vue
View file @67d50a5
+++ b/src/views/alarm/config/index.vue
View file @67d50a5
@@ -20,12 +20,12 @@
         </template>
         <template #alarmContact="{ record }">
           <a-button type="link" class="ml-2" @click="showAlarmContact(record)">
-            查看告警联系人
+            查看联系人
           </a-button>
         </template>
         <template #messageMode="{ record }">
           <a-button type="link" class="ml-2" @click="showMessageMode(record)">
-            查看告警联系方式
+            查看联系方式
           </a-button>
         </template>
         <template #action="{ record }">
@@ -35,11 +35,17 @@
                 label: '编辑',
                 icon: 'clarity:note-edit-line',
                 onClick: handleCreateOrEdit.bind(null, record),
+                ifShow: () => {
+                  return record.status === 0;
+                },
               },
               {
                 label: '删除',
                 icon: 'ant-design:delete-outlined',
                 color: 'error',
+                ifShow: () => {
+                  return record.status === 0;
+                },
                 popConfirm: {
                   title: '是否确认删除',
                   confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -92,6 +98,7 @@
         api: queryAlarmConfig,
         columns,
         clickToRowSelect: false,
+        showIndexColumn: false,
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
--- a/src/views/device/profiles/device.profile.data.ts
View file @67d50a5
+++ b/src/views/device/profiles/device.profile.data.ts
View file @67d50a5
@@ -8,33 +8,33 @@ export const columns: BasicColumn[] = [
   {
     title: '名称',
     dataIndex: 'name',
-    width: 150,
+    width: 120,
   },
   {
     title: '配置类型',
     dataIndex: 'type',
-    width: 100,
+    width: 90,
   },
   {
     title: '传输方式',
     dataIndex: 'transportType',
-    width: 100,
+    width: 90,
   },
   {
     title: '默认配置',
     dataIndex: 'default',
-    width: 100,
+    width: 50,
     format: (text) => (text ? '是' : '否'),
   },
   {
     title: '描述',
     dataIndex: 'description',
-    width: 150,
+    width: 100,
   },
   {
     title: '创建时间',
     dataIndex: 'createTime',
-    width: 150,
+    width: 100,
   },
 ];
--- a/src/views/device/profiles/index.vue
View file @67d50a5
+++ b/src/views/device/profiles/index.vue
View file @67d50a5
@@ -19,7 +19,7 @@
         <TableAction
           :actions="[
             {
-              label: '设置默认',
+              label: '默认',
               icon: 'ant-design:profile-outlined',
               onClick: handleSetDefault.bind(null, record),
               ifShow: () => {
@@ -105,10 +105,11 @@
         bordered: true,
         showIndexColumn: false,
         actionColumn: {
-          width: 250,
+          width: 240,
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
+          fixed: 'right',
         },
       });
--- a/src/views/device/profiles/step/DeviceProfileStep2.vue
View file @67d50a5
+++ b/src/views/device/profiles/step/DeviceProfileStep2.vue
View file @67d50a5
@@ -8,6 +8,9 @@
       <div v-else-if="isMqttType == 'COAP'">
         <CoapCpns ref="coapRef" />
       </div>
+      <div v-else-if="isMqttType == 'LWM2M1'">
+        <Lwm2mCpns ref="lwm2mRef" />
+      </div>
       <div
         style="
           display: flex;
@@ -47,12 +50,14 @@
       Button,
       MqttCpns,
       CoapCpns,
+      Lwm2mCpns,
     },
     emits: ['next', 'prev', 'register'],
     setup(_, { emit }) {
       const { proxy } = getCurrentInstance() as any;
       const mqttRef = ref(null);
       const coapRef = ref(null);
+      const lwm2mRef = ref(null);
       const isMqttType = ref('');
       let step2Data = reactive({
         transportConfiguration: {},
@@ -91,6 +96,7 @@
                 { label: '默认', value: 'DEFAULT' },
                 { label: 'MQTT', value: 'MQTT' },
                 { label: 'CoAP', value: 'COAP' },
+                // { label: 'LWM2M', value: 'LWM2M' },
               ],
               onChange(e) {
                 isMqttType.value = e;
@@ -123,6 +129,7 @@
         isMqttType,
         mqttRef,
         coapRef,
+        lwm2mRef,
       };
     },
   });
--- a/src/views/device/profiles/step/cpns/coap/Coap.ts
View file @67d50a5
+++ b/src/views/device/profiles/step/cpns/coap/Coap.ts
View file @67d50a5
@@ -59,7 +59,7 @@ export const CoapSchemas: FormSchema[] = [
   {
     field: 'powerMode',
     component: 'Select',
-    label: 'Power Mode',
+    label: '模式',
     defaultValue: 'DRX',
     componentProps: {
       options: [
--- a/src/views/device/profiles/step/cpns/lwm2m/index.ts 0 → 100644
View file @67d50a5
+++ b/src/views/device/profiles/step/cpns/lwm2m/index.ts 0 → 100644
View file @67d50a5
+import { FormSchema } from '/@/components/Form';
+
+export const modelSchemas: FormSchema[] = [
+  {
+    field: '0',
+    component: 'Input',
+    label: 'Object list',
+    componentProps: {
+      placeholder: '请输入Object list',
+    },
+    colProps: { span: 11 },
+  },
+];
+
+export const serverSchemas: FormSchema[] = [
+  {
+    field: '1',
+    component: 'InputNumber',
+    label: 'Short ID',
+    required: true,
+    defaultValue: 123,
+    colProps: { span: 8 },
+  },
+  {
+    field: '2',
+    component: 'InputNumber',
+    label: 'Client registration lifetime',
+    required: true,
+    defaultValue: 123,
+    colProps: { span: 8 },
+  },
+];
+
+export const settingsSchemas: FormSchema[] = [
+  {
+    field: 'deviceTelemetryTopic',
+    component: 'Input',
+    label: '筛选器',
+    required: true,
+    defaultValue: 'v1/devices/me/telemetry',
+    componentProps: {
+      placeholder: '请输入遥测数据 topic 筛选器',
+    },
+    colProps: { span: 11 },
+  },
+];
+
+export const deviceSchemas: FormSchema[] = [
+  {
+    field: 'deviceTelemetryTopic',
+    component: 'Input',
+    label: '筛选器',
+    required: true,
+    defaultValue: 'v1/devices/me/telemetry',
+    componentProps: {
+      placeholder: '请输入遥测数据 topic 筛选器',
+    },
+    colProps: { span: 11 },
+  },
+];
--- a/src/views/device/profiles/step/cpns/lwm2m/index.vue 0 → 100644
View file @67d50a5
+++ b/src/views/device/profiles/step/cpns/lwm2m/index.vue 0 → 100644
View file @67d50a5
+<template>
+  <div style="">
+    <Tabs
+      :defaultActiveKey="currentKey"
+      v-model:activeKey="currentKey"
+      :size="currentSize"
+      :animated="true"
+    >
+      <TabPane key="1" tab="LWM2M Model">
+        <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerModel" />
+      </TabPane>
+      <TabPane key="2" tab="Servers">
+        <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerServer" />
+      </TabPane>
+      <TabPane key="3" tab="Other settings">
+        <BasicForm
+          :showResetButton="false"
+          :showSubmitButton="false"
+          @register="registerSettings"
+        />
+      </TabPane>
+      <TabPane key="4" tab="Json Config Profile Device">
+        <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerDevice" />
+      </TabPane>
+    </Tabs>
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { Tabs } from 'ant-design-vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { modelSchemas, serverSchemas, settingsSchemas, deviceSchemas } from './index';
+
+  export default defineComponent({
+    name: 'index',
+    components: {
+      Tabs,
+      TabPane: Tabs.TabPane,
+      BasicForm,
+    },
+    setup() {
+      const currentKey = ref(1);
+      const currentSize = ref('large');
+
+      const [registerModel] = useForm({
+        labelWidth: 80,
+        schemas: modelSchemas,
+        actionColOptions: {
+          span: 14,
+        },
+      });
+      const [registerServer] = useForm({
+        labelWidth: 80,
+        schemas: serverSchemas,
+        actionColOptions: {
+          span: 14,
+        },
+      });
+      const [registerSettings] = useForm({
+        labelWidth: 80,
+        schemas: settingsSchemas,
+        actionColOptions: {
+          span: 14,
+        },
+      });
+      const [registerDevice] = useForm({
+        labelWidth: 80,
+        schemas: deviceSchemas,
+        actionColOptions: {
+          span: 14,
+        },
+      });
+
+      return {
+        currentKey,
+        currentSize,
+        registerModel,
+        registerServer,
+        registerSettings,
+        registerDevice,
+      };
+    },
+  });
+</script>
--- a/src/views/device/profiles/step/data.ts
View file @67d50a5
+++ b/src/views/device/profiles/step/data.ts
View file @67d50a5
@@ -77,6 +77,7 @@ export const step2Schemas: FormSchema[] = [
           { label: '默认', value: 'DEFAULT' },
           { label: 'MQTT', value: 'MQTT' },
           { label: 'CoAP', value: 'COAP' },
+          // { label: 'LWM2M', value: 'LWM2M' },
         ],
         onChange(e) {},
       };
--- a/src/views/rule/dataFlow/addDataTransferDrawer.vue
View file @67d50a5
+++ b/src/views/rule/dataFlow/addDataTransferDrawer.vue
View file @67d50a5
 <template>
   <div>
     <BasicModal
+      :showOkBtn="false"
+      :showCancelBtn="false"
       v-bind="$attrs"
       @register="registerDrawer"
-      showFooter
       :title="getTitle"
       width="1000px"
-      @ok="handleSubmit"
-      @cancel="handleCancel"
     >
       <div class="step-form-form">
         <a-steps :current="current">
@@ -26,17 +25,32 @@
             @prevSon="handlePrev"
         /></div>
       </div>
+      <div style="float: right">
+        <Button :disabled="disStatus" type="primary" @click="handleSubmit" class="mr-2"
+          >确认</Button
+        >
+        <Button type="default" @click="handleCancel" class="mr-2">取消</Button>
+      </div>
     </BasicModal>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, ref, computed, unref, getCurrentInstance } from 'vue';
+  import {
+    defineComponent,
+    reactive,
+    ref,
+    computed,
+    unref,
+    getCurrentInstance,
+    nextTick,
+  } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { Steps } from 'ant-design-vue';
   import TransferConfigMode from './cpns/transferConfigMode.vue';
   import TransferConfigParams from './cpns/transferConfigParams.vue';
   import { postAddConvertApi } from '/@/api/datamanager/dataManagerApi';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { Button } from '/@/components/Button';
   export default defineComponent({
     name: 'ConfigDrawer',
@@ -46,12 +60,14 @@
       [Steps.Step.name]: Steps.Step,
       TransferConfigMode,
       TransferConfigParams,
+      Button,
     },
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
+      const disStatus = ref(false);
       const { proxy } = getCurrentInstance() as any;
-      const allPostForm = reactive({});
+      let allPostForm: any = reactive({});
       const getNameObj = reactive({
         name: '',
       });
@@ -64,8 +80,8 @@
           description: '',
         },
       };
-      const getSonFormValue = ref({});
-      const getModeSonFormValue = ref({});
+      const getSonFormValue: any = ref({});
+      const getModeSonFormValue: any = ref({});
       const refTransferConfigParams = ref(null);
       const refTransferConfigMode = ref(null);
       const getModeSelectVal = ref({});
@@ -100,18 +116,20 @@
           editNextType.name = data.record.name;
           editNextType.remark = data.record.remark;
           proxy.$refs.refTransferConfigMode.setStepOneFieldsValueFunc(editNextType);
+        } else {
+          nextTick(() => {
+            proxy.$refs.refTransferConfigMode?.customResetStepOneFunc();
+          });
         }
       });
       const handleCancel = () => {
         defineClearFunc();
       };
       const defineClearFunc = () => {
-        try {
-          proxy.$refs.refTransferConfigMode.customResetStepOneFunc();
+        nextTick(() => {
+          proxy.$refs.refTransferConfigMode?.customResetStepOneFunc();
           proxy.$refs.refTransferConfigParams?.clearSonValueDataFunc();
-        } catch (e) {
-          return e;
-        }
+        });
       };
       const handleNext = (args) => {
         current.value++;
@@ -198,12 +216,16 @@
       };
       const handleSubmit = async () => {
         if (!unref(isUpdate)) {
+          disStatus.value = true;
           await addOrEditFunc();
           await postAddConvertApi(allPostForm);
           createMessage.success('数据流转新增成功');
           emit('success');
           defineClearFunc();
           closeModal();
+          setTimeout(() => {
+            disStatus.value = false;
+          }, 2000);
         } else {
           await addOrEditFunc();
           await postAddConvertApi(allPostForm);
@@ -224,6 +246,7 @@
         getModeSelectVal,
         refTransferConfigParams,
         refTransferConfigMode,
+        disStatus,
       };
     },
   });
--- a/src/views/system/menu/MenuDrawer.vue
View file @67d50a5
+++ b/src/views/system/menu/MenuDrawer.vue
View file @67d50a5
@@ -51,9 +51,6 @@
         updateSchema({ field: 'title', componentProps: { disabled: false } });
         //如果是编辑操作，设置页面数据
         if (unref(isUpdate)) {
-          console.log('------------编辑时获得的值-----------------------');
-          console.log(data.record);
-
           // // 动态设置 表单值
           //
           let menuObj: metaModel = Reflect.get(data.record, 'meta');