-
diff --git a/src/components/svgIcon/index.vue b/src/components/svgIcon/index.vue
new file mode 100644
index 0000000..b3b6304
--- /dev/null
+++ b/src/components/svgIcon/index.vue
@@ -0,0 +1,28 @@
+
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 152de08..1164a73 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -4,7 +4,10 @@ export default {
home: 'home',
system: 'system',
systemMenu: 'systemMenu',
+ systemRole: 'systemRole',
systemUser: 'systemUser',
+ systemDept: 'systemDept',
+ systemDic: 'systemDic',
limits: 'limits',
limitsFrontEnd: 'FrontEnd',
limitsFrontEndPage: 'FrontEndPage',
diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts
index a3a7946..deb2c4f 100644
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@@ -4,7 +4,10 @@ export default {
home: '首页',
system: '系统设置',
systemMenu: '菜单管理',
+ systemRole: '角色管理',
systemUser: '用户管理',
+ systemDept: '部门管理',
+ systemDic: '字典管理',
limits: '权限管理',
limitsFrontEnd: '前端控制',
limitsFrontEndPage: '页面权限',
diff --git a/src/i18n/lang/zh-tw.ts b/src/i18n/lang/zh-tw.ts
index 1bd381d..cf3378f 100644
--- a/src/i18n/lang/zh-tw.ts
+++ b/src/i18n/lang/zh-tw.ts
@@ -4,7 +4,10 @@ export default {
home: '首頁',
system: '系統設置',
systemMenu: '選單管理',
+ systemRole: '角色管理',
systemUser: '用戶管理',
+ systemDept: '部門管理',
+ systemDic: '字典管理',
limits: '許可權管理',
limitsFrontEnd: '前端控制',
limitsFrontEndPage: '頁面許可權',
diff --git a/src/layout/component/columnsAside.vue b/src/layout/component/columnsAside.vue
index 37e3513..61bcde9 100644
--- a/src/layout/component/columnsAside.vue
+++ b/src/layout/component/columnsAside.vue
@@ -16,7 +16,7 @@
:title="$t(v.meta.title)"
>
{{ title }}
+
+
{{ title }}
+
+ ali
+ ele
+ awe
+
+
-
+
@@ -61,7 +65,7 @@ export default {
// 输入框前置内容
prepend: {
type: String,
- default: () => 'el-icon-thumb',
+ default: () => 'elementPointer',
},
// 输入框占位文本
placeholder: {
@@ -104,6 +108,7 @@ export default {
},
setup(props, { emit }) {
const inputWidthRef = ref();
+ const selectorScrollbarRef = ref();
const state: any = reactive({
fontIconPrefix: '',
fontIconVisible: false,
@@ -112,6 +117,8 @@ export default {
fontIconTabsIndex: 0,
fontIconSheetsList: [],
fontIconPlaceholder: '',
+ fontIconType: 'ali',
+ fontIconShow: true,
});
// 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
const onIconFocus = () => {
@@ -153,21 +160,19 @@ export default {
});
};
// 初始化数据
- const initFontIconData = async () => {
- if (props.type === 'ali') {
+ const initFontIconData = async (type: string) => {
+ state.fontIconSheetsList = [];
+ if (type === 'ali') {
await initIconfont.ali().then((res: any) => {
- state.fontIconTabsIndex = 0;
// 阿里字体图标使用 `iconfont xxx`
state.fontIconSheetsList = res.map((i) => `iconfont ${i}`);
});
- } else if (props.type === 'ele') {
+ } else if (type === 'ele') {
await initIconfont.ele().then((res: any) => {
- state.fontIconTabsIndex = 1;
state.fontIconSheetsList = res;
});
- } else if (props.type === 'awe') {
+ } else if (type === 'awe') {
await initIconfont.awe().then((res: any) => {
- state.fontIconTabsIndex = 2;
// fontawesome字体图标使用 `fa xxx`
state.fontIconSheetsList = res.map((i) => `fa ${i}`);
});
@@ -177,14 +182,19 @@ export default {
state.fontIconPlaceholder = props.placeholder;
// 初始化双向绑定回显
initModeValueEcho();
+ // 切换时，滚动条置顶。感兴趣可以使用 keep-alive
-
+
-
+
-
+
{{
$t(v.meta.title) && $t(v.meta.title).length >= 4
@@ -27,7 +27,7 @@
-
+
{{
$t(v.meta.title) && $t(v.meta.title).length >= 4
diff --git a/src/layout/main/defaults.vue b/src/layout/main/defaults.vue
index f609ccc..3dade0a 100644
--- a/src/layout/main/defaults.vue
+++ b/src/layout/main/defaults.vue
@@ -33,7 +33,7 @@ export default {
watch(
() => route.path,
() => {
- proxy.$refs.layoutDefaultsScrollbarRef.wrap.scrollTop = 0;
+ proxy.$refs.layoutDefaultsScrollbarRef.wrap$.scrollTop = 0;
}
);
return {
diff --git a/src/layout/navBars/breadcrumb/breadcrumb.vue b/src/layout/navBars/breadcrumb/breadcrumb.vue
index 057ded3..b8d4cb9 100644
--- a/src/layout/navBars/breadcrumb/breadcrumb.vue
+++ b/src/layout/navBars/breadcrumb/breadcrumb.vue
@@ -1,18 +1,18 @@
- {{ $t('message.layout.copyText') }}
+
+
+
+ {{ $t('message.layout.copyText') }}
- {{ $t('message.layout.resetText') }}
+
+
+
+ {{ $t('message.layout.resetText') }}
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 9a607ac..c2277f0 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -26,7 +26,9 @@
@@ -35,7 +37,9 @@
-
+
+
@@ -54,7 +58,9 @@
![]()
{{ getUserInfos.userName === '' ? 'test' : getUserInfos.userName }}
-
+
+
@@ -79,7 +85,7 @@ import screenfull from 'screenfull';
import { useI18n } from 'vue-i18n';
import { resetRoute } from '/@/router/index';
import { useStore } from '/@/store/index';
-import { useTitle } from '/@/utils/setWebTitle';
+import other from '/@/utils/other';
import { Session, Local } from '/@/utils/storage';
import UserNews from '/@/layout/navBars/breadcrumb/userNews.vue';
import Search from '/@/layout/navBars/breadcrumb/search.vue';
@@ -91,7 +97,6 @@ export default {
const { proxy } = getCurrentInstance() as any;
const router = useRouter();
const store = useStore();
- const title = useTitle();
const searchRef = ref();
const state = reactive({
isScreenfull: false,
@@ -192,7 +197,7 @@ export default {
Local.set('themeConfig', getThemeConfig.value);
proxy.$i18n.locale = lang;
initI18n();
- title();
+ other.useTitle();
};
// 设置 element plus 组件的国际化
const setI18nConfig = (locale: string) => {
diff --git a/src/layout/navBars/tagsView/contextmenu.vue b/src/layout/navBars/tagsView/contextmenu.vue
index 715de25..aaa1b31 100644
--- a/src/layout/navBars/tagsView/contextmenu.vue
+++ b/src/layout/navBars/tagsView/contextmenu.vue
@@ -19,7 +19,7 @@
v-if="!v.affix"
@click="onCurrentContextmenuClick(v.contextMenuClickId)"
>
-
+
@@ -42,10 +42,10 @@ export default defineComponent({
const state = reactive({
isShow: false,
dropdownList: [
- { contextMenuClickId: 0, txt: 'message.tagsView.refresh', affix: false, icon: 'el-icon-refresh-right' },
- { contextMenuClickId: 1, txt: 'message.tagsView.close', affix: false, icon: 'el-icon-close' },
- { contextMenuClickId: 2, txt: 'message.tagsView.closeOther', affix: false, icon: 'el-icon-circle-close' },
- { contextMenuClickId: 3, txt: 'message.tagsView.closeAll', affix: false, icon: 'el-icon-folder-delete' },
+ { contextMenuClickId: 0, txt: 'message.tagsView.refresh', affix: false, icon: 'elementRefreshRight' },
+ { contextMenuClickId: 1, txt: 'message.tagsView.close', affix: false, icon: 'elementClose' },
+ { contextMenuClickId: 2, txt: 'message.tagsView.closeOther', affix: false, icon: 'elementCircleClose' },
+ { contextMenuClickId: 3, txt: 'message.tagsView.closeAll', affix: false, icon: 'elementFolderDelete' },
{
contextMenuClickId: 4,
txt: 'message.tagsView.fullscreen',
diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue
index a3243a6..d33466e 100644
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@@ -17,21 +17,23 @@
"
>
-
+
+ />
-
+ />
@@ -324,7 +326,7 @@ export default {
};
// 鼠标滚轮滚动
const onHandleScroll = (e: any) => {
- proxy.$refs.scrollbarRef.$refs.wrap.scrollLeft += e.wheelDelta / 4;
+ proxy.$refs.scrollbarRef.$refs.wrap$.scrollLeft += e.wheelDelta / 4;
};
// tagsView 横向滚动
const tagsViewmoveToCurrentTag = () => {
@@ -341,7 +343,7 @@ export default {
// 最后 li
let liLast: any = tagsRefs.value[tagsRefs.value.length - 1];
// 当前滚动条的值
- let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrap;
+ let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrap$;
// 当前滚动条滚动宽度
let scrollS = scrollRefs.scrollWidth;
// 当前滚动条偏移宽度
@@ -507,6 +509,8 @@ export default {
.layout-navbars-tagsview {
background-color: var(--el-color-white);
border-bottom: 1px solid #f1f2f3;
+ position: relative;
+ z-index: 4;
::v-deep(.el-scrollbar__wrap) {
overflow-x: auto !important;
}
diff --git a/src/layout/navMenu/horizontal.vue b/src/layout/navMenu/horizontal.vue
index 1fcb694..b387445 100644
--- a/src/layout/navMenu/horizontal.vue
+++ b/src/layout/navMenu/horizontal.vue
@@ -5,19 +5,19 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/main.ts b/src/main.ts
index 925e103..1af7989 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,7 @@ import router from './router';
import { store, key } from './store';
import { directive } from '/@/utils/directive';
import { i18n } from '/@/i18n/index';
-import { globalComponentSize } from '/@/utils/componentSize';
+import other from '/@/utils/other';
import ElementPlus from 'element-plus';
import 'element-plus/dist/index.css';
@@ -14,15 +14,17 @@ import screenShort from 'vue-web-screen-shot';
import VueGridLayout from 'vue-grid-layout';
const app = createApp(App);
+
+directive(app);
+other.elSvg(app);
+
app
.use(router)
.use(store, key)
- .use(ElementPlus, { i18n: i18n.global.t, size: globalComponentSize })
+ .use(ElementPlus, { i18n: i18n.global.t, size: other.globalComponentSize })
.use(i18n)
.use(screenShort, { enableWebRtc: false })
.use(VueGridLayout)
.mount('#app');
app.config.globalProperties.mittBus = mitt();
-
-directive(app);
diff --git a/src/router/backEnd.ts b/src/router/backEnd.ts
index aa064c8..f6d0a0c 100644
--- a/src/router/backEnd.ts
+++ b/src/router/backEnd.ts
@@ -48,7 +48,7 @@ export async function initBackEndControlRoutes() {
*/
export function getBackEndControlRoutes() {
// 模拟 admin 与 test
- const auth = store.state.userInfos.userInfos.authPageList[0];
+ const auth = store.state.userInfos.userInfos.roles[0];
// 管理员 admin
if (auth === 'admin') return getMenuAdmin();
// 其它用户 test
diff --git a/src/router/index.ts b/src/router/index.ts
index 80d05ca..ec83f7a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -81,34 +81,34 @@ export function formatTwoStageRoutes(arr: any) {
*/
export function setCacheTagsViewRoutes() {
// 获取有权限的路由，否则 tagsView、菜单搜索中无权限的路由也将显示
- let authsRoutes = setFilterHasAuthMenu(dynamicRoutes, store.state.userInfos.userInfos.authPageList);
+ let rolesRoutes = setFilterHasRolesMenu(dynamicRoutes, store.state.userInfos.userInfos.roles);
// 添加到 vuex setTagsViewRoutes 中
- store.dispatch('tagsViewRoutes/setTagsViewRoutes', formatTwoStageRoutes(formatFlatteningRoutes(authsRoutes))[0].children);
+ store.dispatch('tagsViewRoutes/setTagsViewRoutes', formatTwoStageRoutes(formatFlatteningRoutes(rolesRoutes))[0].children);
}
/**
- * 判断路由 `meta.auth` 中是否包含当前登录用户权限字段
- * @param auths 用户权限标识，在 userInfos（用户信息）的 authPageList（登录页登录时缓存到浏览器）数组
+ * 判断路由 `meta.roles` 中是否包含当前登录用户权限字段
+ * @param roles 用户权限标识，在 userInfos（用户信息）的 roles（登录页登录时缓存到浏览器）数组
* @param route 当前循环时的路由项
* @returns 返回对比后有权限的路由项
*/
-export function hasAuth(auths: any, route: any) {
- if (route.meta && route.meta.auth) return auths.some((auth: any) => route.meta.auth.includes(auth));
+export function hasRoles(roles: any, route: any) {
+ if (route.meta && route.meta.roles) return roles.some((role: any) => route.meta.roles.includes(role));
else return true;
}
/**
* 获取当前用户权限标识去比对路由表，设置递归过滤有权限的路由
* @param routes 当前路由 children
- * @param auth 用户权限标识，在 userInfos（用户信息）的 authPageList（登录页登录时缓存到浏览器）数组
- * @returns 返回有权限的路由数组 `meta.auth` 中控制
+ * @param roles 用户权限标识，在 userInfos（用户信息）的 roles（登录页登录时缓存到浏览器）数组
+ * @returns 返回有权限的路由数组 `meta.roles` 中控制
*/
-export function setFilterHasAuthMenu(routes: any, auth: any) {
+export function setFilterHasRolesMenu(routes: any, roles: any) {
const menu: any = [];
routes.forEach((route: any) => {
const item = { ...route };
- if (hasAuth(auth, item)) {
- if (item.children) item.children = setFilterHasAuthMenu(item.children, auth);
+ if (hasRoles(roles, item)) {
+ if (item.children) item.children = setFilterHasRolesMenu(item.children, roles);
menu.push(item);
}
});
@@ -121,7 +121,7 @@ export function setFilterHasAuthMenu(routes: any, auth: any) {
* @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
*/
export function setFilterMenuAndCacheTagsViewRoutes() {
- store.dispatch('routesList/setRoutesList', setFilterHasAuthMenu(dynamicRoutes[0].children, store.state.userInfos.userInfos.authPageList));
+ store.dispatch('routesList/setRoutesList', setFilterHasRolesMenu(dynamicRoutes[0].children, store.state.userInfos.userInfos.roles));
setCacheTagsViewRoutes();
}
@@ -135,10 +135,10 @@ export function setFilterMenuAndCacheTagsViewRoutes() {
export function setFilterRoute(chil: any) {
let filterRoute: any = [];
chil.forEach((route: any) => {
- if (route.meta.auth) {
- route.meta.auth.forEach((metaAuth: any) => {
- store.state.userInfos.userInfos.authPageList.forEach((auth: any) => {
- if (metaAuth === auth) filterRoute.push({ ...route });
+ if (route.meta.roles) {
+ route.meta.roles.forEach((metaRoles: any) => {
+ store.state.userInfos.userInfos.roles.forEach((roles: any) => {
+ if (metaRoles === roles) filterRoute.push({ ...route });
});
});
}
diff --git a/src/router/route.ts b/src/router/route.ts
index 14a3494..ccf3fec 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -9,7 +9,7 @@ import { RouteRecordRaw } from 'vue-router';
* isKeepAlive： 是否缓存组件状态
* isAffix： 是否固定在 tagsView 栏上
* isIframe： 是否内嵌窗口，，开启条件，`1、isIframe:true 2、链接地址不为空`
- * auth： 当前路由权限标识（多个请用逗号隔开），最后转成数组格式，用于与当前用户权限进行对比，控制路由显示、隐藏
+ * roles： 当前路由权限标识，取角色管理。控制路由显示、隐藏。超级管理员：admin 普通角色：common
* icon： 菜单、tagsView 图标，阿里：加 `iconfont xxx`，fontawesome：加 `fa xxx`
* }
*/
@@ -41,7 +41,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: true,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-shouye',
},
},
@@ -57,7 +57,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-xitongshezhi',
},
children: [
@@ -72,10 +72,25 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-caidan',
},
},
+ {
+ path: '/system/role',
+ name: 'systemRole',
+ component: () => import('/@/views/system/role/index.vue'),
+ meta: {
+ title: 'message.router.systemRole',
+ isLink: '',
+ isHide: false,
+ isKeepAlive: true,
+ isAffix: false,
+ isIframe: false,
+ roles: ['admin'],
+ icon: 'elementColdDrink',
+ },
+ },
{
path: '/system/user',
name: 'systemUser',
@@ -87,10 +102,40 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-icon-',
},
},
+ {
+ path: '/system/dept',
+ name: 'systemDept',
+ component: () => import('/@/views/system/dept/index.vue'),
+ meta: {
+ title: 'message.router.systemDept',
+ isLink: '',
+ isHide: false,
+ isKeepAlive: true,
+ isAffix: false,
+ isIframe: false,
+ roles: ['admin'],
+ icon: 'elementOfficeBuilding',
+ },
+ },
+ {
+ path: '/system/dic',
+ name: 'systemDic',
+ component: () => import('/@/views/system/dic/index.vue'),
+ meta: {
+ title: 'message.router.systemDic',
+ isLink: '',
+ isHide: false,
+ isKeepAlive: true,
+ isAffix: false,
+ isIframe: false,
+ roles: ['admin'],
+ icon: 'elementSetUp',
+ },
+ },
],
},
{
@@ -105,7 +150,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-quanxian',
},
children: [
@@ -121,7 +166,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
+ icon: '',
},
children: [
{
@@ -135,7 +181,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
+ icon: '',
},
},
{
@@ -149,7 +196,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
+ icon: '',
},
},
],
@@ -165,7 +213,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
+ icon: '',
},
children: [
{
@@ -179,7 +228,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
+ icon: '',
},
},
],
@@ -198,7 +248,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
children: [
@@ -214,7 +264,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
children: [
@@ -229,7 +279,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
},
@@ -245,7 +295,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
children: [
@@ -260,7 +310,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
},
@@ -275,7 +325,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
},
@@ -292,7 +342,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
},
@@ -309,7 +359,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caidan',
},
},
@@ -327,7 +377,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-crew_feature',
},
children: [
@@ -342,8 +392,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-thumb',
+ roles: ['admin', 'common'],
+ icon: 'elementPointer',
},
},
{
@@ -357,8 +407,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-odometer',
+ roles: ['admin', 'common'],
+ icon: 'elementOdometer',
},
},
{
@@ -372,8 +422,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-connection',
+ roles: ['admin', 'common'],
+ icon: 'elementConnection',
},
},
{
@@ -387,7 +437,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-xuanzeqi',
},
},
@@ -402,8 +452,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-bell',
+ roles: ['admin', 'common'],
+ icon: 'elementBell',
},
},
{
@@ -417,7 +467,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-fuwenbenkuang',
},
},
@@ -432,7 +482,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-caijian',
},
},
@@ -447,7 +497,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-ico',
},
},
@@ -462,7 +512,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-ditu',
},
},
@@ -477,8 +527,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-printer',
+ roles: ['admin', 'common'],
+ icon: 'elementPrinter',
},
},
{
@@ -492,8 +542,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-document-copy',
+ roles: ['admin', 'common'],
+ icon: 'elementDocumentCopy',
},
},
{
@@ -507,8 +557,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-crop',
+ roles: ['admin', 'common'],
+ icon: 'elementCrop',
},
},
{
@@ -522,7 +572,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-tuodong',
},
},
@@ -537,7 +587,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon--chaifenlie',
},
},
@@ -552,8 +602,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-s-promotion',
+ roles: ['admin', 'common'],
+ icon: 'elementPromotion',
},
},
],
@@ -570,7 +620,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-fuzhiyemian',
},
children: [
@@ -585,8 +635,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-sell',
+ roles: ['admin', 'common'],
+ icon: 'elementSell',
},
/**
* 注意此处详情写法：
@@ -606,8 +656,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: false,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-s-order',
+ roles: ['admin', 'common'],
+ icon: 'elementSunny',
},
},
],
@@ -623,8 +673,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: false,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-s-order',
+ roles: ['admin', 'common'],
+ icon: 'elementSunny',
},
},
{
@@ -638,8 +688,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-present',
+ roles: ['admin', 'common'],
+ icon: 'elementPresent',
},
},
{
@@ -653,8 +703,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-platform-eleme',
+ roles: ['admin', 'common'],
+ icon: 'elementEleme',
},
},
{
@@ -668,8 +718,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-set-up',
+ roles: ['admin', 'common'],
+ icon: 'elementSetUp',
},
},
{
@@ -683,7 +733,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-jiliandongxuanzeqi',
},
},
@@ -698,7 +748,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-biaodan',
},
},
@@ -713,7 +763,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-diqiu',
},
},
@@ -728,7 +778,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-shuxing',
},
},
@@ -743,7 +793,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-chazhaobiaodanliebiao',
},
},
@@ -758,7 +808,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-zidingyibuju',
},
},
@@ -773,7 +823,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-step',
},
},
@@ -788,7 +838,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-15tupianyulan',
},
},
@@ -803,7 +853,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-bolangneng',
},
},
@@ -818,7 +868,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-shuxingtu',
},
},
@@ -833,8 +883,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
- icon: 'el-icon-thumb',
+ roles: ['admin', 'common'],
+ icon: 'elementPointer',
},
},
{
@@ -848,8 +898,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
- icon: 'el-icon-picture-outline',
+ roles: ['admin'],
+ icon: 'elementPictureFilled',
},
},
{
@@ -863,7 +913,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-diannao',
},
},
@@ -878,8 +928,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
- icon: 'el-icon-connection',
+ roles: ['admin'],
+ icon: 'elementConnection',
},
},
],
@@ -896,7 +946,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-zhongduancanshu',
},
children: [
@@ -911,7 +961,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-putong',
},
},
@@ -926,8 +976,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
- icon: 'el-icon-s-order',
+ roles: ['admin'],
+ icon: 'elementComment',
},
},
{
@@ -941,7 +991,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-dongtai',
},
},
@@ -956,8 +1006,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
- icon: 'el-icon-s-order',
+ roles: ['admin'],
+ icon: 'elementLightning',
},
},
],
@@ -974,8 +1024,8 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin'],
- icon: 'el-icon-data-line',
+ roles: ['admin'],
+ icon: 'elementChatLineRound',
},
children: [
{
@@ -989,7 +1039,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: false,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-caozuo-wailian',
},
},
@@ -1004,7 +1054,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: false,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-caozuo-wailian',
},
},
@@ -1021,7 +1071,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-ico_shuju',
},
},
@@ -1036,7 +1086,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-gerenzhongxin',
},
},
@@ -1051,7 +1101,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: true,
isAffix: false,
isIframe: false,
- auth: ['admin', 'test'],
+ roles: ['admin', 'common'],
icon: 'iconfont icon-gongju',
},
},
@@ -1066,7 +1116,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: false,
isAffix: false,
isIframe: false,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-caozuo-wailian',
},
},
@@ -1081,7 +1131,7 @@ export const dynamicRoutes: Array = [
isKeepAlive: false,
isAffix: true,
isIframe: true,
- auth: ['admin'],
+ roles: ['admin'],
icon: 'iconfont icon-neiqianshujuchucun',
},
},
diff --git a/src/theme/app.scss b/src/theme/app.scss
index e92be9e..b027a5b 100644
--- a/src/theme/app.scss
+++ b/src/theme/app.scss
@@ -169,6 +169,25 @@ body,
}
}
+/* cursor 鼠标形状
+------------------------------- */
+// 默认
+.cursor-default {
+ cursor: default !important;
+}
+// 帮助
+.cursor-help {
+ cursor: help !important;
+}
+// 手指
+.cursor-pointer {
+ cursor: pointer !important;
+}
+// 移动
+.cursor-move {
+ cursor: move !important;
+}
+
/* 宽高 100%
------------------------------- */
.w100 {
diff --git a/src/theme/dark.scss b/src/theme/dark.scss
index 2fe72d3..e2b03e6 100644
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@@ -12,6 +12,7 @@
.error img {
filter: unset;
}
+
// element plus
.el-radio-button__original-radio:checked + .el-radio-button__inner,
.el-image-viewer__close,
@@ -20,6 +21,13 @@
.el-image-viewer__prev {
color: #000000 !important;
}
+ .el-overlay {
+ background-color: rgba(0, 0, 0, 0.05) !important;
+ }
+ .el-drawer {
+ box-shadow: 0 8px 10px -5px rgb(0 0 0 / 1%), 0 16px 24px 2px rgb(0 0 0 / 2%), 0 6px 30px 5px rgb(0 0 0 / 1%);
+ }
+
// 数据可视化演示
.visualizing-container-head {
background: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.02)) !important;
@@ -39,6 +47,7 @@
.cropper-modal {
background-color: #ffffff;
}
+
// 其它菜单等
--bg-menuBar: #ffffff !important;
--bg-menuBarColor: #303133 !important;
diff --git a/src/theme/element.scss b/src/theme/element.scss
index eb1be71..538a771 100644
--- a/src/theme/element.scss
+++ b/src/theme/element.scss
@@ -853,7 +853,7 @@
@include generalIcon;
}
// element plus 本身字体图标
-.el-sub-menu [class^='el-icon-'] {
+.el-sub-menu .el-icon {
font-size: 14px !important;
}
// 去掉离开浏览器时，菜单的默认高亮
@@ -1015,6 +1015,9 @@
/* scrollbar
------------------------------- */
+.el-scrollbar__bar {
+ z-index: 4;
+}
.el-scrollbar__wrap {
overflow-x: hidden !important;
max-height: 100%; /*防止页面切换时，滚动条高度不变的问题（滚动条高度非滚动条滚动高度）*/
diff --git a/src/theme/iconSelector.scss b/src/theme/iconSelector.scss
index c9af770..6e599e6 100644
--- a/src/theme/iconSelector.scss
+++ b/src/theme/iconSelector.scss
@@ -9,6 +9,19 @@
height: 40px;
line-height: 40px;
padding: 0 15px;
+ .icon-selector-warp-title-tab {
+ span {
+ cursor: pointer;
+ &:hover {
+ color: var(--color-primary);
+ text-decoration: underline;
+ }
+ }
+ .span-active {
+ color: var(--color-primary);
+ text-decoration: underline;
+ }
+ }
}
.icon-selector-warp-row {
height: 230px;
diff --git a/src/utils/componentSize.ts b/src/utils/componentSize.ts
deleted file mode 100644
index d747aa0..0000000
--- a/src/utils/componentSize.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Local } from '/@/utils/storage';
-
-/**
- * 全局组件大小
- * @returns 返回 `window.localStorage` 中读取的缓存值 `globalComponentSize`
- */
-export const globalComponentSize: string = Local.get('themeConfig')?.globalComponentSize;
diff --git a/src/utils/deepClone.ts b/src/utils/deepClone.ts
deleted file mode 100644
index 819f744..0000000
--- a/src/utils/deepClone.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * 对象深克隆
- * @param obj 源对象
- * @returns 克隆后的对象
- */
-export function deepClone(obj: any) {
- let newObj: any;
- try {
- newObj = obj.push ? [] : {};
- } catch (error) {
- newObj = {};
- }
- for (let attr in obj) {
- if (typeof obj[attr] === 'object') {
- newObj[attr] = deepClone(obj[attr]);
- } else {
- newObj[attr] = obj[attr];
- }
- }
- return newObj;
-}
diff --git a/src/utils/getStyleSheets.ts b/src/utils/getStyleSheets.ts
index 73406a0..0401c68 100644
--- a/src/utils/getStyleSheets.ts
+++ b/src/utils/getStyleSheets.ts
@@ -1,4 +1,5 @@
import { nextTick } from 'vue';
+import * as svg from '@element-plus/icons';
// 获取阿里字体图标
const getAlicdnIconfont = () => {
@@ -27,24 +28,16 @@ const getAlicdnIconfont = () => {
});
};
-// 初始化获取 css 样式，获取 element plus 自带图标
+// 初始化获取 css 样式，获取 element plus 自带 svg 图标，增加了 element 前缀，使用时：elementAim
const getElementPlusIconfont = () => {
return new Promise((resolve, reject) => {
nextTick(() => {
- const styles: any = document.styleSheets;
- let sheetsIconList = [];
- for (let i = 0; i < styles.length; i++) {
- for (let j = 0; j < styles[i].cssRules.length; j++) {
- if (styles[i].cssRules[j].selectorText && styles[i].cssRules[j].selectorText.indexOf('.el-icon-') === 0) {
- if (/::before/.test(styles[i].cssRules[j].selectorText)) {
- sheetsIconList.push(
- `${styles[i].cssRules[j].selectorText.substring(1, styles[i].cssRules[j].selectorText.length).replace(/\:\:before/gi, '')}`
- );
- }
- }
- }
+ const icons = svg as any;
+ const sheetsIconList = [];
+ for (const i in icons) {
+ sheetsIconList.push(`element${icons[i].name}`);
}
- if (sheetsIconList.length > 0) resolve(sheetsIconList.reverse());
+ if (sheetsIconList.length > 0) resolve(sheetsIconList);
else reject('未获取到值，请刷新重试');
});
});
diff --git a/src/utils/lazyImgLoading.ts b/src/utils/lazyImgLoading.ts
deleted file mode 100644
index 4506269..0000000
--- a/src/utils/lazyImgLoading.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { nextTick } from 'vue';
-
-/**
- * 图片懒加载
- * @param el dom 目标元素
- * @param arr 列表数据
- * @description data-xxx 属性用于存储页面或应用程序的私有自定义数据
- */
-export const lazyImgLoading = (el: any, arr: any) => {
- const io = new IntersectionObserver((res) => {
- res.forEach((v: any) => {
- if (v.isIntersecting) {
- const { img, key } = v.target.dataset;
- v.target.src = img;
- v.target.onload = () => {
- io.unobserve(v.target);
- arr[key]['loading'] = false;
- };
- }
- });
- });
- nextTick(() => {
- document.querySelectorAll(el).forEach((img) => io.observe(img));
- });
-};
diff --git a/src/utils/other.ts b/src/utils/other.ts
new file mode 100644
index 0000000..0723280
--- /dev/null
+++ b/src/utils/other.ts
@@ -0,0 +1,121 @@
+import { nextTick } from 'vue';
+import type { App } from 'vue';
+import * as svg from '@element-plus/icons';
+import router from '/@/router/index';
+import { store } from '/@/store/index';
+import { i18n } from '/@/i18n/index';
+import { Local } from '/@/utils/storage';
+import SvgIcon from '/@/components/svgIcon/index.vue';
+
+/**
+ * 导出全局注册 element plus svg 图标
+ * @param app vue 实例
+ * @description 使用：https://element-plus.gitee.io/zh-CN/component/icon.html
+ */
+export function elSvg(app: App) {
+ const icons = svg as any;
+ for (const i in icons) {
+ app.component(`element${icons[i].name}`, icons[i]);
+ }
+ app.component('SvgIcon', SvgIcon);
+}
+
+/**
+ * 设置浏览器标题国际化
+ * @method const title = useTitle(); ==> title()
+ */
+export function useTitle() {
+ return () => {
+ nextTick(() => {
+ let webTitle = '';
+ let globalTitle: string = store.state.themeConfig.themeConfig.globalTitle;
+ router.currentRoute.value.path === '/login'
+ ? (webTitle = router.currentRoute.value.meta.title as any)
+ : (webTitle = i18n.global.t(router.currentRoute.value.meta.title as any));
+ document.title = `${webTitle} - ${globalTitle}` || globalTitle;
+ });
+ };
+}
+
+/**
+ * 图片懒加载
+ * @param el dom 目标元素
+ * @param arr 列表数据
+ * @description data-xxx 属性用于存储页面或应用程序的私有自定义数据
+ */
+export const lazyImg = (el: any, arr: any) => {
+ const io = new IntersectionObserver((res) => {
+ res.forEach((v: any) => {
+ if (v.isIntersecting) {
+ const { img, key } = v.target.dataset;
+ v.target.src = img;
+ v.target.onload = () => {
+ io.unobserve(v.target);
+ arr[key]['loading'] = false;
+ };
+ }
+ });
+ });
+ nextTick(() => {
+ document.querySelectorAll(el).forEach((img) => io.observe(img));
+ });
+};
+
+/**
+ * 全局组件大小
+ * @returns 返回 `window.localStorage` 中读取的缓存值 `globalComponentSize`
+ */
+export function globalComponentSize() {
+ return Local.get('themeConfig')?.globalComponentSize;
+}
+
+/**
+ * 对象深克隆
+ * @param obj 源对象
+ * @returns 克隆后的对象
+ */
+export function deepClone(obj: any) {
+ let newObj: any;
+ try {
+ newObj = obj.push ? [] : {};
+ } catch (error) {
+ newObj = {};
+ }
+ for (let attr in obj) {
+ if (typeof obj[attr] === 'object') {
+ newObj[attr] = deepClone(obj[attr]);
+ } else {
+ newObj[attr] = obj[attr];
+ }
+ }
+ return newObj;
+}
+
+/**
+ * 统一批量导出
+ * @method elSvg 导出全局注册 element plus svg 图标
+ * @method useTitle 设置浏览器标题国际化
+ * @method lazyImg 图片懒加载
+ * @method globalComponentSize element plus 全局组件大小
+ * @method deepClone 对象深克隆
+ */
+const other = {
+ elSvg: (app: App) => {
+ elSvg(app);
+ },
+ useTitle: () => {
+ useTitle();
+ },
+ lazyImg: (el: any, arr: any) => {
+ lazyImg(el, arr);
+ },
+ globalComponentSize: () => {
+ globalComponentSize();
+ },
+ deepClone: (obj: any) => {
+ deepClone(obj);
+ },
+};
+
+// 统一批量导出
+export default other;
diff --git a/src/utils/setWebTitle.ts b/src/utils/setWebTitle.ts
deleted file mode 100644
index a859aab..0000000
--- a/src/utils/setWebTitle.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { nextTick } from 'vue';
-import router from '/@/router/index';
-import { store } from '/@/store/index';
-import { i18n } from '/@/i18n/index';
-
-/**
- * 设置浏览器标题国际化
- */
-export function useTitle() {
- return () => {
- nextTick(() => {
- let webTitle = '';
- let globalTitle: string = store.state.themeConfig.themeConfig.globalTitle;
- router.currentRoute.value.path === '/login'
- ? (webTitle = router.currentRoute.value.meta.title as any)
- : (webTitle = i18n.global.t(router.currentRoute.value.meta.title as any));
- document.title = `${webTitle} - ${globalTitle}` || globalTitle;
- });
- };
-}
diff --git a/src/views/chart/chart.scss b/src/views/chart/chart.scss
index 2c1ee64..7b3eb82 100644
--- a/src/views/chart/chart.scss
+++ b/src/views/chart/chart.scss
@@ -118,6 +118,9 @@
border-radius: 100%;
flex-shrink: 1;
color: var(--color-whites);
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.i-bg1 {
background: #22bc76;
diff --git a/src/views/chart/chart.ts b/src/views/chart/chart.ts
index 1d5aab8..87764a7 100644
--- a/src/views/chart/chart.ts
+++ b/src/views/chart/chart.ts
@@ -13,14 +13,14 @@ export const skyList = [
},
{
v1: '今天',
- v2: 'el-icon-cloudy-and-sunny',
+ v2: 'elementSunny',
v3: '20°/26°',
v5: '50%',
v7: '13m/s',
},
{
v1: '明天',
- v2: 'el-icon-lightning',
+ v2: 'elementLightning',
v3: '20°/26°',
v5: '50%',
v7: '13m/s',
@@ -57,34 +57,3 @@ export const chartData4List = [
label: '风力',
},
];
-
-/**
- * 3DEarth 地图周围按钮组
- * @returns 返回模拟数据
- */
-export const earth3DBtnList = [
- {
- topLevelClass: 'fixed-top',
- icon: 'el-icon-s-marketing',
- label: '环境监测',
- type: 0,
- },
- {
- topLevelClass: 'fixed-right',
- icon: 'el-icon-s-cooperation',
- label: '精准管理',
- type: 1,
- },
- {
- topLevelClass: 'fixed-bottom',
- icon: 'el-icon-s-order',
- label: '数据报表',
- type: 2,
- },
- {
- topLevelClass: 'fixed-left',
- icon: 'el-icon-s-claim',
- label: '产品追溯',
- type: 3,
- },
-];
diff --git a/src/views/chart/index.vue b/src/views/chart/index.vue
index 2936b24..8bdf8c4 100644
--- a/src/views/chart/index.vue
+++ b/src/views/chart/index.vue
@@ -12,7 +12,7 @@
立即前往前端控制路由
+
+
+
+ 立即前往前端控制路由
+
diff --git a/src/views/limits/frontEnd/btn/index.vue b/src/views/limits/frontEnd/btn/index.vue
index 3acafbc..f0184dc 100644
--- a/src/views/limits/frontEnd/btn/index.vue
+++ b/src/views/limits/frontEnd/btn/index.vue
@@ -8,28 +8,48 @@
@@ -40,28 +60,48 @@
@@ -72,28 +112,48 @@
@@ -106,22 +166,42 @@
@@ -130,22 +210,42 @@
@@ -154,22 +254,42 @@
@@ -181,17 +301,32 @@
diff --git a/src/views/limits/frontEnd/page/index.vue b/src/views/limits/frontEnd/page/index.vue
index 08ea1d7..0df9540 100644
--- a/src/views/limits/frontEnd/page/index.vue
+++ b/src/views/limits/frontEnd/page/index.vue
@@ -8,7 +8,7 @@
:closable="false"
>
{
- return store.state.userInfos.userInfos.authPageList;
+ const getRoles = computed(() => {
+ return store.state.userInfos.userInfos.roles;
});
// 获取用户按钮权限信息
const getAuthBtnList = computed(() => {
@@ -45,27 +45,28 @@ export default {
});
// 初始化用户权限
const initUserAuth = () => {
- state.userAuth = store.state.userInfos.userInfos.authPageList[0];
+ state.userAuth = store.state.userInfos.userInfos.roles[0];
};
// 用户权限改变时
const onRadioChange = async () => {
+ // 模拟数据
resetRoute();
- let defaultAuthPageList: Array = [];
+ let defaultRoles: Array = [];
let defaultAuthBtnList: Array = [];
- // admin 页面权限标识，对应路由 meta.auth，用于控制路由的显示/隐藏
- let adminAuthPageList: Array = ['admin'];
+ // admin 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
+ let adminRoles: Array = ['admin'];
// admin 按钮权限标识
let adminAuthBtnList: Array = ['btn.add', 'btn.del', 'btn.edit', 'btn.link'];
- // test 页面权限标识，对应路由 meta.auth，用于控制路由的显示/隐藏
- let testAuthPageList: Array = ['test'];
+ // test 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
+ let testRoles: Array = ['common'];
// test 按钮权限标识
let testAuthBtnList: Array = ['btn.add', 'btn.link'];
// 不同用户模拟不同的用户权限
if (state.userAuth === 'admin') {
- defaultAuthPageList = adminAuthPageList;
+ defaultRoles = adminRoles;
defaultAuthBtnList = adminAuthBtnList;
} else {
- defaultAuthPageList = testAuthPageList;
+ defaultRoles = testRoles;
defaultAuthBtnList = testAuthBtnList;
}
const userInfos = {
@@ -75,7 +76,7 @@ export default {
? 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg'
: 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=317673774,2961727727&fm=26&gp=0.jpg',
time: new Date().getTime(),
- authPageList: defaultAuthPageList,
+ roles: defaultRoles,
authBtnList: defaultAuthBtnList,
};
Session.set('userInfo', userInfos);
@@ -88,7 +89,7 @@ export default {
initUserAuth();
});
return {
- getAuthPageList,
+ getRoles,
getAuthBtnList,
onRadioChange,
...toRefs(state),
diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue
index ee6aab4..b0f00b7 100644
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@@ -1,24 +1,22 @@
-
+
+
+
+
+
+ >
+
+
天气预报
-
+ 点击截屏
+
+
diff --git a/src/views/fun/selector/index.vue b/src/views/fun/selector/index.vue
index fb9d8b8..dbdce9f 100644
--- a/src/views/fun/selector/index.vue
+++ b/src/views/fun/selector/index.vue
@@ -1,6 +1,6 @@
多云转晴
@@ -30,7 +30,7 @@
diff --git a/src/views/fun/cropper/index.vue b/src/views/fun/cropper/index.vue
index d1c3abf..06b8eb1 100644
--- a/src/views/fun/cropper/index.vue
+++ b/src/views/fun/cropper/index.vue
@@ -11,7 +11,12 @@
![]()
- 更换头像
+
+
+
+ 更换头像
+
点击打印演示
+
+
diff --git a/src/views/fun/qrcode/index.vue b/src/views/fun/qrcode/index.vue
index 2536aed..85b4b7f 100644
--- a/src/views/fun/qrcode/index.vue
+++ b/src/views/fun/qrcode/index.vue
@@ -11,7 +11,12 @@
- 重新生成
+
+
+
+ 重新生成
+
{{ v.v1 }}
{{ v.v2 }}
-
+
{{ v.v3 }}
{{ v.v5 }}
@@ -46,23 +46,23 @@
-
+
-
设备
+ 园区设备数
99
-
+
-
预警
+ 预警设备数
10
-
+
@@ -207,7 +207,7 @@ import { useStore } from '/@/store/index';
import ChartHead from '/@/views/chart/head.vue';
import * as echarts from 'echarts';
import 'echarts-wordcloud';
-import { skyList, dBtnList, chartData4List, earth3DBtnList } from '/@/views/chart/chart';
+import { skyList, dBtnList, chartData4List } from '/@/views/chart/chart';
export default {
name: 'chartIndex',
components: { ChartHead },
@@ -219,7 +219,6 @@ export default {
skyList,
dBtnList,
chartData4List,
- earth3DBtnList,
myCharts: [],
});
// 设置主内容的高度
diff --git a/src/views/fun/countup/index.vue b/src/views/fun/countup/index.vue
index 839e99a..1b56ce3 100644
--- a/src/views/fun/countup/index.vue
+++ b/src/views/fun/countup/index.vue
@@ -23,7 +23,12 @@
-
运行
+ 运行设备数
20
- 重置/刷新数值
+
+
+
+ 重置/刷新数值
+
-
+
@@ -40,7 +40,7 @@ export default defineComponent({
a2: '输入框前置内容，只能字体图标',
a3: 'string',
a4: '',
- a5: 'el-icon-thumb',
+ a5: 'elementPointer',
},
{
a1: 'placeholder',
@@ -67,7 +67,7 @@ export default defineComponent({
a1: 'type',
a2: 'icon 图标类型',
a3: 'string',
- a4: 'ali / ele / awe',
+ a4: 'ali / ele / awe / all',
a5: 'ele',
},
{
diff --git a/src/views/fun/tagsView/index.vue b/src/views/fun/tagsView/index.vue
index 0fb84e0..dc7ac12 100644
--- a/src/views/fun/tagsView/index.vue
+++ b/src/views/fun/tagsView/index.vue
@@ -9,27 +9,52 @@
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 8854cf7..bb7fb58 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -74,7 +74,7 @@
- 刷新当前页
+
+
+
+ 刷新当前页
+
- 关闭当前页
+
+
+
+ 关闭当前页
+
- 关闭其它
+
+
+
+ 关闭其它
+
- 全部关闭
+
+
+
+ 全部关闭
+
- 当前页全屏
+
+
+
+ 当前页全屏
+
-
+
{{ v.label }}
diff --git a/src/views/limits/backEnd/page/index.vue b/src/views/limits/backEnd/page/index.vue
index 1f6a950..fdcfc65 100644
--- a/src/views/limits/backEnd/page/index.vue
+++ b/src/views/limits/backEnd/page/index.vue
@@ -8,7 +8,12 @@
type="warning"
:closable="false"
>
-
- 新增
+
+
+
+ 新增
+
- 编辑
+
+
+
+ 编辑
+
- 删除
+
+
+
+ 删除
+
- 跳转
+
+
+
+ 跳转
+
- 新增
+
+
+
+ 新增
+
- 编辑
+
+
+
+ 编辑
+
- 删除
+
+
+
+ 删除
+
- 跳转
+
+
+
+ 跳转
+
- 新增
+
+
+
+ 新增
+
- 编辑
+
+
+
+ 编辑
+
- 删除
+
+
+
+ 删除
+
- 跳转
+
+
+
+ 跳转
+
- 新增
+
+
+
+ 新增
+
- 编辑
+
+
+
+ 编辑
+
- 删除
+
+
+
+ 删除
+
- 跳转
+
+
+
+ 跳转
+
- 新增
+
+
+
+ 新增
+
- 编辑
+
+
+
+ 编辑
+
- 删除
+
+
+
+ 删除
+
- 跳转
+
+
+
+ 跳转
+
- 新增
+
+
+
+ 新增
+
- 编辑
+
+
+
+ 编辑
+
- 删除
+
+
+
+ 删除
+
- 跳转
+
+
+
+ 跳转
+
- 新增
+
+
+
+ 新增
+
- 编辑
+
+
+
+ 编辑
+
- 删除
+
+
+
+ 删除
+
@@ -92,23 +93,24 @@ export default defineComponent({
});
// 登录
const onSignIn = async () => {
+ // 模拟数据
state.loading.signIn = true;
- let defaultAuthPageList: Array = [];
+ let defaultRoles: Array = [];
let defaultAuthBtnList: Array = [];
- // admin 页面权限标识，对应路由 meta.auth，用于控制路由的显示/隐藏
- let adminAuthPageList: Array = ['admin'];
+ // admin 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
+ let adminRoles: Array = ['admin'];
// admin 按钮权限标识
let adminAuthBtnList: Array = ['btn.add', 'btn.del', 'btn.edit', 'btn.link'];
- // test 页面权限标识，对应路由 meta.auth，用于控制路由的显示/隐藏
- let testAuthPageList: Array = ['test'];
+ // test 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
+ let testRoles: Array = ['common'];
// test 按钮权限标识
let testAuthBtnList: Array = ['btn.add', 'btn.link'];
// 不同用户模拟不同的用户权限
if (state.ruleForm.userName === 'admin') {
- defaultAuthPageList = adminAuthPageList;
+ defaultRoles = adminRoles;
defaultAuthBtnList = adminAuthBtnList;
} else {
- defaultAuthPageList = testAuthPageList;
+ defaultRoles = testRoles;
defaultAuthBtnList = testAuthBtnList;
}
// 用户信息模拟数据
@@ -119,7 +121,7 @@ export default defineComponent({
? 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg'
: 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=317673774,2961727727&fm=26&gp=0.jpg',
time: new Date().getTime(),
- authPageList: defaultAuthPageList,
+ roles: defaultRoles,
authBtnList: defaultAuthBtnList,
};
// 存储 token 到浏览器缓存
diff --git a/src/views/login/component/mobile.vue b/src/views/login/component/mobile.vue
index 884eb12..99bc36c 100644
--- a/src/views/login/component/mobile.vue
+++ b/src/views/login/component/mobile.vue
@@ -1,28 +1,20 @@
-
+
+
+
+
-
+
+
{{ $t('message.mobile.codeText') }}
@@ -58,9 +50,6 @@ export default defineComponent({
diff --git a/src/views/system/menu/component/addMenu.vue b/src/views/system/menu/component/addMenu.vue
index ceb2d22..1bc96f0 100644
--- a/src/views/system/menu/component/addMenu.vue
+++ b/src/views/system/menu/component/addMenu.vue
@@ -1,89 +1,138 @@
-