Merge branch 'f-dev' into 'main'

fix：修改记住我无效问题 See merge request huang/yun-teng-iot-front!322

Merge branch 'f-dev' into 'main'
fix：修改记住我无效问题 See merge request huang/yun-teng-iot-front!322
xp.Huang
2 parents 49687882 c1c9ea5f
Showing 7 changed files with 71 additions and 71 deletions
src/components/Application/src/AppLocalePicker.vue
src/layouts/default/header/components/personal/index.vue
src/layouts/default/header/components/user-dropdown/index.vue
src/views/device/localtion/index.vue
src/views/notice/manager/useDrawer.vue
src/views/sys/login/Login.vue
src/views/sys/login/LoginForm.vue
--- a/src/components/Application/src/AppLocalePicker.vue
View file @3378ef5
+++ b/src/components/Application/src/AppLocalePicker.vue
View file @3378ef5
@@ -12,17 +12,17 @@
     overlayClassName="app-locale-picker-overlay"
   >
     <span class="cursor-pointer flex items-center" :style="{ color: color }">
-      <Icon icon="ion:language" />
-      <span v-if="showText" class="ml-1">{{ getLocaleText }}</span>
+      <!-- <Icon icon="ion:language" /> -->
+      <!-- <span v-if="showText" class="ml-1">{{ getLocaleText }}</span> -->
     </span>
   </Dropdown>
 </template>
 <script lang="ts" setup>
   import type { LocaleType } from '/#/config';
   import type { DropMenu } from '/@/components/Dropdown';
-  import { ref, watchEffect, unref, computed } from 'vue';
+  import { ref, watchEffect, unref } from 'vue';
   import { Dropdown } from '/@/components/Dropdown';
-  import { Icon } from '/@/components/Icon';
+  // import { Icon } from '/@/components/Icon';
   import { useLocale } from '/@/locales/useLocale';
   import { localeList } from '/@/settings/localeSetting';
@@ -45,13 +45,13 @@
   const { changeLocale, getLocale } = useLocale();
-  const getLocaleText = computed(() => {
-    const key = selectedKeys.value[0];
-    if (!key) {
-      return '';
-    }
-    return localeList.find((item) => item.event === key)?.text;
-  });
+  // const getLocaleText = computed(() => {
+  //   const key = selectedKeys.value[0];
+  //   if (!key) {
+  //     return '';
+  //   }
+  //   return localeList.find((item) => item.event === key)?.text;
+  // });
   watchEffect(() => {
     selectedKeys.value = [unref(getLocale)];
--- a/src/layouts/default/header/components/personal/index.vue
View file @3378ef5
+++ b/src/layouts/default/header/components/personal/index.vue
View file @3378ef5
@@ -37,8 +37,8 @@
               >
                 <img
                   style="border-radius: 50%; height: 8.75rem; width: 10rem"
-                  v-if="peresonalPic"
-                  :src="peresonalPic"
+                  v-if="peresonalPic || headerImg"
+                  :src="peresonalPic || headerImg"
                   alt="avatar"
                 />
                 <div v-else>
@@ -93,6 +93,7 @@
   import { useUserStore } from '/@/store/modules/user';
   import type { FileItem } from '/@/components/Upload/src/typing';
   import { LoadingOutlined } from '@ant-design/icons-vue';
+  import headerImg from '/@/assets/images/logo.png';
   const schema: DescItem[] = [
     {
@@ -247,7 +248,8 @@
         registerModal,
         registerForm,
         loading,
-        mockData
+        mockData,
+        headerImg,
       };
     },
   });
--- a/src/layouts/default/header/components/user-dropdown/index.vue
View file @3378ef5
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
View file @3378ef5
@@ -67,7 +67,7 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useModal } from '/@/components/Modal';
-  import headerImg from '/@/assets/images/header.jpg';
+  import headerImg from '/@/assets/images/logo.png';
   import { propTypes } from '/@/utils/propTypes';
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
--- a/src/views/device/localtion/index.vue
View file @3378ef5
+++ b/src/views/device/localtion/index.vue
View file @3378ef5
@@ -74,7 +74,7 @@
   import moment from 'moment';
   // 导入一些静态图片,避免打包时不能正确解析
   import djx from '/@/assets/images/djx.png';
