From 343e6c2730ffb99db591732ff5ef1494e233c6bc Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 15 二月 2023 14:09:17 +0800
Subject: [PATCH] 系统监控，修改
---
src/assets/img/systemMonitoring/图层 39 - 副本.png | 0
src/assets/img/systemMonitoring/图层 39.png | 0
src/views/maintenance/systemMonitoring.vue | 42 ++++++++++++++++++++++++------------------
src/components/navMenu.vue | 3 +++
src/views/userManage/roleManage.vue | 3 ++-
5 files changed, 29 insertions(+), 19 deletions(-)
diff --git "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39 - \345\211\257\346\234\254.png" "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39 - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..26ecbd1
--- /dev/null
+++ "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39 - \345\211\257\346\234\254.png"
Binary files differ
diff --git "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png" "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png"
index 26ecbd1..154a847 100644
--- "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png"
+++ "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png"
Binary files differ
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 6b07d55..74fc41e 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -187,6 +187,9 @@
this.$router.push('/');
},
getTimeCookies() {
+ if(!localStorage.getItem('LFToken')){
+ return false
+ }
var time1 = new Date(JSON.parse(localStorage.getItem('LFToken')).time);
var time2 = new Date();
if (time2 > time1) {
diff --git a/src/views/maintenance/systemMonitoring.vue b/src/views/maintenance/systemMonitoring.vue
index 0e4b89f..0abf4a6 100644
--- a/src/views/maintenance/systemMonitoring.vue
+++ b/src/views/maintenance/systemMonitoring.vue
@@ -6,7 +6,7 @@
]"></My-bread>
<el-divider />
<div class="content_Box">
- <div class="cloumn_Box1">
+ <div class="cloumn_Box1">
<div class="flex_Box1 subpage_Div">
<el-tabs
v-model="activeName"
@@ -486,6 +486,7 @@
type: 'category',
boundaryGap: false,
data: ['', '', '', '', '', '', ''],
+
},
yAxis: [
{
@@ -507,6 +508,16 @@
type: 'line',
showSymbol: false,
data: valueList,
+ // itemStyle: {
+ // normal: {
+ // color: "#009cff", //鏀瑰彉鎶樼嚎鐐圭殑棰滆壊
+ // lineStyle: {
+ // color: "#009cff", //鏀瑰彉鎶樼嚎棰滆壊
+ // },
+ // },
+ // }
+
+
},
],
};
@@ -674,7 +685,7 @@
left: 'center',
textStyle: {
fontSize: 18, //瀛椾綋澶у皬
-
+
},
},
series: [
@@ -868,11 +879,11 @@
height: 98%;
width: 98%;
padding: 1%;
-
+
.content_Box {
width: 100%;
height: 90%;
-
+
display: flex;
flex-direction: column;
justify-content: space-around;
@@ -885,10 +896,9 @@
.flex_Box {
width: 30.5%;
height: 88%;
-
+
border-radius: 5px;
padding: 1%;
-
.image1 {
width: 46px;
@@ -916,8 +926,8 @@
}
}
.ycsBox {
- width: 200px;
- height: 200px;
+ width: 495px;
+ height: 182px;
background: url("../../assets/img/systemMonitoring/鍥惧眰 39.png")
no-repeat;
background-size: 100% 100%;
@@ -929,13 +939,14 @@
width: 100%;
padding: 1%;
height: 80%;
+
display: flex;
justify-content: center;
}
}
.imageTitle {
float: left;
-
+
margin-left: 10px;
}
.ycTltle {
@@ -953,7 +964,7 @@
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 300;
- color: #ffffff;
+
line-height: 49px;
// margin-top: 20px;
@@ -981,9 +992,8 @@
.height_title {
width: 100%;
height: 48%;
-
+
p {
-
margin-top: 3%;
font-size: 24px;
}
@@ -1006,21 +1016,17 @@
width: 64%;
height: 92%;
padding: 1%;
-
+
border-radius: 5px;
-
}
.flex_Box {
width: 30.5%;
height: 92%;
-
+
border-radius: 5px;
padding: 1%;
-
}
}
}
-
-
}
</style>
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index d36b507..3ee17f8 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -217,12 +217,13 @@
>
<template slot-scope="scope">
<el-button
+ plain
v-if="menuStatus.update"
type="warning"
@click="handleEdit(scope.$index, scope.row)"
size="small"
>{{ $t('common.update') }}</el-button>
- <el-button
+ <el-button plain
@click="showDetail(scope.$index, scope.row)"
size="small"
>{{ $t('common.see') }}</el-button>
--
Gitblit v1.9.3