修改设备配置

fengistao
1 parent a3c5f2fb
Showing 6 changed files with 131 additions and 84 deletions
src/views/device/profile/step/DeviceProfileStep3.vue
src/views/device/profile/step/cpns/alarmruleconditions/config.ts
src/views/device/profile/step/cpns/alarmruleconditions/cpns/config.ts
src/views/device/profile/step/cpns/alarmruleconditions/cpns/index.vue
src/views/device/profile/step/cpns/alarmruleconditions/index.vue
src/views/ruleengine/scenelinkage/addForm/1.json
--- a/src/views/device/profile/step/DeviceProfileStep3.vue
View file @0a7382f
+++ b/src/views/device/profile/step/DeviceProfileStep3.vue
View file @0a7382f
@@ -145,7 +145,7 @@
     @register="registerModal3"
   />
-  <!-- 清除条件的 -->
+  <!-- 清除条件 -->
   <!-- 详情模板 -->
   <DetailTemplate
     v-if="isRuleAlarmRuleConditions == 4"
@@ -222,7 +222,9 @@
       const ruleObj: any = ref({});
       const ruleLastObj: any = ref({});
       const enableObj: any = ref({});
+      const enableClearObj: any = ref({});
       const additionalObj: any = ref({});
+      const addClearitionalObj: any = ref({});
       const isWhereTypeValue = ref(null);
       const ruleTemplateData: any = ref(null);
       const enableTemplateData: any = ref(null);
@@ -415,7 +417,7 @@
           }
         });
         ruleTemplateData.value = `
-         键名:${v.key}...操作:${findRuleByValue?.label}...值:${v.value1}
+         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
          `;
         ruleLastObj.value = v1;
@@ -443,7 +445,7 @@
             {
               key: {
                 type: ruleObj.value?.type,
-                key: ruleObj.value?.key,
+                key: ruleObj.value?.key1,
               },
               valueType: ruleObj.value.type1,
               predicate,
@@ -466,7 +468,7 @@
       };
       //启用规则
       const getAllClearFieldsEnabFunc = (v) => {
-        enableObj.value = v;
+        enableClearObj.value = v;
         const findDay = [
           {
             label: '星期一',
@@ -533,7 +535,7 @@
           }
         });
         ruleClearTemplateData.value = `
-         键名:${v.key}...操作:${findRuleByValue?.label}...值:${v.value1}
+         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
          `;
         ruleLastObj.value = v1;
@@ -561,7 +563,7 @@
             {
               key: {
                 type: ruleObj.value?.type,
-                key: ruleObj.value?.key,
+                key: ruleObj.value?.key1,
               },
               valueType: ruleObj.value.type1,
               predicate,
@@ -572,11 +574,21 @@
         const getValueConditon = {
           condition: getCondition,
         };
-        Object.assign(additionalObj.value, getValueConditon);
+        Object.assign(addClearitionalObj.value, getValueConditon);
       };
