1

src/views/lanUser/list.vue

@@ -157,6 +157,9 @@
           ellipsis: true,
           slots: { customRender: 'createTime' },
           width: 130,
+          customRender: ({ record }) => {
+            return record.createTime || '-';
+          }
         },
         {
           title: '状态',
@@ -164,6 +167,7 @@
           // ifShow:getCheckPerm('sysuser-enable'),
           width: 80,
           customRender: ({ record }) => {
+            if (!record.status) return '未注册';
             return record.status == 1 ? '启用' : '禁用';
             if (!Reflect.has(record, 'status')) {
               record.pendingStatus = false;

src/views/productOperation/cameraScene.vue

@@ -83,7 +83,8 @@
                     tableType != 3 &&
                     (record.userName == userInfo.userName ||
                       userInfo.roleId == 1 ||
-                      userInfo.roleId == 45),
+                      userInfo.roleId == 45 ||
+                      userInfo.roleId == 48),
                   onClick: handleMove.bind(null, record),
                 },
                 {
@@ -93,7 +94,8 @@
                     tableType != 3 &&
                     (record.userName == userInfo.userName ||
                       userInfo.roleId == 1 ||
-                      userInfo.roleId == 45),
+                      userInfo.roleId == 45 ||
+                      userInfo.roleId == 48),
                   disabled: !(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                   //icon: 'carbon:download',
                   onClick: handleDownload.bind(null, record),
@@ -104,7 +106,7 @@
                   ifShow:
                     getTypeCheckPerm('scenes-recalculate') &&
                     tableType != 3 &&
-                    (userInfo.roleId == 1 || userInfo.roleId == 45),
+                    (userInfo.roleId == 1 || userInfo.roleId == 45 || userInfo.roleId == 48),
                   popConfirm: {
                     title: '是否重算？',
                     confirm: handleReset.bind(null, record),
@@ -118,7 +120,8 @@
                     tableType != 3 &&
                     (record.userName == userInfo.userName ||
                       userInfo.roleId == 1 ||
-                      userInfo.roleId == 45),
+                      userInfo.roleId == 45 ||
+                      userInfo.roleId == 48),
                   onClick: handleCopy.bind(null, record),
                 },
                 {

src/views/sys/login/LoginForm.vue

@@ -97,7 +97,7 @@
 
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useMessage } from '/@/hooks/web/useMessage';
-
+  import { useAppStoreWithOut } from '/@/store/modules/app';
   import { useUserStore } from '/@/store/modules/user';
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { useDesign } from '/@/hooks/web/useDesign';
@@ -111,6 +111,7 @@
   const { notification, createErrorModal } = useMessage();
   const { prefixCls } = useDesign('login');
   const userStore = useUserStore();
+  const appStore = useAppStoreWithOut();
 
   const { setLoginState, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
@@ -153,6 +154,10 @@
         mode: 'none', //不要默认的错误提示
       });
       if (userInfo) {
+        console.log('userInfo', userInfo)
+        if (userInfo.platformName) {
+          appStore.setTitle(userInfo.platformName);
+        }
         if(rememberMe.value){
           let password:string = window.btoa(unescape(encodeURIComponent(data.password)))
           localStorage.setItem('password',password)