Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
9
91isoft_sys_web
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张伯涛
91isoft_sys_web
Commits
53b1a3d8
Commit
53b1a3d8
authored
Dec 28, 2020
by
刘洪铨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登录
parent
98d9fb76
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
22 additions
and
22 deletions
+22
-22
.env.development
.env.development
+1
-1
menu.js
src/api/menu.js
+3
-3
loginInfo.js
src/api/monitor/loginInfo.js
+0
-0
operLog.js
src/api/monitor/operLog.js
+0
-0
permission.js
src/permission.js
+2
-2
index.js
src/router/index.js
+3
-3
permission.js
src/store/modules/permission.js
+1
-0
request.js
src/utils/request.js
+0
-1
index.vue
src/views/monitor/errorLog/index.vue
+1
-1
index.vue
src/views/monitor/loginInfo/index.vue
+2
-2
index.vue
src/views/monitor/operLog/index.vue
+5
-5
vue.config.js
vue.config.js
+4
-4
No files found.
.env.development
View file @
53b1a3d8
...
@@ -3,7 +3,7 @@ ENV = 'development'
...
@@ -3,7 +3,7 @@ ENV = 'development'
# base api
# base api
ZD_TEST
= '/dev-api'
VUE_APP_BASE_API
= '/dev-api'
# workFlow链接地址
# workFlow链接地址
# VUE_APP_WORKFLOW = 'http://106.2.17.219:10180'
# VUE_APP_WORKFLOW = 'http://106.2.17.219:10180'
VUE_APP_WORKFLOW = '/workFlow'
VUE_APP_WORKFLOW = '/workFlow'
...
...
src/api/menu.js
View file @
53b1a3d8
...
@@ -3,8 +3,8 @@ import request from '@/utils/request'
...
@@ -3,8 +3,8 @@ import request from '@/utils/request'
// 获取路由
// 获取路由
export
const
getRouters
=
()
=>
{
export
const
getRouters
=
()
=>
{
return
request
({
return
request
({
url
:
'/auth
ority
/getRouters'
,
url
:
'/auth/getRouters'
,
method
:
'get'
,
method
:
'get'
params
:
{
path
:
'/zhongtai'
}
//
params: { path: '/zhongtai' }
})
})
}
}
src/api/monitor/login
infor
.js
→
src/api/monitor/login
Info
.js
View file @
53b1a3d8
File moved
src/api/monitor/oper
l
og.js
→
src/api/monitor/oper
L
og.js
View file @
53b1a3d8
File moved
src/permission.js
View file @
53b1a3d8
...
@@ -3,7 +3,8 @@ import store from './store'
...
@@ -3,7 +3,8 @@ import store from './store'
import
{
Message
}
from
'element-ui'
import
{
Message
}
from
'element-ui'
import
NProgress
from
'nprogress'
// progress bar
import
NProgress
from
'nprogress'
// progress bar
import
'nprogress/nprogress.css'
// progress bar style
import
'nprogress/nprogress.css'
// progress bar style
import
{
getToken
}
from
'@/utils/auth'
// get token from cookie
import
{
getToken
}
from
'@/utils/auth'
import
de
from
"element-ui/src/locale/lang/de"
;
// get token from cookie
// import getPageTitle from '@/utils/get-page-title'
// import getPageTitle from '@/utils/get-page-title'
NProgress
.
configure
({
showSpinner
:
false
})
// NProgress Configuration
NProgress
.
configure
({
showSpinner
:
false
})
// NProgress Configuration
...
@@ -49,7 +50,6 @@ router.beforeEach((to, from, next) => {
...
@@ -49,7 +50,6 @@ router.beforeEach((to, from, next) => {
}
}
})
})
.
catch
(
err
=>
{
.
catch
(
err
=>
{
})
})
}
else
{
}
else
{
next
()
next
()
...
...
src/router/index.js
View file @
53b1a3d8
...
@@ -97,11 +97,11 @@ export const constantRoutes = [
...
@@ -97,11 +97,11 @@ export const constantRoutes = [
{
{
path: '/log',
path: '/log',
component: Layout,
component: Layout,
redirect: '/log/oper
l
og',
redirect: '/log/oper
L
og',
children: [{
children: [{
path: '/log/oper
l
og',
path: '/log/oper
L
og',
name: 'Operlog',
name: 'Operlog',
component: () => import('@/views/monitor/oper
l
og/index.vue'),
component: () => import('@/views/monitor/oper
L
og/index.vue'),
meta: { title: '操作日志', icon: 'dashboard' }
meta: { title: '操作日志', icon: 'dashboard' }
}]
}]
}*/
}*/
...
...
src/store/modules/permission.js
View file @
53b1a3d8
...
@@ -20,6 +20,7 @@ const permission = {
...
@@ -20,6 +20,7 @@ const permission = {
// 向后端请求路由数据
// 向后端请求路由数据
getRouters
().
then
(
res
=>
{
getRouters
().
then
(
res
=>
{
const
accessedRoutes
=
filterAsyncRouter
(
res
.
data
)
const
accessedRoutes
=
filterAsyncRouter
(
res
.
data
)
console
.
log
(
accessedRoutes
)
if
(
accessedRoutes
[
0
])
{
if
(
accessedRoutes
[
0
])
{
const
firstChild
=
getFirstChild
(
accessedRoutes
[
0
])
const
firstChild
=
getFirstChild
(
accessedRoutes
[
0
])
accessedRoutes
.
push
({
path
:
'*'
,
redirect
:
'/404'
,
hidden
:
true
})
accessedRoutes
.
push
({
path
:
'*'
,
redirect
:
'/404'
,
hidden
:
true
})
...
...
src/utils/request.js
View file @
53b1a3d8
...
@@ -19,7 +19,6 @@ const service = axios.create({
...
@@ -19,7 +19,6 @@ const service = axios.create({
// let loadingInstance = ''
// let loadingInstance = ''
// request拦截器
// request拦截器
service
.
interceptors
.
request
.
use
(
config
=>
{
service
.
interceptors
.
request
.
use
(
config
=>
{
debugger
// 请求开始 loading 开始
// 请求开始 loading 开始
/* const loadingCount = store.state.app.loadingCount
/* const loadingCount = store.state.app.loadingCount
console.log(loadingCount)
console.log(loadingCount)
...
...
src/views/monitor/errorLog/index.vue
View file @
53b1a3d8
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
v-hasPermi=
"['zt:oper
l
og:detail']"
v-hasPermi=
"['zt:oper
L
og:detail']"
size=
"mini"
size=
"mini"
type=
"text"
type=
"text"
@
click=
"handleView(scope.row,scope.index)"
@
click=
"handleView(scope.row,scope.index)"
...
...
src/views/monitor/login
infor
/index.vue
→
src/views/monitor/login
Info
/index.vue
View file @
53b1a3d8
...
@@ -128,10 +128,10 @@
...
@@ -128,10 +128,10 @@
</template>
</template>
<
script
>
<
script
>
import
{
list
,
delLogininfor
,
cleanLogininfor
,
exportLogininfor
}
from
'@/api/monitor/login
infor
'
import
{
list
,
delLogininfor
,
cleanLogininfor
,
exportLogininfor
}
from
'@/api/monitor/login
Info
'
export
default
{
export
default
{
name
:
'Login
infor
'
,
name
:
'Login
Info
'
,
data
()
{
data
()
{
return
{
return
{
// 遮罩层
// 遮罩层
...
...
src/views/monitor/oper
l
og/index.vue
→
src/views/monitor/oper
L
og/index.vue
View file @
53b1a3d8
...
@@ -70,20 +70,20 @@
...
@@ -70,20 +70,20 @@
</el-form-item>
</el-form-item>
<el-form-item
style=
"float: right"
>
<el-form-item
style=
"float: right"
>
<el-button
<el-button
v-hasPermi=
"['zt:oper
l
og:delete']"
v-hasPermi=
"['zt:oper
L
og:delete']"
type=
"danger"
type=
"danger"
size=
"small"
size=
"small"
:disabled=
"ids.length === 0"
:disabled=
"ids.length === 0"
@
click=
"handleDelete"
@
click=
"handleDelete"
>
删除
</el-button>
>
删除
</el-button>
<el-button
<el-button
v-hasPermi=
"['zt:oper
l
og:clear']"
v-hasPermi=
"['zt:oper
L
og:clear']"
type=
"danger"
type=
"danger"
size=
"small"
size=
"small"
@
click=
"handleClean"
@
click=
"handleClean"
>
清空
</el-button>
>
清空
</el-button>
<el-button
<el-button
v-hasPermi=
"['zt:oper
l
og:export']"
v-hasPermi=
"['zt:oper
L
og:export']"
type=
"success"
type=
"success"
size=
"small"
size=
"small"
@
click=
"handleExport"
@
click=
"handleExport"
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
v-hasPermi=
"['zt:oper
l
og:detail']"
v-hasPermi=
"['zt:oper
L
og:detail']"
size=
"mini"
size=
"mini"
type=
"text"
type=
"text"
@
click=
"handleView(scope.row,scope.index)"
@
click=
"handleView(scope.row,scope.index)"
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
</template>
</template>
<
script
>
<
script
>
import
{
list
,
delOperlog
,
cleanOperlog
,
exportOperlog
}
from
'@/api/monitor/oper
l
og'
import
{
list
,
delOperlog
,
cleanOperlog
,
exportOperlog
}
from
'@/api/monitor/oper
L
og'
export
default
{
export
default
{
name
:
'Operlog'
,
name
:
'Operlog'
,
...
...
vue.config.js
View file @
53b1a3d8
...
@@ -78,15 +78,15 @@ module.exports = {
...
@@ -78,15 +78,15 @@ module.exports = {
// ['^' + process.env.VUE_APP_INTERNAL]: ''
// ['^' + process.env.VUE_APP_INTERNAL]: ''
// }
// }
// },
// },
[
process
.
env
.
ZD_TEST
]:
{
[
process
.
env
.
VUE_APP_BASE_API
]:
{
// target: `http://192.168.1.17:10010/internal`,
// target: `http://192.168.1.17:10010/internal`,
// target: `http://10.5.87.231:10010/internal`,
// target: `http://10.5.87.231:10010/internal`,
target
:
`http://
localhost
:8082/`
,
target
:
`http://
127.0.0.1
:8082/`
,
changeOrigin
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
pathRewrite
:
{
[
'^'
+
process
.
env
.
ZD_TEST
]:
''
[
'^'
+
process
.
env
.
VUE_APP_BASE_API
]:
''
}
}
}
,
}
}
}
},
},
configureWebpack
:
{
configureWebpack
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment