Merge branch 'f-dev' into 'main'

fix：修改teambition上的问题

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

@@ -111,7 +111,8 @@ export const getOrganizationAlarmConfig = (params: { organizationId }) => {
  * 获取设备属性列表
  */
 export const getAttribute = (orgId, deviceIds) => {
+  const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
   return defHttp.get({
-    url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + '?' + deviceIds,
+    url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
   });
 };

@@ -58,7 +58,7 @@ export const phoneRule: Rule[] = [
 export const emailRule: Rule[] = [
   {
     validator: (_, value: string) => {
-      const reg = /^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/;
+      const reg = /^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$/;
       if (!value) {
         return Promise.resolve();
       } else if (!reg.test(value)) {

@@ -7,6 +7,7 @@
       search
       :clickRowToExpand="false"
       :treeData="treeData"
+      :expandedKeys="treeExpandData"
       :replaceFields="{ key: 'id', title: 'name' }"
       :selectedKeys="selectedKeys"
       @select="handleSelect"
@@ -20,17 +21,25 @@
   const emit = defineEmits(['select']);
   const treeData = ref<TreeItem[]>([]);
   const selectedKeys = ref<string[]>();
-  
+  const treeExpandData = ref([]);
+  //获取所有父级id
+  function findForAllId(data = [], arr = []) {
+    for (const item of data) {
+      arr.push(item.id);
+    }
+    return arr;
+  }
   function handleSelect(keys) {
     emit('select', keys[0]);
   }
-
   function resetOrganization() {
     selectedKeys.value = [];
   }
-
   onMounted(async () => {
     treeData.value = (await getOrganizationList()) as unknown as TreeItem[];
+    const getAllIds = findForAllId(treeData.value as any, []);
+    //设置要展开的id
+    treeExpandData.value = getAllIds;
   });
   defineExpose({
     resetOrganization,

@@ -204,12 +204,12 @@
       const helpDoc = ref([
         {
           title: '如何接入设备?',
-          href: 'https://docs.thingskit.com/',
+          href: 'https://docs.thingskit.com/thingskit-link/operation-guide/device-manage.html#%E8%AE%BE%E5%A4%87%E5%88%97%E8%A1%A8',
           target: '_blank ',
         },
         {
           title: '什么是设备配置?',
-          href: 'https://docs.thingskit.com/',
+          href: 'https://docs.thingskit.com/thingskit-link/operation-guide/device-manage.html#%E8%AE%BE%E5%A4%87%E9%85%8D%E7%BD%AE',
           target: '_blank ',
         },
         {

@@ -270,11 +270,11 @@
         try {
           // 该设备是否正在被场景联动使用中？
           const isEnabled = await checkDeviceOccupied(record.id);
-          if (!isEnabled) {
+          if (!isEnabled.data) {
+            createMessage.warn(`${isEnabled.message}`);
+          } else {
             await cancelDispatchCustomer(record);
             handleReload();
-          } else {
-            createMessage.warn('该设备正在使用中~');
           }
         } catch {}
       }

@@ -18,7 +18,9 @@
             @click="handleDeleteOrBatchDelete(null)"
             :disabled="singleStopDeleteStatus || hasBatchDelete"
           >
-            批量删除
+            <span :style="{ color: singleStopDeleteStatus || hasBatchDelete ? 'grey' : 'white' }"
+              >批量删除</span
+            >
           </a-button>
         </Authority>
         <a-button
@@ -128,6 +130,7 @@
       let isJudgeSelectRowsArr: any = ref([]);
       const handleSuccess = () => {
         reload();
+        resetSelectedRowKeys();
       };
       const [registerModal, { openModal }] = useModal();
       const [
@@ -155,16 +158,14 @@
           fixed: 'right',
         },
       });
-      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-        deleteConvertApi,
-        handleSuccess,
-        setProps
-      );
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
+        useBatchDelete(deleteConvertApi, handleSuccess, setProps);
       selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
-        // Demo:status为1的选择框禁用
+        //status为1的选择框禁用
         if (record.status === 1) {
           return { disabled: true };
         } else {
+          disabledStatus2.value = true;
           singleStopDeleteStatus.value = false;
           return { disabled: false };
         }
@@ -204,8 +205,13 @@
           if (res !== '') {
             createMessage.success('流转配置启用成功');
             setLoading(false);
-            reload();
+            handleSuccess();
+            singleStopDeleteStatus.value = true;
             disabledStatus1.value = true;
+            disabledStatus2.value = true;
+            disabledStatus3.value = true;
+            resetSelectedRowKeys();
+            clearSelectedRowKeys();
           } else {
             createMessage.error('流转配置启用失败');
           }
@@ -228,7 +234,13 @@
           if (res !== '') {
             createMessage.success('流转配置禁用成功');
             setLoading(false);
-            reload();
+            handleSuccess();
+            singleStopDeleteStatus.value = true;
+            disabledStatus1.value = true;
+            disabledStatus2.value = true;
+            disabledStatus3.value = true;
+            resetSelectedRowKeys();
+            clearSelectedRowKeys();
           } else {
             createMessage.error('流转配置禁用失败');
           }
@@ -287,7 +299,7 @@
           if (res !== '') {
             createMessage.success('流转配置多项禁用成功');
             setLoading(false);
-            reload();
+            handleSuccess();
           } else {
             createMessage.error('流转配置多项禁用失败');
           }
@@ -314,7 +326,7 @@
           if (res !== '') {
             createMessage.success('流转配置多项启用成功');
             setLoading(false);
-            reload();
+            handleSuccess();
             disabledStatus1.value = true;
             singleStopDeleteStatus.value = true;
           } else {

@@ -169,7 +169,6 @@
         organizationId,
         triggers.map((m) => m.entityId).join(',')
       );
-
       // 生成回显时对应得组件数量
       triggerData.value = [...new Array(triggers.length).keys()];
       conditionData.value = [...new Array(doConditions.length).keys()];
@@ -194,6 +193,8 @@
         };
       });
       deviceList.value = editEntryIdData.value;
+      deviceExcludeDoAction.value = editEntryIdExcludeDoActionData.value;
+
       //回显属性列表
       editAttrIdData = attrList;
       nextTick(() => {
@@ -538,7 +539,6 @@
   function setFields(linkAge, isOrganizationChange = false) {
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
-      console.log(item);
       if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
         item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
       } else {

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
+import { findDictItemByCode } from '/@/api/system/dict';
 
+//格式化资源类型和操作类型
+let formatText;
+let actionTypeText;
+async function formatTextFunc() {
+  formatText = await findDictItemByCode({ dictCode: 'operate_log' });
+  actionTypeText = await findDictItemByCode({ dictCode: 'exception_log' });
+}
+formatTextFunc();
 // 表格数据
 export const columns: BasicColumn[] = [
   {
@@ -17,6 +26,14 @@ export const columns: BasicColumn[] = [
     title: '资源类型',
     dataIndex: 'entityType',
     width: 180,
+    format: (_, record) => {
+      const text = formatText.find((f) => {
+        if (f.itemValue == record.entityType) {
+          return f.itemText;
+        }
+      });
+      return text?.itemText;
+    },
   },
   {
     title: '资源名称',
@@ -32,18 +49,29 @@ export const columns: BasicColumn[] = [
     title: '操作类型',
     dataIndex: 'actionType',
     width: 180,
+    format: (_, record) => {
+      const text = actionTypeText.find((f) => {
+        if (f.itemValue == record.actionType) {
+          return f.itemText;
+        }
+      });
+      return text?.itemText;
+    },
   },
   {
     title: '操作状态',
     dataIndex: 'actionStatus',
     width: 180,
+    format: (_, record) => {
+      return record.actionStatus == 'SUCCESS' ? '成功' : '失败';
+    },
   },
   {
     title: '操作时间',
     dataIndex: 'createdTime',
-    width: 80,
+    width: 180,
     format: (_, record) => {
-      return moment(record.createdTime).format('YYYY-MM-DD');
+      return moment(record.createdTime).format('YYYY-MM-DD-HH-MM-ss');
     },
   },
 ];

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
+import { findDictItemByCode } from '/@/api/system/dict';
 
+//格式化资源类型和操作类型
+let formatText;
+let actionTypeText;
+
+async function formatTextFunc() {
+  formatText = await findDictItemByCode({ dictCode: 'operate_log' });
+  actionTypeText = await findDictItemByCode({ dictCode: 'exception_log' });
+}
+formatTextFunc();
 // 表格数据
 export const columns: BasicColumn[] = [
   {
@@ -17,6 +27,14 @@ export const columns: BasicColumn[] = [
     title: '资源类型',
     dataIndex: 'entityType',
     width: 180,
+    format: (_, record) => {
+      const text = formatText.find((f) => {
+        if (f.itemValue == record.entityType) {
+          return f.itemText;
+        }
+      });
+      return text?.itemText;
+    },
   },
   {
     title: '资源名称',
@@ -32,18 +50,29 @@ export const columns: BasicColumn[] = [
     title: '操作类型',
     dataIndex: 'actionType',
     width: 180,
+    format: (_, record) => {
+      const text = actionTypeText.find((f) => {
+        if (f.itemValue == record.actionType) {
+          return f.itemText;
+        }
+      });
+      return text?.itemText;
+    },
   },
   {
     title: '操作状态',
     dataIndex: 'actionStatus',
     width: 180,
+    format: (_, record) => {
+      return record.actionStatus == 'SUCCESS' ? '成功' : '失败';
+    },
   },
   {
     title: '操作时间',
     dataIndex: 'createdTime',
-    width: 80,
+    width: 180,
     format: (_, record) => {
-      return moment(record.createdTime).format('YYYY-MM-DD');
+      return moment(record.createdTime).format('YYYY-MM-DD-HH-MM-ss');
     },
   },
 ];
@@ -53,30 +82,28 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'entityType',
     label: '资源类型',
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
-      options: [
-        { label: 'DEVICE', value: 'DEVICE' },
-        { label: 'DEVICE_PROFILE', value: 'DEVICE_PROFILE' },
-        { label: 'RPC', value: 'RPC' },
-        { label: 'TENANT', value: 'TENANT' },
-        { label: 'TENANT_PROFILE', value: 'TENANT_PROFILE' },
-      ],
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'operate_log',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
     colProps: { span: 6 },
   },
   {
     field: 'actionType',
     label: '操作类型',
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
-      options: [
-        { label: 'ALL', value: '' },
-        { label: 'ADDED', value: 'ADDED' },
-        { label: 'DELETED', value: 'DELETED' },
-        { label: 'RPC_CALL', value: 'RPC_CALL' },
-        { label: 'UPDATED', value: 'UPDATED' },
-      ],
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'exception_log',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
     colProps: { span: 6 },
   },

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
+import { findDictItemByCode } from '/@/api/system/dict';
 
 // 表格数据
 export const columns: BasicColumn[] = [
@@ -14,16 +15,6 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '资源类型',
-    dataIndex: 'entityType',
-    width: 180,
-  },
-  {
-    title: '资源名称',
-    dataIndex: 'entityName',
-    width: 180,
-  },
-  {
     title: '操作人员',
     dataIndex: 'userName',
     width: 180,
@@ -32,18 +23,24 @@ export const columns: BasicColumn[] = [
     title: '操作类型',
     dataIndex: 'actionType',
     width: 180,
+    format: (_, record) => {
+      return record.actionType == 'LOGIN' ? '登录' : '登出';
+    },
   },
   {
     title: '操作状态',
     dataIndex: 'actionStatus',
     width: 180,
+    format: (_, record) => {
+      return record.actionStatus == 'SUCCESS' ? '成功' : '失败';
+    },
   },
   {
     title: '操作时间',
     dataIndex: 'createdTime',
-    width: 80,
+    width: 180,
     format: (_, record) => {
-      return moment(record.createdTime).format('YYYY-MM-DD');
+      return moment(record.createdTime).format('YYYY-MM-DD-HH-MM-ss');
     },
   },
 ];
@@ -53,12 +50,14 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'actionType',
     label: '操作类型',
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
-      options: [
-        { label: 'LOGIN', value: 'LOGIN' },
-        { label: 'LOGOUT', value: 'LOGOUT' },
-      ],
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'user_log',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
     colProps: { span: 6 },
   },