-  import locationJx from '/@/assets/images/location.png';
+  // import locationJx from '/@/assets/images/location.png';
   import zx from '/@/assets/images/zx.png';
   import lx from '/@/assets/images/lx.png';
   import djh from '/@/assets/images/djh.png';
@@ -142,26 +142,15 @@
         const BMap = (window as any).BMap;
         if (!wrapEl) return;
         const map = new BMap.Map(wrapEl);
-
-        const getLocation = new BMap.Geolocation();
-        getLocation.getCurrentPosition((position) => {
-          if (position) {
-            let preMarker = null;
-            const point = new BMap.Point(position.point.lng, position.point.lat);
-            let mapIcon = new BMap.Icon(locationJx, new BMap.Size(50, 80));
-            let marker = new BMap.Marker(point, { icon: mapIcon });
-            if (marker) {
-              map.removeOverlay(preMarker);
-            }
-            map.addOverlay(marker);
-            map.centerAndZoom(point, 15);
-            map.enableScrollWheelZoom(true);
-          } else {
-            const point = new BMap.Point(104.04666605565338, 30.543516387560476);
-            map.centerAndZoom(point, 15);
-            map.enableScrollWheelZoom(true);
-          }
-        });
+        function myFun(result) {
+          let mk = new BMap.Marker(result.center);
+          map.addOverlay(mk);
+          map.panTo(result.center);
+          map.centerAndZoom(result.center, 15);
+          map.enableScrollWheelZoom(true);
+        }
+        let myCity = new BMap.LocalCity();
+        myCity.get(myFun);
       }
       // 点击表格某一行触发
       const deviceRowClick = async (record) => {
@@ -192,7 +181,7 @@
         // 创建信息窗口对象
         const res = await getDeviceActiveTime(entityId);
-        let { value: activeStatus, lastUpdateTs } = res[0];
+        let { lastUpdateTs } = res[0];
         lastUpdateTs = moment(lastUpdateTs).format('YYYY-MM-DD HH:mm:ss');
         let infoWindow = new BMap.InfoWindow(
           `
--- a/src/views/notice/manager/useDrawer.vue
View file @3378ef5
+++ b/src/views/notice/manager/useDrawer.vue
View file @3378ef5
@@ -10,7 +10,9 @@
       <BasicForm @register="registerForm" />
       <template #footer>
         <a-button @click="handleCancel">取消</a-button>
-        <a-button :disabled="draftDisable" @click="handleSaveDraft">保存草稿</a-button>
+        <Authority value="api:yt:notice:save:post">
+          <a-button :disabled="draftDisable" @click="handleSaveDraft">保存草稿</a-button>
+        </Authority>
         <a-button :disabled="sendDisable" type="primary" @click="handleSend">发布通知</a-button>
       </template>
     </BasicDrawer>
@@ -26,9 +28,11 @@
     notifyAddLeaseApi,
   } from '/@/api/stationnotification/stationnotifyApi';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { Authority } from '/@/components/Authority';
+
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicForm },
+    components: { BasicDrawer, BasicForm,Authority },
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const draftDisable = ref(false);
--- a/src/views/sys/login/Login.vue
View file @3378ef5
+++ b/src/views/sys/login/Login.vue
View file @3378ef5
@@ -21,11 +21,7 @@
         <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
           <!-- <AppLogo class="-enter-x" /> -->
           <div style="display: flex; margin-top: 10px">
-            <img
-              v-if="defaultLogo || getLogo"
-              :src="defaultLogo || getLogo"
-              style="width: 48px; height: 48px"
-            />
+            <img v-if="defaultLogo" :src="defaultLogo" style="width: 48px; height: 48px" />
             <img style="width: 48px; height: 48px" v-else src="/src/assets/images/logo.png" />
             <div
               class="ml-2 truncate md:opacity-100"
@@ -37,7 +33,7 @@
                 font-weight: 700;
               "
             >
-              {{ defaultTitle || getTitle }}
+              {{ defaultTitle }}
             </div>
           </div>
           <div v-if="ifCustom" class="my-auto">
@@ -70,7 +66,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed, ref, onMounted } from 'vue';
+  import { ref, onMounted } from 'vue';
   // import { AppLogo } from '/@/components/Application';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import LoginForm from './LoginForm.vue';
@@ -81,7 +77,7 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLocaleStore } from '/@/store/modules/locale';
-  import { useUserStore } from '/@/store/modules/user';
+  // import { useUserStore } from '/@/store/modules/user';
   import { getPlatForm } from '/@/api/oem/index';
   import defaultShowLogoImg from '/@/assets/svg/login-bg.svg';
@@ -90,14 +86,21 @@
       type: Boolean,
     },
   });
+  const { title } = useGlobSetting();
   const defaultTitle = ref('');
   const defaultLogo = ref('');
   const logoUrl = ref('');
   onMounted(async () => {
     const res = await getPlatForm();
     logoUrl.value = res?.background;
-    defaultTitle.value = res?.name;
+    defaultTitle.value = res?.name || title;
     defaultLogo.value = res?.logo;
+    let link = (document.querySelector("link[rel*='icon']") ||
+      document.createElement('link')) as HTMLLinkElement;
+    link.type = 'image/x-icon';
+    link.rel = 'shortcut icon';
+    link.href = res.icon ?? '/favicon.ico';
+    document.getElementsByTagName('head')[0].appendChild(link);
     if (logoUrl.value !== undefined) {
       ifCustom.value = false;
     } else {
@@ -105,29 +108,28 @@
     }
   });
-  const userStore = useUserStore();
+  // const userStore = useUserStore();
   const ifCustom = ref(true);
-  const getLogo = computed(() => {
-    return userStore.platInfo?.logo;
-  });
-  const { title } = useGlobSetting();
-  const getTitle = computed(() => {
-    // 设置icon
-    let link = (document.querySelector("link[rel*='icon']") ||
-      document.createElement('link')) as HTMLLinkElement;
-    link.type = 'image/x-icon';
-    link.rel = 'shortcut icon';
-    link.href = userStore.platInfo?.icon ?? '/favicon.ico';
-    document.getElementsByTagName('head')[0].appendChild(link);
-    // logoUrl.value = userStore.platInfo?.background;
-    // if (logoUrl.value !== undefined) {
-    //   ifCustom.value = false;
-    // } else {
-    //   logoUrl.value = 'url(' + defaultShowLogoImg + ')';
-    // }
-    return userStore.platInfo?.name ?? title;
-  });
+  // const getLogo = computed(() => {
+  //   return userStore.platInfo?.logo;
+  // });
+  // const getTitle = computed(() => {
+  //   // 设置icon
+  //   let link = (document.querySelector("link[rel*='icon']") ||
+  //     document.createElement('link')) as HTMLLinkElement;
+  //   link.type = 'image/x-icon';
+  //   link.rel = 'shortcut icon';
+  //   link.href = userStore.platInfo?.icon ?? '/favicon.ico';
+  //   document.getElementsByTagName('head')[0].appendChild(link);
+  //   // logoUrl.value = userStore.platInfo?.background;
+  //   // if (logoUrl.value !== undefined) {
+  //   //   ifCustom.value = false;
+  //   // } else {
+  //   //   logoUrl.value = 'url(' + defaultShowLogoImg + ')';
+  //   // }
+  //   return userStore.platInfo?.name ?? title;
+  // });
   // const globSetting = useGlobSetting();
   const { prefixCls } = useDesign('login');
   const { t } = useI18n();
--- a/src/views/sys/login/LoginForm.vue
View file @3378ef5
+++ b/src/views/sys/login/LoginForm.vue
View file @3378ef5
@@ -73,7 +73,7 @@
   import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { getPlatForm } from '/@/api/oem';
-  import { createLocalStorage } from '/@/utils/cache';
+  import { createLocalStorage, createSessionStorage } from '/@/utils/cache';
   const ACol = Col;
   const ARow = Row;
@@ -87,10 +87,11 @@
   const { setLoginState, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
   const storage = createLocalStorage();
+  const sStorage = createSessionStorage();
   const formRef = ref();
   const loading = ref(false);
   const rememberMe = ref(false);
-  const userInfo = storage.get('userInfo');
+  const userInfo = storage.get('userInfo') || sStorage.get('userInfo');
   const formData = reactive({
     account: userInfo?.account ?? '',
     password: userInfo?.password ?? '',
@@ -105,8 +106,10 @@
     if (!data) return;
     if (unref(rememberMe)) {
       storage.set('userInfo', formData);
+      sStorage.set('userInfo', formData);
     } else {
       storage.set('userInfo', null);
+      sStorage.set('userInfo', null);
     }
     loading.value = true;
     const userInfo = await userStore