Browse Source

👣 制定代码规范模板团队规则

master
wangxiang 3 years ago
parent
commit
6ce6e0e9c5
  1. BIN
      kicc-ui/src/assets/images/defaultAvatar.jpg
  2. BIN
      kicc-ui/src/assets/images/defaultAvatar.png
  3. BIN
      kicc-ui/src/assets/images/header.jpg
  4. 3
      kicc-ui/src/layouts/default/header/components/lock/LockModal.vue
  5. 3
      kicc-ui/src/layouts/default/header/components/user-dropdown/index.vue
  6. 2
      kicc-ui/src/store/modules/user.ts
  7. 3
      kicc-ui/src/views/dashboard/workbench/components/DynamicInfo.vue
  8. 5
      kicc-ui/src/views/dashboard/workbench/components/WorkbenchHeader.vue
  9. 5
      kicc-ui/src/views/sys/lock/LockPage.vue

BIN
kicc-ui/src/assets/images/defaultAvatar.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

BIN
kicc-ui/src/assets/images/defaultAvatar.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
kicc-ui/src/assets/images/header.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

3
kicc-ui/src/layouts/default/header/components/lock/LockModal.vue

@ -32,7 +32,6 @@
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { useLockStore } from '/@/store/modules/lock'; import { useLockStore } from '/@/store/modules/lock';
import headerImg from '/@/assets/images/header.jpg';
export default defineComponent({ export default defineComponent({
name: 'LockModal', name: 'LockModal',
@ -73,7 +72,7 @@
const avatar = computed(() => { const avatar = computed(() => {
const { avatar } = userStore.getUserInfo; const { avatar } = userStore.getUserInfo;
return avatar || headerImg; return avatar;
}); });
return { return {

3
kicc-ui/src/layouts/default/header/components/user-dropdown/index.vue

@ -35,7 +35,6 @@
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { useDesign } from '/@/hooks/web/useDesign'; import { useDesign } from '/@/hooks/web/useDesign';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import headerImg from '/@/assets/images/header.jpg';
import { propTypes } from '/@/utils/propTypes'; import { propTypes } from '/@/utils/propTypes';
import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent'; import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
@ -60,7 +59,7 @@
const getUserInfo = computed(() => { const getUserInfo = computed(() => {
const { realName = '', avatar, desc } = userStore.getUserInfo || {}; const { realName = '', avatar, desc } = userStore.getUserInfo || {};
return { realName, avatar: avatar || headerImg, desc }; return { realName, avatar: avatar, desc };
}); });
const [register, { openModal }] = useModal(); const [register, { openModal }] = useModal();

2
kicc-ui/src/store/modules/user.ts

@ -18,7 +18,7 @@ import {useMessage} from '/@/hooks/web/useMessage';
import {router} from '/@/router'; import {router} from '/@/router';
import {usePermissionStore} from '/@/store/modules/permission'; import {usePermissionStore} from '/@/store/modules/permission';
import {RouteRecordRaw} from 'vue-router'; import {RouteRecordRaw} from 'vue-router';
import defaultAvatar from '/@/assets/images/defaultAvatar.png'; import defaultAvatar from '/@/assets/images/defaultAvatar.jpg';
interface UserState { interface UserState {
userInfo: Nullable<UserInfo>; userInfo: Nullable<UserInfo>;

3
kicc-ui/src/views/dashboard/workbench/components/DynamicInfo.vue

@ -25,13 +25,12 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { Card, List } from 'ant-design-vue'; import { Card, List } from 'ant-design-vue';
import { dynamicInfoItems } from './data'; import { dynamicInfoItems } from './data';
import headerImg from '/@/assets/images/header.jpg';
import { Icon } from '/@/components/Icon'; import { Icon } from '/@/components/Icon';
export default defineComponent({ export default defineComponent({
components: { Card, List, ListItem: List.Item, ListItemMeta: List.Item.Meta, Icon }, components: { Card, List, ListItem: List.Item, ListItemMeta: List.Item.Meta, Icon },
setup() { setup() {
return { items: dynamicInfoItems, headerImg }; return { items: dynamicInfoItems };
}, },
}); });
</script> </script>

5
kicc-ui/src/views/dashboard/workbench/components/WorkbenchHeader.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="lg:flex"> <div class="lg:flex">
<Avatar :src="userinfo.avatar || headerImg" :size="72" class="!mx-auto !block" /> <Avatar :src="userinfo.avatar" :size="72" class="!mx-auto !block" />
<div class="md:ml-6 flex flex-col justify-center md:mt-0 mt-2"> <div class="md:ml-6 flex flex-col justify-center md:mt-0 mt-2">
<h1 class="md:text-lg text-md">早安, {{ userinfo.realName }}, 开始您一天的工作吧</h1> <h1 class="md:text-lg text-md">早安, {{ userinfo.realName }}, 开始您一天的工作吧</h1>
<span class="text-secondary"> 今日晴20 - 32 </span> <span class="text-secondary"> 今日晴20 - 32 </span>
@ -26,14 +26,13 @@
import { computed, defineComponent } from 'vue'; import { computed, defineComponent } from 'vue';
import { Avatar } from 'ant-design-vue'; import { Avatar } from 'ant-design-vue';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import headerImg from '/@/assets/images/header.jpg';
export default defineComponent({ export default defineComponent({
components: { Avatar }, components: { Avatar },
setup() { setup() {
const userStore = useUserStore(); const userStore = useUserStore();
const userinfo = computed(() => userStore.getUserInfo); const userinfo = computed(() => userStore.getUserInfo);
return { userinfo, headerImg }; return { userinfo };
}, },
}); });
</script> </script>

5
kicc-ui/src/views/sys/lock/LockPage.vue

@ -44,7 +44,7 @@
<div :class="`${prefixCls}-entry`" v-show="!showDate"> <div :class="`${prefixCls}-entry`" v-show="!showDate">
<div :class="`${prefixCls}-entry-content`"> <div :class="`${prefixCls}-entry-content`">
<div :class="`${prefixCls}-entry__header enter-x`"> <div :class="`${prefixCls}-entry__header enter-x`">
<img :src="userinfo.avatar || headerImg" :class="`${prefixCls}-entry__header-img`" /> <img :src="userinfo.avatar" :class="`${prefixCls}-entry__header-img`" />
<p :class="`${prefixCls}-entry__header-name`"> <p :class="`${prefixCls}-entry__header-name`">
{{ userinfo.realName }} {{ userinfo.realName }}
</p> </p>
@ -100,8 +100,7 @@
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { useNow } from './useNow'; import { useNow } from './useNow';
import { useDesign } from '/@/hooks/web/useDesign'; import { useDesign } from '/@/hooks/web/useDesign';
import { LockOutlined } from '@ant-design/icons-vue'; import { LockOutlined } from '@ant-design/icons-vue'
import headerImg from '/@/assets/images/header.jpg';
const InputPassword = Input.Password; const InputPassword = Input.Password;

Loading…
Cancel
Save