Merge branch 'main' into ft-dev

@@ -2,7 +2,7 @@
 VITE_PORT = 8083
 
 # spa-title
-VITE_GLOB_APP_TITLE = Yunteng IOT
+VITE_GLOB_APP_TITLE = Things Kit
 
 # spa shortname
 # VITE_GLOB_APP_SHORT_NAME = Yunteng IOT

@@ -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);
 

@@ -44,7 +44,7 @@ export const useUserStore = defineStore({
   id: 'app-user',
   state: (): UserState => ({
     //平台信息
-    platInfo: storage.get('platInfo') || null,
+    platInfo: storage.get('platformInfo') || null,
     enterPriseInfo: storage.get('enterPriseInfo') || null,
     // user info
     userInfo: null,

@@ -3,7 +3,7 @@
     <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4" style="color: #666">
       <div class="flex" style="height: 100px">
         <div class="mr-4"
-          ><img src="/src/assets/svg/device-num.svg" style="width: 5.625rem; height: 5.625rem"
+          ><img src="/src/assets/images/device-count.png" style="width: 5.625rem; height: 5.625rem"
         /></div>
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
@@ -17,31 +17,36 @@
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
           <div> 设备数(个) </div>
+          <div class="flex" style="align-items: center">
+            <div class="mr-2"
+              >在线
+              <span style="color: #41b883">{{ growCardList?.deviceInfo?.onLine ?? 0 }}</span></div
+            >
+            <div class="mr-2">
+              离线
+              <span style="color: #f5222d">{{ growCardList?.deviceInfo?.offLine ?? 0 }} </span></div
+            >
+
+            <div>
+              未激活
+              <span style="color: #fa8c16">{{ growCardList?.deviceInfo?.inActive ?? 0 }}</span>
+            </div>
+          </div>
         </div>
       </div>
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
-        <div class="flex" style="align-items: center">
-          <span class="mr-2">在线{{ growCardList?.deviceInfo?.onLine }}</span>
-
-          <span class="mr-2"> 离线{{ growCardList?.deviceInfo?.offLine }} </span>
-
-          <span> 未激活{{ growCardList?.deviceInfo?.inActive }} </span>
-        </div></div
-      >
+        今日新增 {{ toThousands(growCardList?.deviceInfo?.todayAdd) }}
+      </div>
     </Card>
     <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4" style="color: #666">
       <div class="flex" style="height: 100px">
         <div class="mr-4">
           <img
             v-if="!isAdmin(role)"
-            src="/src/assets/svg/alarm-num.svg"
-            style="width: 5.625rem; height: 5.625rem"
-          />
-          <img
-            v-else
-            src="/src/assets/svg/tenant-num.svg"
+            src="/src/assets/images/alarm-count.png"
             style="width: 5.625rem; height: 5.625rem"
           />
+          <img v-else src="/src/assets/images/zh.png" style="width: 5.625rem; height: 5.625rem" />
         </div>
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
@@ -61,7 +66,7 @@
             </div>
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
-          <div> {{ !isAdmin(role) ? `告警数（条）` : '租户总量(个)' }}</div>
+          <div> {{ !isAdmin(role) ? `告警数(条)` : '租户总量(个)' }}</div>
         </div>
       </div>
       <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
@@ -76,13 +81,9 @@
         <div class="mr-4"
           ><img
             v-if="!isAdmin(role)"
-            src="/src/assets/svg/msg-num.svg"
-            style="width: 5.625rem; height: 5.625rem"
-          /><img
-            v-else
-            src="/src/assets/svg/custom-num.svg"
+            src="/src/assets/images/msg-count.png"
             style="width: 5.625rem; height: 5.625rem"
-          />
+          /><img v-else src="/src/assets/images/kf.png" style="width: 5.625rem; height: 5.625rem" />
         </div>
         <div v-if="!isAdmin(role)" style="display: flex; align-items: center">
           <div>
@@ -94,7 +95,7 @@
                 />
                 <CountTo v-else :end-val="0" />
               </div>
-              消息量（条）
+              消息量(条)
             </div>
             <div>
               <span class="mr-2">数据点</span>

@@ -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>
@@ -52,9 +48,9 @@
         </template>
         <CardMeta>
           <template #description>
-            <p>联系人: {{ getContacts }}</p>
-            <p>联系电话: {{ getTel }}</p>
-            <p>联系地址: {{ getAddress }} </p>
+            <p v-if="getContacts">联系人: {{ getContacts }}</p>
+            <p v-if="getTel">联系电话: {{ getTel }}</p>
+            <p v-if="getAddress">联系地址: {{ getAddress }} </p>
           </template>
         </CardMeta>
       </Card>

@@ -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>
@@ -86,23 +86,28 @@
 
   const { setLoginState, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
+  const storage = createLocalStorage();
 
   const formRef = ref();
   const loading = ref(false);
   const rememberMe = ref(false);
-
+  const userInfo = storage.get('userInfo');
   const formData = reactive({
-    account: '',
-    password: '',
+    account: userInfo?.account ?? '',
+    password: userInfo?.password ?? '',
   });
 
   const { validForm } = useFormValid(formRef);
 
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN);
-  const storage = createLocalStorage();
   async function handleLogin() {
     const data = await validForm();
     if (!data) return;
+    if (unref(rememberMe)) {
+      storage.set('userInfo', formData);
+    } else {
+      storage.set('userInfo', null);
+    }
     try {
       loading.value = true;
       const userInfo = await userStore.login({

@@ -4,6 +4,7 @@
       title="第一次使用请修改当前用户密码，待修改完成后退出登录，才能使用本系统!"
       content="修改成功后会自动退出当前登录！"
       class="p-4"
+      :contentStyle="{ margin: '16px 0 ' }"
     >
       <div class="py-8 bg-white flex flex-col justify-center items-center">
         <BasicForm @register="register" />

@@ -224,7 +224,7 @@
         // 保存store
         userStore.setPlatInfo(newFieldValue);
         // 保存本地缓存
-        storage.set('platInfo', newFieldValue);
+        storage.set('platformInfo', newFieldValue);
       }
 
       onMounted(async () => {

@@ -301,7 +301,6 @@
           setFieldsValue({ nameCountry: codeCountry });
         }
         setFieldsValue(res);
-        console.log(res);
         qrcodePic.value = res.qrCode;
       });
 

@@ -26,7 +26,7 @@
   </BasicDrawer>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, watch } from 'vue';
+  import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -54,9 +54,6 @@
         schemas: formSchema,
         showActionButtonGroup: false,
       });
-      watch(roleMenus, (newValue) => {
-        console.log(newValue);
-      });
 
       // 递归函数，将RouteItem里面的字段换名称
       function processChildren(items: RouteItem[]) {
@@ -79,7 +76,7 @@
         arr.splice(index, 1);
         return arr;
       }
-
+      const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
         roleId.value = '';
@@ -95,6 +92,7 @@
         if (unref(isUpdate)) {
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+          originMenus.value = [...roleMenus.value];
           for (let m of treeData.value) {
             for (let m1 of roleMenus.value) {
               // 利用continue特性优化一下性能
@@ -103,6 +101,7 @@
             }
           }
           treeRef.value.setCheckedKeys(roleMenus.value);
+          console.log(originMenus.value);
           roleId.value = data.record.id;
           setFieldsValue(data.record);
         }
@@ -119,7 +118,7 @@
             name: values.name,
             remark: values.remark,
             status: values.status,
-            menu: allCheckedKeys.value.length ? allCheckedKeys.value : roleMenus.value,
+            menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
           };
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
             closeDrawer();

@@ -78,7 +78,7 @@
         arr.splice(index, 1);
         return arr;
       }
-
+      const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
         roleId.value = '';
@@ -94,6 +94,7 @@
         if (unref(isUpdate)) {
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+          originMenus.value = [...roleMenus.value];
           for (let m of treeData.value) {
             for (let m1 of roleMenus.value) {
               // 利用continue特性优化一下性能
@@ -118,7 +119,7 @@
             remark: values.remark,
             status: values.status,
             roleType: RoleEnum.TENANT_ADMIN,
-            menu: allCheckedKeys.value.length ? allCheckedKeys.value : roleMenus.value,
+            menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
           };
           await saveOrUpdateRoleInfoWithMenu(req);
           closeDrawer();