-
       const handleFormStep3toStep4Next = async () => {
         try {
+          const scheduleClearValue = {
+            type: enableClearObj.value.schedule,
+            daysOfWeek: enableClearObj.value.daysOfWeek,
+            // endsOn: enableClearObj.value.endsOn,
+            // startsOn: enableClearObj.value.startOn,
+            timezone: enableClearObj.value.timezone,
+          };
+          const getClearSchedule = {
+            schedule: scheduleClearValue,
+          };
+          const getClearAdditionalProp = Object.assign({}, detailObj.value, getClearSchedule);
           const scheduleValue = {
             type: enableObj.value.schedule,
             daysOfWeek: enableObj.value.daysOfWeek,
@@ -595,8 +607,8 @@
           );
           const getScheduleAndClearAlarmDetails = Object.assign(
             {},
-            getAdditionalProp,
-            additionalObj.value
+            getClearAdditionalProp,
+            addClearitionalObj.value
           );
           const getIsWhereTypeValue: any = isWhereTypeValue.value;
           const getAdditionalPropObj = {
--- a/src/views/device/profile/step/cpns/alarmruleconditions/config.ts
View file @0a7382f
+++ b/src/views/device/profile/step/cpns/alarmruleconditions/config.ts
View file @0a7382f
@@ -30,10 +30,10 @@ export const isTimeAll = (type: string) => {
   return type === TriggerEnum.IS_SCENE_ACT;
 };
-export const columns: BasicColumn[] = [
+export const keyColumns: BasicColumn[] = [
   {
     title: '键名',
-    dataIndex: 'key',
+    dataIndex: 'key1',
     width: 200,
   },
   {
@@ -45,19 +45,48 @@ export const columns: BasicColumn[] = [
 export const columnsView: BasicColumn[] = [
   {
     title: '键名',
-    dataIndex: 'key',
+    dataIndex: 'key1',
     width: 200,
   },
   {
-    title: '键类型',
-    dataIndex: 'type',
+    title: '操作',
+    dataIndex: 'operation',
+    width: 200,
+    format: (text: string, record: Recordable) => {
+      const findDay = [
+        { label: '等于', value: 'EQUAL' },
+        { label: '不等于', value: 'NOT_EQUAL' },
+        { label: '开始于', value: 'STARTS_WITH' },
+        { label: '结束于', value: 'ENDS_WITH' },
+        { label: '包含', value: 'CONTAINS' },
+        { label: '不包含', value: 'NOT_CONTAINS' },
+        { label: '等于', value: 'EQUAL' },
+        { label: '不等于', value: 'NOT_EQUAL' },
+        { label: '大于', value: 'GREATER' },
+        { label: '小于', value: 'LESS' },
+        { label: '大于或等于', value: 'GREATER_OR_EQUAL' },
+        { label: '小于或等于', value: 'LESS_OR_EQUAL' },
+      ];
+      const findRuleByValue = findDay.find((f) => {
+        if (f.value == record.operation) {
+          return f.label;
+        }
+      });
+      if (findRuleByValue) {
+        return findRuleByValue.label;
+      }
+    },
+  },
+  {
+    title: '值',
+    dataIndex: 'value1',
     width: 200,
   },
 ];
 export const DescDetailSchema: DescItem[] = [
   {
-    field: 'key',
+    field: 'key1',
     label: '键名',
   },
   {
--- a/src/views/device/profile/step/cpns/alarmruleconditions/cpns/config.ts
View file @0a7382f
+++ b/src/views/device/profile/step/cpns/alarmruleconditions/cpns/config.ts
View file @0a7382f
@@ -57,7 +57,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'key',
+    field: 'key1',
     label: '键名',
     colProps: { span: 24 },
     component: 'Input',
@@ -74,7 +74,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isShiDu(Reflect.get(values, 'type')),
   },
   {
-    field: 'key',
+    field: 'key1',
     label: '键名',
     colProps: { span: 24 },
     component: 'Input',
@@ -89,7 +89,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isWenDu(Reflect.get(values, 'type')),
   },
   {
-    field: 'key',
+    field: 'key1',
     label: '键名',
     colProps: { span: 24 },
     component: 'Input',
--- a/src/views/device/profile/step/cpns/alarmruleconditions/cpns/index.vue
View file @0a7382f
+++ b/src/views/device/profile/step/cpns/alarmruleconditions/cpns/index.vue
View file @0a7382f
@@ -22,7 +22,8 @@
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const isUpdate = ref(true);
-      const getValue: any = ref(null);
+      const getValue: any = ref({});
+      const setId: any = ref(1);
       const getTitle = computed(() => (!unref(isUpdate) ? '新增键名筛选器' : '编辑键名筛选器'));
       const [registerForm, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
@@ -31,11 +32,9 @@
       const [register, { closeModal }] = useModalInner(async (data) => {
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
-          console.log('新增键名筛选器');
           resetFields();
         }
         if (unref(isUpdate)) {
-          console.log('编辑键名筛选器');
           setFieldsValue({
             ...data.record,
           });
@@ -44,8 +43,23 @@
       const handleSubmit = () => {
         getValue.value = getFieldsValue();
+        setId.value += 1;
+        getValue.value.id = setId.value;
         emit('success', getValue.value);
         closeModal();
+        // if (!unref(isUpdate)) {
+        //   getValue.value = getFieldsValue();
+        //   console.log(getValue.value);
+        // }
+        // if (unref(isUpdate)) {
+        //   getValue.value = getFieldsValue();
+        //   console.log(getValue.value);
+        // }
+        // setTimeout(() => {
+        //   emit('success', getValue.value);
+        //   closeModal();
+        // }, 20);
+        // // getValue.value = getFieldsValue();
       };
       const handleCancel = () => {
         return;
--- a/src/views/device/profile/step/cpns/alarmruleconditions/index.vue
View file @0a7382f
+++ b/src/views/device/profile/step/cpns/alarmruleconditions/index.vue
View file @0a7382f
@@ -7,7 +7,13 @@
     @ok="handleSubmit"
   >
     <CollapseContainer title="键名筛选器" class="border mb-8">
-      <BasicTable :resizeHeightOffset="200" @register="registerTable" :dataSource="getTableApiData">
+      <BasicTable
+        :showIndexColumn="false"
+        :resizeHeightOffset="200"
+        @register="registerTable"
+        :dataSource="getTableApiData"
+      >
+        >
         <template #toolbar>
           <a-button type="primary" @click="handleAddKey"> 新增键名筛选器 </a-button>
         </template>
@@ -39,6 +45,7 @@
         :columns="columnsView"
         :dataSource="detailData"
         :pagination="false"
+        :showIndexColumn="false"
       />
     </CollapseContainer>
     <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />
@@ -46,10 +53,10 @@
   <KeyValueModal @register="registerModal" @success="handleSuccess" />
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, getCurrentInstance } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema, columns, DescDetailSchema, columnsView } from './config';
+  import { formSchema, keyColumns, DescDetailSchema, columnsView } from './config';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useModal } from '/@/components/Modal';
@@ -67,10 +74,12 @@
     },
     emits: ['success', 'register', 'getAllFieldsRule', 'getLastAllFieldsRule'],
     setup(_, { emit }) {
+      const { proxy } = getCurrentInstance();
       const getTableApiData: any = ref([]);
       const detailData: any = ref([]);
       const receiveData: any = ref(null);
       const lastValues: any = ref(null);
+      const addOrUpdateData: any = ref(null);
       const isUpdate = ref(true);
       const [registerForm, { getFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
@@ -83,10 +92,11 @@
       });
       const [registerTable, { reload }] = useTable({
         title: '键名筛选器',
-        columns,
+        columns: keyColumns,
         bordered: true,
         showIndexColumn: false,
         pagination: false,
+        autoCreateKey: true,
         actionColumn: {
           width: 180,
           title: '操作',
@@ -94,12 +104,11 @@
           slots: { customRender: 'action' },
         },
       });
-
       const handleSubmit = () => {
-        if (unref(isUpdate.value)) {
-          const values = getFieldsValue();
-          getTableApiData.value.push(values);
-          detailData.value.push(values);
+        if (!unref(isUpdate)) {
+          addOrUpdateData.value = getFieldsValue();
+          getTableApiData.value.push(addOrUpdateData.value);
+          detailData.value.push(addOrUpdateData.value);
         }
         lastValues.value = getFieldsValue();
         emit('getAllFieldsRule', receiveData.value, lastValues.value);
@@ -125,15 +134,48 @@
       };
       const handleDelete = (record: Recordable) => {
         console.log(record);
-        getTableApiData.value.splice(0, 1);
-        detailData.value.splice(0, 1);
+        console.log(getTableApiData.value);
+        // const getIndex = getTableApiData.value.indexOf((i) => {
+        //   return i.key;
+        // });
+        const newFilterArray = getTableApiData.value.filter((item) => item.id !== record.id);
+        getTableApiData.value = newFilterArray;
+        // getTableApiData.value.splice(getIndex, 1);
+
+        // console.log(getTableApiData.value);
+        // delete getTableApiData.value[findByKeyDel];
+        // getTableApiData.value.slice(0, getTableApiData.value.length - 1);
+        // detailData.value.slice(0, detailData.value.length - 1);
+        // if (record) {
+        //   getTableApiData.value = getTableApiData.value.length - 1;
+        //   detailData.value = detailData.value.length - 1;
+        // }
         reload();
       };
       const handleSuccess = (v) => {
         receiveData.value = v;
         setTimeout(() => {
           doFunc();
-        }, 10);
+        }, 20);
+        // if (!unref(isUpdate)) {
+        //   console.log(v);
+        //   // receiveData.value = v;
+        //   setTimeout(() => {
+        //     // doFunc();
+        //     getTableApiData.value.push(v);
+        //     detailData.value.push(v);
+        //   }, 10);
+        // }
+        // if (unref(isUpdate)) {
+        //   console.log(v);
+        //   // receiveData.value = v;
+        //   setTimeout(() => {
+        //     // doFunc();
+        //     getTableApiData.value.push(v);
+        //     updateTableDataRecord(v.key, v);
+        //     detailData.value.push(v);
+        //   }, 10);
+        // }
       };
       const doFunc = () => {
         getTableApiData.value.push(receiveData.value);
--- a/src/views/ruleengine/scenelinkage/addForm/1.json deleted 100644 → 0
View file @a3c5f2f
+++ b/src/views/ruleengine/scenelinkage/addForm/1.json deleted 100644 → 0
View file @a3c5f2f
-{
-  "name": "设备测试3",
-  "defaultRuleChainId": "354c7210-5d97-11ec-8ac9-f38ed935ea2a",
-  "description": "设备测试3",
-  "transportType": "CoAP",
-  "profileData": {
-    "alarms": [
-      {
-        "alarmType": "设备测试3",
-        "propagate": true,
-        "propagateRelationTypes": [
-          "设备测试3"
-        ],
-        "createRules": {
-          "MAJOR": {
-            "alarmDetails": "设备测试3",
-            "schedule": {
-              "type": "ANY_TIME"
-            },
-            "condition": {
-              "condition": [
-                {
-                  "key": {
-                    "type": "TIME_SERIES",
-                    "key": "CO2"
-                  },
-                  "valueType": "COMPLEX",
-                  "predicate": {
-                    "operation": "LESS_OR_EQUAL",
-                    "value": {
-                      "defaultValue": 2
-                    },
-                    "type": "COMPLEX"
-                  }
-                }
-              ],
-              "spec": {
-                "type": "DURATION"
-              }
-            }
-          }
-        }
-      }
-    ]
-  },
-  "alarmProfile": {
-    "alarmContactId": "a3004ddd-db8f-487c-aea0-4f6f3efc59a9",
-    "messageMode": "PHONE_MESSAGE"
-  }
-}