Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
Project
Project
Details
Activity
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
ReactWeb5
CivManage
Commits
81646cbf
Commit
81646cbf
authored
1 year ago
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '首页功能优化,日志管理重构'
parent
e89bdbec
Pipeline
#78665
passed with stages
Changes
7
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
192 additions
and
22 deletions
+192
-22
index.jsx
src/pages/homePage/index.jsx
+0
-0
index.less
src/pages/homePage/index.less
+37
-0
index.jsx
src/pages/log/logCenter/index.jsx
+0
-0
index.less
src/pages/log/logCenter/index.less
+136
-12
index.jsx
src/pages/user/login/index.jsx
+4
-4
config.js
src/routes/config.js
+6
-6
api.js
src/services/logCenter/api.js
+9
-0
No files found.
src/pages/homePage/index.jsx
View file @
81646cbf
This diff is collapsed.
Click to expand it.
src/pages/homePage/index.less
View file @
81646cbf
...
...
@@ -611,6 +611,30 @@
width: 100%;
height: calc(100% - 60px);
overflow: hidden;
.sort {
width: 22px;
height: 22px;
border-radius: 50%;
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
margin: auto;
&[type='1'] {
color: #fb0909;
border: 2px solid #faa0a0;
}
&[type='2'] {
color: #fb6a09;
border: 2px solid #f07942;
}
&[type='3'] {
color: #fbba09;
border: 2px solid #f8e680;
}
}
:global {
.ant-table-wrapper {
height: 100%;
...
...
@@ -632,6 +656,19 @@
}
}
}
.ant-tabs-tab {
padding: 8px 8px;
}
.ant-tabs-tab-active {
padding: 8px 8px;
}
.ant-tabs-tabpane {
padding-left: 12px;
}
.ant-tabs-content-left {
height: 100%;
}
}
}
.gisMessage {
...
...
This diff is collapsed.
Click to expand it.
src/pages/log/logCenter/index.jsx
View file @
81646cbf
This diff is collapsed.
Click to expand it.
src/pages/log/logCenter/index.less
View file @
81646cbf
.centerLog {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
overflow-y: hidden;
.head {
padding: 10px;
background: white;
margin-bottom: 2px;
width: 100%;
height: 32px;
display: flex;
align-items: center;
flex-wrap: no-wrap;
}
.content {
width: 100%;
height: calc(100% - 40px);
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
.left {
width: 65%;
height: 100%;
.table {
width: 100%;
background-color: white;
padding: 10px;
overflow: hidden;
margin-bottom: 3px;
height: calc(100vh - 210px);
:global {
.ant-table-wrapper {
height: 100%;
.ant-spin-nested-loading {
height: 100%;
.ant-spin-container {
height: 100%;
.ant-table.ant-table-small {
height: 100%;
.ant-table-container {
height: 100%;
}
}
}
}
}
}
}
.footer {
width: 100%;
height: 42px;
background-color: white;
display: flex;
justify-content: flex-end;
padding: 10px;
}
}
.right {
width: 34%;
height: 100%;
:global {
::-webkit-scrollbar-thumb {
border-radius: 0;
}
::-webkit-scrollbar {
display: none;
}
}
.table {
width: 100%;
background-color: white;
padding: 10px;
overflow: hidden;
margin-bottom: 3px;
height: calc(100vh - 210px);
.sort {
width: 22px;
height: 22px;
border-radius: 50%;
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
margin: auto;
&[type='1'] {
color: #fb0909;
border: 2px solid #faa0a0;
}
&[type='2'] {
color: #fb6a09;
border: 2px solid #f07942;
}
&[type='3'] {
color: #fbba09;
border: 2px solid #f8e680;
}
}
:global {
.ant-table-wrapper {
height: 100%;
.ant-spin-nested-loading {
height: 100%;
.ant-spin-container {
height: 100%;
.ant-table {
height: 100%;
.ant-table-container {
height: 100%;
}
}
}
}
}
.ant-table-row-level-0 {
height: 65px;
}
}
}
.footer {
width: 100%;
height: 42px;
background-color: white;
display: flex;
justify-content: flex-end;
padding: 10px;
}
}
}
.table {
flex: 1;
width: 100%;
background-color: white;
padding: 10px;
overflow: hidden;
margin-bottom: 3px;
height: calc(100vh - 210px);
:global {
.ant-table-wrapper {
height: 100%;
...
...
@@ -26,26 +153,23 @@
.ant-spin-nested-loading {
height: 100%;
.ant-spin-container{
.ant-spin-container
{
height: 100%;
.ant-table.ant-table-small{
.ant-table.ant-table-small
{
height: 100%;
.ant-table-container {
height: 100%;
}
}
}
}
}
}
}
.footer{
.footer {
width: 100%;
height: 42px;
background-color: white;
...
...
This diff is collapsed.
Click to expand it.
src/pages/user/login/index.jsx
View file @
81646cbf
...
...
@@ -52,11 +52,11 @@ const Login = props => {
sessionStorage
.
setItem
(
'userType'
,
AUTHORITY
[
userMode
]);
sessionStorage
.
setItem
(
'userName'
,
userName
);
if
(
userMode
===
USER_MODE
.
SUPER
)
{
history
.
push
(
`/solution`
);
//
history.push(`/homePage`);
//
history.push(`/solution`);
history
.
push
(
`/homePage`
);
}
else
{
history
.
push
(
`/authority/user`
);
//
history.push(`/homePage`);
//
history.push(`/authority/user`);
history
.
push
(
`/homePage`
);
}
}
if
(
userMode
===
USER_MODE
.
COMMON
)
{
...
...
This diff is collapsed.
Click to expand it.
src/routes/config.js
View file @
81646cbf
...
...
@@ -192,6 +192,12 @@ export default {
path
:
'/'
,
component
:
BasicLayout
,
routes
:
[
{
path
:
'/homePage'
,
name
:
'首页'
,
icon
:
<
HomeOutlined
style
=
{
iconStyle
}
/>
,
component
:
HomePage
,
},
{
path
:
'/solution'
,
name
:
'解决方案'
,
...
...
@@ -199,12 +205,6 @@ export default {
authority
:
superAuthority
,
component
:
CurrentSolution
,
},
{
path
:
'/homePage'
,
name
:
'仪表盘'
,
icon
:
<
HomeOutlined
style
=
{
iconStyle
}
/>
,
component
:
HomePage
,
},
{
path
:
'/dbm'
,
name
:
'数据库'
,
...
...
This diff is collapsed.
Click to expand it.
src/services/logCenter/api.js
View file @
81646cbf
...
...
@@ -10,3 +10,12 @@ import { get, PUBLISH_SERVICE, post, postForm } from '../index';
// 获取错误日志、业务日志、第三方调用日志
export
const
GetCallLogPages
=
data
=>
post
(
`/PandaCore/GCK/Log/GetCallLogPages`
,
data
);
export
const
GetWayNumberofcalls
=
params
=>
post
(
`/PandaCore/GCK/Log/GetWayNumberofcalls`
,
params
);
// 菜单访问记录
export
const
GetAccessLog
=
params
=>
post
(
`
${
PUBLISH_SERVICE
}
/LogCenter/GetAccessLog`
,
params
);
// 设备控制记录
export
const
GetRemoteOperationLog
=
params
=>
post
(
`/PandaMonitor/Monitor/Device/GetRemoteOperationLog`
,
params
);
This diff is collapsed.
Click to expand it.
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