Merge branch 'local_dev_ft' into 'main'

fix:上下线记录修改为产品名字，客户进入添加判断

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

@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '设备配置',
+    title: '产品',
     dataIndex: 'deviceProfileName',
     width: 120,
   },
@@ -79,11 +79,11 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'deviceProfileName',
-    label: '设备配置',
+    label: '产品',
     component: 'Input',
     componentProps: {
       maxLength: 255,
-      placeholder: '请输入设备配置',
+      placeholder: '请输入产品',
     },
     dynamicRules: () => {
       return [
@@ -162,7 +162,7 @@ export const formSchema: DescItem[] = [
   },
   {
     field: 'deviceProfileName',
-    label: '设备配置',
+    label: '产品',
   },
   {
     field: 'deviceType',

@@ -50,6 +50,7 @@
                 icon: 'ant-design:login-outlined',
                 tooltip: '以客户用户身份登录',
                 onClick: handleLoginCustomAdmin.bind(null, record),
+                ifShow: !isAdmin(role),
               },
               {
                 label: '用户详情',
@@ -110,6 +111,9 @@
   import { RouteRecordRaw } from 'vue-router';
   import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
   import { PageEnum } from '/@/enums/pageEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { isAdmin } from '/@/enums/roleEnum';
 
   export default defineComponent({
     name: 'AccountManagement',
@@ -124,6 +128,9 @@
       Popconfirm,
     },
     setup() {
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const role: string = userInfo?.roles[0];
+
       const go = useGo();
       const [registerModal, { openModal }] = useModal();
       let searchInfo = reactive<Recordable>({});
@@ -137,7 +144,7 @@
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
-          autoSubmitOnEnter: true,
+          // autoSubmitOnEnter: true,
           resetFunc: resetFn,
         },
         useSearchForm: true,
@@ -148,6 +155,7 @@
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
+          fixed: 'right',
         },
       });
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
@@ -218,6 +226,8 @@
         organizationIdTreeRef,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
+        isAdmin,
+        role,
       };
     },
   });