Merge branch 'sqy_dev' into 'main'

'fix:修复通知不能正常跳转,和通知人显示不正确,feat:新增记住密码功能,隐藏二维码'

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

@@ -69,6 +69,7 @@ export default {
     backSignIn: 'Back sign in',
     mobileSignInFormTitle: 'Mobile sign in',
     qrSignInFormTitle: 'Qr code sign in',
+    userNameInFormTitle: 'userName sign in',
     signInFormTitle: 'Sign in',
     signUpFormTitle: 'Sign up',
     forgetFormTitle: 'Reset password',

@@ -65,7 +65,7 @@ export default {
     qrSignInFormTitle: '二维码登录',
     signUpFormTitle: '注册',
     forgetFormTitle: '重置密码',
-
+    userNameInFormTitle: '账号登录',
     signInTitle: '物联网平台',
     signInDesc: '输入您的个人详细信息开始使用！',
     policy: '我同意xxx隐私政策',

 import '/@/design/index.less';
-
 // Register windi
 import 'virtual:windi.css';
 // Register icon sprite
@@ -19,10 +18,6 @@ if (import.meta.env.DEV) {
 }
 async function bootstrap() {
   const app = createApp(App);
-
-  // app.use(VueBaidu, {
-  //   ak: '7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa',
-  // });
   // Configure store
   setupStore(app);
 

@@ -15,7 +15,7 @@
       >
         <List item-layout="horizontal" :dataSource="dataSource">
           <template #renderItem="{ item }">
-            <ListItem>
+            <ListItem @click="go('/notice/myNotices')" class="cursor-pointer">
               <ListItemMeta>
                 <template #avatar>
                   <Avatar
@@ -24,11 +24,7 @@
                   />
                 </template>
                 <template #description>
-                  <span
-                    class="cursor-pointer noticeTitle"
-                    @click="go('/stationnotification/mynotification')"
-                    >{{ item.sysNotice.title }}
-                  </span>
+                  <span class="cursor-pointer noticeTitle">{{ item.sysNotice.title }} </span>
                 </template>
                 <template #title>
                   <span>{{ item.sysNotice.senderName }}</span>

@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
       const enable = status === '已发布' ? '已发布' : status === '草稿' ? '草稿' : '其他';
       const color = enable === '已发布' ? 'green' : enable === '草稿' ? 'yellow' : 'red';
       const text = enable === '已发布' ? '已发布' : enable === '草稿' ? '草稿' : '其他';
-      return h(Tag, { color: color }, () => text);
+      return h(Tag, { color }, () => text);
     },
   },
 ];
@@ -172,7 +172,7 @@ export const searchFormSchema: FormSchema[] = [
 export const detailColumns: BasicColumn[] = [
   {
     title: '接收者',
-    dataIndex: 'user.realName',
+    dataIndex: 'receiverName',
     width: 200,
   },
   {

@@ -38,7 +38,6 @@
             <ForgetPasswordForm />
             <RegisterForm />
             <MobileForm />
-            <QrCodeForm />
           </div>
         </div>
       </div>
@@ -46,14 +45,13 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed, ref } from 'vue';
+  import { computed } from 'vue';
   import { AppLogo } from '/@/components/Application';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import LoginForm from './LoginForm.vue';
   import ForgetPasswordForm from './ForgetPasswordForm.vue';
   import RegisterForm from './RegisterForm.vue';
   import MobileForm from './MobileForm.vue';
-  import QrCodeForm from './QrCodeForm.vue';
   import { useGlobSetting } from '/@/hooks/setting';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';

@@ -49,13 +49,13 @@
     </FormItem>
     <ARow class="enter-x flex justify-between">
       <ACol :md="11" :xs="24">
-        <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
-          {{ t('sys.login.mobileSignInFormTitle') }}
+        <Button block @click="setLoginState(LoginStateEnum.LOGIN)">
+          {{ t('sys.login.userNameInFormTitle') }}
         </Button>
       </ACol>
       <ACol :md="11" :xs="24">
-        <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
-          {{ t('sys.login.qrSignInFormTitle') }}
+        <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
+          {{ t('sys.login.mobileSignInFormTitle') }}
         </Button>
       </ACol>
     </ARow>
@@ -90,10 +90,10 @@
   const formRef = ref();
   const loading = ref(false);
   const rememberMe = ref(false);
-
+  const userInfo = JSON.parse(localStorage.getItem('userInfo'));
   const formData = reactive({
-    account: '',
-    password: '',
+    account: userInfo?.account ?? '',
+    password: userInfo?.password ?? '',
   });
 
   const { validForm } = useFormValid(formRef);
@@ -103,6 +103,11 @@
   async function handleLogin() {
     const data = await validForm();
     if (!data) return;
+    if (unref(rememberMe)) {
+      localStorage.setItem('userInfo', JSON.stringify(formData));
+    } else {
+      localStorage.setItem('userInfo', null);
+    }
     try {
       loading.value = true;
       const userInfo = await userStore.login({