Merge branch 'f-dev' into 'main'

fix：修改Teambition上的任务 See merge request huang/yun-teng-iot-front!247

Merge branch 'f-dev' into 'main'
fix：修改Teambition上的任务 See merge request huang/yun-teng-iot-front!247
xp.Huang
2 parents 2c4801fe c931c22b
Showing 8 changed files with 114 additions and 131 deletions
src/views/alarm/log/config/detail.config.ts
src/views/camera/manage/CameraDrawer.vue
src/views/device/list/config/detail.config.ts
src/views/device/list/cpns/tabs/CommandIssuance.vue
src/views/device/list/index.vue
src/views/rule/dataFlow/config.ts
src/views/rule/dataFlow/index.vue
src/views/rule/linkedge/config/formatData.ts
--- a/src/views/alarm/log/config/detail.config.ts
View file @c79a9d7
+++ b/src/views/alarm/log/config/detail.config.ts
View file @c79a9d7
@@ -31,7 +31,7 @@ export const alarmSearchSchemas: FormSchema[] = [
   },
   {
     field: 'alarmType',
-    label: '告警类型',
+    label: '告警场景',
     component: 'Input',
     colProps: { span: 6 },
     componentProps: {
@@ -74,7 +74,7 @@ export const alarmColumns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '类型',
+    title: '告警场景',
     dataIndex: 'type',
     width: 160,
   },
@@ -138,7 +138,7 @@ export const alarmSchemasForm: FormSchema[] = [
   },
   {
     field: 'type',
-    label: '告警类型',
+    label: '告警场景',
     component: 'Input',
     componentProps: {
       disabled: true,
--- a/src/views/camera/manage/CameraDrawer.vue
View file @c79a9d7
+++ b/src/views/camera/manage/CameraDrawer.vue
View file @c79a9d7
@@ -104,6 +104,13 @@
         try {
           const { createMessage } = useMessage();
           const values = await validate();
+          if (values.name == undefined || values.name == '')
+            return createMessage.error('请填写视频名字');
+          if (values.sn == undefined || values.sn == '')
+            return createMessage.error('请填写摄像头编号');
+          if (values.videoUrl == undefined || values.videoUrl == '')
+            return createMessage.error('请填写视频流');
+          if (!values) return;
           if (tenantLogo.value !== '') {
             values.avatar = tenantLogo.value;
           }
--- a/src/views/device/list/config/detail.config.ts
View file @c79a9d7
+++ b/src/views/device/list/config/detail.config.ts
View file @c79a9d7
@@ -96,7 +96,7 @@ export const alarmSearchSchemas: FormSchema[] = [
   },
   {
     field: 'alarmType',
-    label: '告警类型',
+    label: '告警场景',
     component: 'Input',
     colProps: { span: 6 },
     componentProps: {
@@ -125,7 +125,7 @@ export const alarmColumns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '类型',
+    title: '告警场景',
     dataIndex: 'type',
     width: 160,
   },
@@ -189,7 +189,7 @@ export const alarmSchemasForm: FormSchema[] = [
   },
   {
     field: 'type',
-    label: '告警类型',
+    label: '告警场景',
     component: 'Input',
     componentProps: {
       disabled: true,
--- a/src/views/device/list/cpns/tabs/CommandIssuance.vue
View file @c79a9d7
+++ b/src/views/device/list/cpns/tabs/CommandIssuance.vue
View file @c79a9d7
@@ -72,37 +72,47 @@
       const handleCancel = () => {
         resetFields();
+        unref(jsonInstance).set({});
       };
       const handleOk = async () => {
-        disable.value = true;
-        // 验证
-        const valid = await validate();
-        if (!valid) return;
-        // 收集表单数据
-        const field = getFieldsValue();
-        jsonData.value = unref(jsonInstance).get();
-        jsonData.value.persistent = true;
-        jsonData.value.additionalInfo = {
-          cmdType: 'API',
-        };
-        commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
-          .then((res) => {
-            if (!res) return;
-            createMessage.success('命令下发成功');
-            disable.value = true;
-            // 请求
-            handleCancel();
-          })
-          .catch((e) => {
-            if (e?.message) {
-              createMessage.error(e?.message);
-            }
-          })
-          .finally(() => {
-            setTimeout(() => {
-              disable.value = false;
-            }, 300);
-          });
+        try {
+          disable.value = true;
+          // 验证
+          const valid = await validate();
+          if (!valid) return;
+          // 收集表单数据
+          const field = getFieldsValue();
+          const getJson = unref(jsonInstance).get();
+          jsonData.value.persistent = true;
+          jsonData.value.additionalInfo = {
+            cmdType: 'API',
+          };
+          jsonData.value.method = 'setGpio';
+          jsonData.value.params = { ...getJson };
+          commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
+            .then((res) => {
+              if (!res) return;
+              createMessage.success('命令下发成功');
+              disable.value = true;
+              // 请求
+              handleCancel();
+            })
+            .catch((e) => {
+              if (e?.message) {
+                createMessage.error(e?.message);
+              }
+              handleCancel();
+            })
+            .finally(() => {
+              setTimeout(() => {
+                disable.value = false;
+              }, 300);
+            });
+        } catch (e) {
+          //这里捕获json插件的错误
+          createMessage.error('请填写正确的json格式数据');
+          disable.value = false;
+        }
       };
       return {
         registerForm,
--- a/src/views/device/list/index.vue
View file @c79a9d7
+++ b/src/views/device/list/index.vue
View file @c79a9d7
@@ -51,7 +51,9 @@
         </template>
         <template #name="{ record }">
           <div>
-            {{ record.name }}
+            <Tooltip :title="record.name" placement="topRight">
+              {{ record.name }}
+            </Tooltip>
           </div>
           <Tooltip title="设备SN码" placement="topRight">
             <a-button type="link" @click="copySN(record.sn)" style="padding: 0">
@@ -151,7 +153,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, unref, nextTick, ref } from 'vue';
+  import { defineComponent, reactive, unref, nextTick } from 'vue';
   import { DeviceState, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { columns, searchFormSchema } from './config/device.data';
--- a/src/views/rule/dataFlow/config.ts
View file @c79a9d7
+++ b/src/views/rule/dataFlow/config.ts
View file @c79a9d7
@@ -55,13 +55,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'status',
     width: 120,
-    customRender: ({ record }) => {
-      const status = record.status;
-      const enable = ~~status === 1;
-      const color = enable ? '#2aae67' : '#eb846f';
-      const text = enable ? '启用' : '禁用';
-      return h(Tag, { color: color }, () => text);
-    },
+    slots: { customRender: 'status' },
   },
   {
     title: '描述',
--- a/src/views/rule/dataFlow/index.vue
View file @c79a9d7
+++ b/src/views/rule/dataFlow/index.vue
View file @c79a9d7
@@ -64,32 +64,19 @@
                 return record.status == 0;
               },
             },
-            {
-              label: '启用',
-              icon: 'ant-design:check-circle-outlined',
-              color: 'success',
-              popConfirm: {
-                title: '是否启用？',
-                confirm: handleEnableOrDisable.bind(null, record),
-              },
-              ifShow: (_action) => {
-                return record.status == 0;
-              },
-            },
-            {
-              label: '禁用',
-              icon: 'ant-design:close-circle-outlined',
-              popConfirm: {
-                title: '是否禁用？',
-                confirm: handleDisable.bind(null, record),
-              },
-              ifShow: (_action) => {
-                return record.status == 1;
-              },
-            },
           ]"
         />
       </template>
+      <template #status="{ record }">
+        <Switch
+          :disabled="disabledSwitch"
+          :checked="record.status === 1"
+          :loading="record.pendingStatus"
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          @change="(checked:boolean)=>statusChange(checked,record)"
+        />
+      </template>
     </BasicTable>
     <div>
       <DataTransferDrawer @register="registerModal" @success="handleSuccess" />
@@ -110,11 +97,13 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { Switch } from 'ant-design-vue';
   export default defineComponent({
     name: 'Index',
-    components: { BasicTable, TableAction, DataTransferDrawer, Authority },
+    components: { BasicTable, TableAction, DataTransferDrawer, Authority, Switch },
     setup() {
+      const disabledSwitch = ref(false);
       const enableObj = reactive({
         convertIds: [],
         status: 0,
@@ -191,64 +180,6 @@
           });
         }, 10);
       };
-
-      const handleEnableOrDisable = async (record: Recordable) => {
-        setLoading(true);
-        enableObj.convertIds.length = 0;
-        try {
-          enableObj.status = record.status;
-          enableObj.convertIds.push(record.id as never);
-          if (enableObj.status == 0) {
-            enableObj.status = 1;
-          }
-          const res = await isEnableOrDisableApi(enableObj as never);
-          if (res !== '') {
-            createMessage.success('流转配置启用成功');
-            setLoading(false);
-            handleSuccess();
-            singleStopDeleteStatus.value = true;
-            disabledStatus1.value = true;
-            disabledStatus2.value = true;
-            disabledStatus3.value = true;
-            resetSelectedRowKeys();
-            clearSelectedRowKeys();
-          } else {
-            createMessage.error('流转配置启用失败');
-          }
-        } catch (e) {
-          return e;
-        } finally {
-          setLoading(false);
-        }
-      };
-      const handleDisable = async (record: Recordable) => {
-        setLoading(true);
-        enableObj.convertIds.length = 0;
-        try {
-          enableObj.status = record.status;
-          enableObj.convertIds.push(record.id as never);
-          if (enableObj.status == 1) {
-            enableObj.status = 0;
-          }
-          const res = await isEnableOrDisableApi(enableObj as never);
-          if (res !== '') {
-            createMessage.success('流转配置禁用成功');
-            setLoading(false);
-            handleSuccess();
-            singleStopDeleteStatus.value = true;
-            disabledStatus1.value = true;
-            disabledStatus2.value = true;
-            disabledStatus3.value = true;
-            resetSelectedRowKeys();
-            clearSelectedRowKeys();
-          } else {
-            createMessage.error('流转配置禁用失败');
-          }
-        } catch (e) {
-        } finally {
-          setLoading(false);
-        }
-      };
       const useSelectionChange = () => {
         selectedRowKeys.value = getSelectRowKeys();
         isJudgeSelectRowsArr.value = getSelectRows();
@@ -310,7 +241,6 @@
           clearSelectedRowKeys();
         }
       };
-
       const handleMutiuteEnable = async () => {
         enableObj.convertIds.length = 0;
         try {
@@ -339,6 +269,38 @@
           clearSelectedRowKeys();
         }
       };
+      const statusChange = async (checked, record) => {
+        try {
+          setProps({
+            loading: true,
+          });
+          disabledSwitch.value = true;
+          enableObj.convertIds.length = 0;
+          resetSelectedRowKeys();
+          clearSelectedRowKeys();
+          const newStatus = checked ? 1 : 0;
+          enableObj.convertIds.push(record.id as never);
+          enableObj.status = newStatus;
+          const res = await isEnableOrDisableApi(enableObj as never);
+          if (res && newStatus) {
+            createMessage.success(`流转配置启用成功`);
+          } else {
+            createMessage.success('流转配置禁用成功');
+          }
+          singleStopDeleteStatus.value = true;
+          disabledStatus1.value = true;
+          disabledStatus2.value = true;
+          disabledStatus3.value = true;
+        } finally {
+          setTimeout(() => {
+            setProps({
+              loading: false,
+            });
+            disabledSwitch.value = false;
+          }, 500);
+          reload();
+        }
+      };
       return {
         disabledStatus1,
@@ -351,13 +313,13 @@
         registerModal,
         handleSuccess,
         handleEdit,
-        handleEnableOrDisable,
         useSelectionChange,
         handleMutiuteDisable,
-        handleDisable,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
         singleStopDeleteStatus,
+        statusChange,
+        disabledSwitch,
       };
     },
   });
--- a/src/views/rule/linkedge/config/formatData.ts
View file @c79a9d7
+++ b/src/views/rule/linkedge/config/formatData.ts
View file @c79a9d7
@@ -86,11 +86,19 @@ export const genActionData = (actionData) => {
         valueType: item.operationType,
         // value: null,
         predicate: {
-          type: item.operationType,
+          type: item.operationType === 'DATE_TIME' ? 'NUMERIC' : item.operationType,
           operation: pred.operation,
           ignoreCase: item.operationType === 'STRING' ? pred.ignoreCase : undefined,
+          // value: {
+          //   defaultValue: pred.value,
+          //   // userValue: null,
+          //   // dynamicValue: null,
+          // },
           value: {
-            defaultValue: pred.value,
+            defaultValue:
+              item.operationType === 'DATE_TIME'
+                ? Number(formatToDateTime(pred.value, 'x'))
+                : pred.value,
             // userValue: null,
             // dynamicValue: null,
           },