From fb2bf08ea4c74e09c557c975689176b3e8683e44 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期六, 09 十月 2021 18:55:30 +0800
Subject: [PATCH] 样式修改v1
---
src/pages/vindicate/index/App.vue | 11 +++++++----
src/pages/settings/views/keyboardLanguage.vue | 2 +-
src/pages/vindicate/views/sysInfo.vue | 4 ++--
package.json | 1 +
src/pages/vindicate/views/updateSettings.vue | 27 +++++++++++++++++++++------
src/pages/settings/views/generalSettings.vue | 2 +-
src/pages/vindicate/views/restartSettings.vue | 4 ++--
src/pages/vindicate/views/systemClean.vue | 4 ++--
8 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/package.json b/package.json
index 99373e8..25b6709 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
"stylus-loader": "^3.0.2",
"vue": "^2.6.11",
"vue-awesome-swiper": "^3.1.3",
+ "vue-d3-network": "^0.1.28",
"vue-i18n": "^8.25.1",
"vue-js-toggle-button": "^1.3.3",
"vue-photo-preview": "^1.1.3",
diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 6adaf69..51d202a 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -580,7 +580,7 @@
overflow: auto;
box-sizing: border-box;
flex-shrink: 0;
- padding: 24px 10px;
+ padding: 10px 10px;
border-right: 4px solid #f2f2f7;
background-color: #fbfaff;
diff --git a/src/pages/settings/views/keyboardLanguage.vue b/src/pages/settings/views/keyboardLanguage.vue
index c8a7d6c..c071b89 100644
--- a/src/pages/settings/views/keyboardLanguage.vue
+++ b/src/pages/settings/views/keyboardLanguage.vue
@@ -169,7 +169,7 @@
overflow: auto;
box-sizing: border-box;
flex-shrink: 0;
- padding: 24px 10px 0px 10px;
+ padding: 10px 10px 0px 10px;
background-color: #FBFAFF;
border-right: 4px solid #F2F2F7;
.menu-item {
diff --git a/src/pages/vindicate/index/App.vue b/src/pages/vindicate/index/App.vue
index 7c9649d..a8a86ce 100644
--- a/src/pages/vindicate/index/App.vue
+++ b/src/pages/vindicate/index/App.vue
@@ -1,5 +1,5 @@
<template>
- <div class="container" v-if="!showWelcome">
+ <div class="container vindicate" v-if="!showWelcome">
<div class="container-left">
<div
class="left-card"
@@ -288,7 +288,7 @@
background-color: rgba(251, 251, 255, 0.1);
backdrop-filter: blur(4px);
float: left;
- width: 46%;
+ width: 442px;
height: 190px;
margin: 0 15px;
margin-bottom: 30px;
@@ -343,10 +343,9 @@
overflow: auto;
box-sizing: border-box;
flex-shrink: 0;
- padding: 17px 10px 0 10px;
+ padding: 13px 10px 0 10px;
box-sizing: border-box;
background: #fff;
- border-top:2px solid #E1E0E6 ;
.left-card {
position: relative;
width: 224px;
@@ -399,6 +398,10 @@
}
}
+
+.vindicate {
+ border-top:2px solid #E1E0E6 ;
+}
</style>
diff --git a/src/pages/vindicate/views/restartSettings.vue b/src/pages/vindicate/views/restartSettings.vue
index 6515ca5..3e82121 100644
--- a/src/pages/vindicate/views/restartSettings.vue
+++ b/src/pages/vindicate/views/restartSettings.vue
@@ -348,8 +348,8 @@
color: #333;
font-weight: 700;
vertical-align: middle;
- border-top:2px solid #E1E0E6 ;
- border-left:2px solid #E1E0E6 ;
+ border-top: 4px solid #f2f2f7;
+ border-left: 4px solid #f2f2f7;
.t {
height: 48px;
background: #F2F2F7;
diff --git a/src/pages/vindicate/views/sysInfo.vue b/src/pages/vindicate/views/sysInfo.vue
index c4eb552..d9a327a 100644
--- a/src/pages/vindicate/views/sysInfo.vue
+++ b/src/pages/vindicate/views/sysInfo.vue
@@ -192,8 +192,8 @@
.v-sys-info {
width: 100%;
background-color: #FBFAFF;
- border-top:2px solid #E1E0E6 ;
- border-left:2px solid #E1E0E6 ;
+ border-top: 4px solid #f2f2f7;
+ border-left: 4px solid #f2f2f7;
.el-dialog__header {
padding: 15px 20px 10px;
text-align: left;
diff --git a/src/pages/vindicate/views/systemClean.vue b/src/pages/vindicate/views/systemClean.vue
index 592f197..5366b39 100644
--- a/src/pages/vindicate/views/systemClean.vue
+++ b/src/pages/vindicate/views/systemClean.vue
@@ -127,8 +127,8 @@
.clear {
position: relative;
padding: 10px;
- border-top:2px solid #E1E0E6 ;
- border-left:2px solid #E1E0E6 ;
+ border-top: 4px solid #f2f2f7;
+ border-left: 4px solid #f2f2f7;
.clear-list {
background: #F2F2F7;
diff --git a/src/pages/vindicate/views/updateSettings.vue b/src/pages/vindicate/views/updateSettings.vue
index 65355e6..589f84a 100644
--- a/src/pages/vindicate/views/updateSettings.vue
+++ b/src/pages/vindicate/views/updateSettings.vue
@@ -372,16 +372,16 @@
flex: 1;
flex-basis: auto;
box-sizing: border-box;
- border-top:2px solid #E1E0E6 ;
- border-left:2px solid #E1E0E6 ;
+ border-top:4px solid rgb(242, 242, 247) ;
+ border-left:4px solid rgb(242, 242, 247) ;
.cluster-center {
height: 100%;
width: 300px;
overflow: auto;
box-sizing: border-box;
flex-shrink: 0;
- padding: 24px 10px 0 10px;
- border-right: 4px solid #f8f8f8;
+ padding: 9px 10px 0 10px;
+ border-right: 4px solid rgb(242, 242, 247);
.menu-item {
height: 56px;
@@ -697,12 +697,12 @@
}
}
.wifi {
- padding: 10px 0 0 10px;
+ padding: 10px 10px 0 10px;
.bar {
display: flex;
align-items: center;
height: 50px;
- background-color: #f8f8f8;
+ background-color: #F2F2F7;
justify-content: space-between;
border-radius: 12px;
margin-bottom: 4px;
@@ -724,9 +724,24 @@
height: 14px;
margin-right: 17px;
}
+
+ .el-switch__core {
+ width: 30px !important;
+ height: 14px !important;
+ &::after {
+ top: 0px !important;
+ left: 0px !important;
+ width: 12px !important;
+ height: 12px !important;
+ }
+ }
+
.is-checked .el-switch__core{
background-color: var(--colorCard) !important;
border: 1px solid var(--colorCard) !important;
+ &::after {
+ margin-left: 16px
+ }
}
}
--
Gitblit v1.8.0