Compare commits

4 Commits

Author SHA1 Message Date
fanzhuxian
589fe19fd8 fix:修复无法滚动 2025-03-10 15:51:26 +08:00
fanzhuxian
ace5561ca5 fix:修复编译的警告 2025-03-10 14:37:09 +08:00
fanzhuxian
dd3fcae3cc fix:node-sass替换成sass 2025-03-10 10:02:35 +08:00
fanzhuxian
4510f058c3 fix:合并登录页 2025-03-06 15:46:52 +08:00
9 changed files with 9407 additions and 13901 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -29,8 +29,8 @@
"js-cookie": "^2.2.1",
"less": "^4.1.1",
"less-loader": "^5.0.0",
"mavon-editor": "^2.6.17",
"node-sass": "^4.14.1",
"mavon-editor": "^2.6.17",
"sass": "^1.58.0",
"vue": "^2.6.10",
"vue-codemirror": "^4.0.6",
"vue-cropperjs": "^3.0.0",

View File

@@ -37,6 +37,7 @@ a {
width: auto;
height: 100%;
padding: 10px;
overflow-y: scroll;
/* overflow-y: scroll; */
box-sizing: border-box;
}
@@ -178,8 +179,7 @@ a {
.content-wrapper{
width: 100%;
height: 100%;
background: #fff;
border-radius: 4px;
padding: 21px;
}
padding: 21px;
}

View File

@@ -60,26 +60,27 @@
methods: {
async getMenus() {
const data = await getMenus({entity:{resourceSystem:localStorage.getItem('platform')}});
const data1 = await getMenus({entity:{resourceSystem:'Auth'}});
const data2 = await getMenus({entity:{resourceSystem:'DataX'}});
const data3 = await getMenus({entity:{resourceSystem:'Enginex'}});
// console.log('菜单接口返回的数据',data);
if (data.status === "0") {
this.$message.error(data.msg);
if (data.error === "01000103") {
if (localStorage.getItem('platform') === 'Auth') {
this.$router.push('/loginAuth')
} else if (localStorage.getItem('platform') === 'DataX') {
this.$router.push('/loginDatax')
} else if (localStorage.getItem('platform') === 'Enginex') {
this.$router.push('/loginEnginex')
}
}
}
// if (data.status === "0") {
// this.$message.error(data.msg);
// if (data.error === "01000103") {
// if (localStorage.getItem('platform') === 'Auth') {
// this.$router.push('/loginAuth')
// } else if (localStorage.getItem('platform') === 'DataX') {
// this.$router.push('/loginDatax')
// } else if (localStorage.getItem('platform') === 'Enginex') {
// this.$router.push('/loginEnginex')
// }
// }
// }
this.items = data.data;
this.items = [...data1.data, ...data2.data, ...data3.data];
if(this.items.length == 0){
this.$message.error('您没有导航权限,请联系管理员');
}
// console.log("items", this.items);
}
}
};

View File

@@ -9,39 +9,20 @@
</el-row>
</div>
<div class="tab-wrapper">
<!-- <el-tabs v-model="tabs" @tab-click="pager.pageNum=1;getlist()">
<el-tab-pane label="EngineX" name="EngineX"></el-tab-pane>
<el-tab-pane label="DataX" name="DataX"></el-tab-pane>
</el-tabs> -->
<div v-loading="loading">
<el-table border ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column prop="code" width="200" label="资源编号">
</el-table-column>
<el-table-column prop="name" label="名称" width="" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="url" label="路径" width="" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="icon" label="图标" width="" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="sort" label="排序" width="" show-overflow-tooltip>
</el-table-column>
<el-table-column type="selection" width="55" />
<el-table-column prop="code" width="200" label="资源编号" />
<el-table-column prop="name" label="名称" width="" show-overflow-tooltip />
<el-table-column prop="url" label="路径" width="" show-overflow-tooltip />
<el-table-column prop="icon" label="图标" width="" show-overflow-tooltip />
<el-table-column prop="sort" label="排序" width="" show-overflow-tooltip />
<el-table-column prop="birth" label="创建时间" width="" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.birth|formatDate}}
</template>
</el-table-column>
<el-table-column label="操作" align="center" size="s">
<template slot-scope="scope">
<el-tooltip content="编辑" placement="left">

View File

@@ -19,7 +19,7 @@ export default new Router({
*/
// 决策引擎系统 - 登录
{
path: '/loginEnginex',
path: '/login',
component: () => import('../components/page/LoginEnginex.vue'),
meta: { title: '登录' }
},
@@ -42,15 +42,19 @@ export default new Router({
component: () => import('../components/common/Home.vue'),
meta: { title: '自述文件' },
children: [
{
path: '/dashboardEnginex',
component: () => {
const userRole = localStorage.getItem('platform');
return import('../components/page/DashboardEnginex.vue');
},
meta: { title: '系统首页' }
},
{
path: '/dashboard',
component: () => {
const userRole = localStorage.getItem('platform');
if (userRole === 'DataX') {
return import('../components/page/DashboardDatax.vue');
} else {
return import('../components/page/DashboardEnginex.vue');
}
return import('../components/page/DashboardDatax.vue');
},
meta: { title: '系统首页' }
},

View File

@@ -1,8 +1,9 @@
@import './variables.scss';
@import './mixin.scss';
@import './transition.scss';
@import './element-ui.scss';
@import './sidebar.scss';
@use './mixin.scss';
@use './transition.scss';
@use './element-ui.scss';
@use './variables.scss';
@use './sidebar.scss';
body {
-moz-osx-font-smoothing: grayscale;

View File

@@ -1,3 +1,5 @@
@use './variables.scss';
#app {
// 主体区域
@@ -69,9 +71,9 @@
.sidebar-container .nest-menu .el-submenu>.el-submenu__title,
.sidebar-container .el-submenu .el-menu-item {
min-width: 180px !important;
background-color: $subMenuBg !important;
background-color: variables.$subMenuBg !important;
&:hover {
background-color: $menuHover !important;
background-color: variables.$menuHover !important;
}
}
.el-menu--collapse .el-menu .el-submenu {

9360
h5-enginex-manager/yarn.lock Normal file

File diff suppressed because it is too large Load Diff