解决冲突

src/components/commonTable/index.vue

@@ -224,3 +224,24 @@ watch(
   }
 }
 </style>
+<<<<<<< HEAD
+
+<style lang="scss">
+.el-table__header,
+.el-table__body {
+  width: 100% !important;
+}
+
+.el-table__header th { user-select: none; }
+
+.el-table {
+  // 设置表头样式
+  th.el-table__cell {
+    // background-color: #f5f7fa !important;
+    color: #606266;
+    font-weight: 600;
+  }
+}
+</style>
+=======
+>>>>>>> 14bd703db4380d50659b719495c761ed24c2c0d5

src/css/elementUiSelf.css

@@ -16,29 +16,29 @@
 }
 
 .el-table__header {
-    border-top: 1px solid var(--table-border-color);
+    border-top: 0px solid var(--table-border-color);
 }
 
 .el-table__header th{
     background-color: var(--table-head-bg-color) !important;
-    border-bottom-color: var(--table-item-border-color) !important;
+    border-bottom-color: transparent !important;
 }
 .el-table__body td {
-    border-bottom-color: var(--table-item-border-color) !important;
+    border-bottom-color: transparent !important;
 }
 .el-table--border .el-table__inner-wrapper:after {
-    height: 0.9px !important;
+    height: 0px !important;
 }
 .el-table--border .el-table__inner-wrapper:after, .el-table--border:after, .el-table--border:before, .el-table__inner-wrapper:before {
-    background-color: var(--table-border-color) !important;
+    background-color: transparent !important;
 }
 .el-table__border-left-patch {
     background-color: var(--table-border-color) !important;
-    width: 0.9px;
+    width: 0px;
 }
 .el-table--border:after {
-    background-color: var(--table-border-color) !important;
+    background-color: transparent !important;
 }
 .el-table--border .el-table__cell {
-    border-right: none !important;
+    border-right: transparent !important;
 }

src/layout/menuCom.vue

@@ -214,15 +214,4 @@ const getMenuTitle = (item) => {
   }
 }
 
-.el-menu-item {
-  // background: #055F7CFF !important;
-}
-
-.submenu-box .is-active {
-  // background-color: #fff !important;
-  span {
-    // color: #055f7c !important;
-  }
-}
-
 </style>
\ No newline at end of file

src/main.js

 import { createApp } from "vue";
-import "./style.css";
-import "./theme.scss";
 import App from "./App.vue";
 import { router } from "./router";
 import "@/router/routePermission.js";
@@ -11,6 +9,8 @@ import * as ElementPlusIconsVue from "@element-plus/icons-vue";
 import { createPinia } from "pinia";
 import moment from 'moment';
 import { startPermissionCheck, stopPermissionCheck } from '@/utils/permissionChecker';
+import "./style.css";
+import "./theme.scss";
 
 
 const app = createApp(App);

src/style.css

@@ -44,9 +44,9 @@
     margin: 0;
 }
 
-.page-container {
+.page-container,.my-agency,.equipment-management {
     width: 100%;
-    background: #181d21;
+    background: #181d21 !important;
     border-radius: 6px;
     box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.10);
     padding: 1rem;
@@ -54,16 +54,16 @@
 }
 
 .view-btn {
-  color: var(--success) !important;
+  color: #2182a0 !important;
 }
 
 .edit-btn {
-  color: var(--success) !important;
+  color: #2182a0 !important;
 }
 
 .el-button--primary {
-    background-color: var(--chart-blue) !important;
-    border-color: var(--chart-blue) !important;
+    background-color: #2182a0 !important;
+    border-color: #2182a0 !important;
 }
 
 .login-container .el-form-item {
@@ -89,9 +89,7 @@ select:-webkit-autofill {
 .el-menu { 
     border-right: unset !important;
 }
-.el-menu-item:hover {
-    background: transparent !important;
-}
+
 .el-menu-item .is-active{
     background: transparent !important;
 }
@@ -99,4 +97,8 @@ select:-webkit-autofill {
 .el-breadcrumb__item:last-child .el-breadcrumb__inner {
     color: #ccc !important;
     padding-left: 16px;
+}
+
+.el-progress-bar__outer {
+    background-color: #4e4e4e;
 }
\ No newline at end of file

src/theme.scss

@@ -220,7 +220,45 @@
     background-color: #181d21 !important;
   }
 }
+.common-table {
+  
+  .el-table tr,.el-table th.el-table__cell {
+    background-color: #101418 !important;
+    color: #ccc !important;
+  }
+
+  .el-table--border .el-table__cell {
+    border-color: #000000 !important;
+  }
+}
+.el-table {
+  --el-table-border-color: #101418 !important;
+}
+.el-scrollbar__wrap {
+  background-color: #101418 !important;
+}
+
+
+.el-table .el-table__body tr:hover > td {
+  background-color:rgba(82, 82, 82, 0.5) !important;
+}
 
+.el-table__border-left-patch {
+  background-color: #101418 !important;
+}
+
+.collectorList .health-score {
+  color: rgba(54, 241, 205, 0.7) !important;
+}
+
+.el-pagination button.is-disabled, .el-pagination button:disabled {
+  background-color: #181d21 !important;
+  cursor: not-allowed;
+}
+.el-pager li ,.btn-next,.btn-prev{
+  background-color: #181d21 !important;
+  color: #ccc;
+}
 .el-table__header,
 .el-table__body {
   width: 100% !important;
@@ -378,4 +416,4 @@
   background-color: #181d21 !important;
   border-bottom: 1px solid #434343 !important;
   border-left: 1px solid #434343 !important;
-}
+}
\ No newline at end of file

src/views/dashboard/components/msg-item.vue

@@ -142,22 +142,22 @@ watch(
   cursor: pointer;
 }
 .message-item:hover {
-  background: #f0f0f0;
+  background: #000000;
 }
 .message-item .time {
-  color: #58616b;
+  color: #CCC;
   margin-right: 5px;
   min-width: 80px;
   flex-shrink: 0;
 }
 .message-item .title {
   margin-right: 5px;
-  color: #0c0b0b;
+  color: #8d8d8d;
   font-weight: bold;
 }
 .message-item .content {
   flex: 1;
-  color: #58616b;
+  color: #CCC;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;

src/views/dashboard/index.vue

@@ -124,7 +124,7 @@ onBeforeUnmount(() => { });
     height: 15rem;
 
     &>div {
-      background: #ffffff;
+      background: #181d21;
       border-radius: 6px;
       box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.1);
       padding: 16px;
@@ -134,7 +134,7 @@ onBeforeUnmount(() => { });
     .title {
       font-size: 18px;
       font-weight: normal;
-      color: #83868b;
+      color: #CCC;
       line-height: 22px;
       margin-bottom: 10px;
     }
@@ -176,7 +176,7 @@ onBeforeUnmount(() => { });
     width: 100%;
     height: calc(100% - 16rem);
     margin-top: 1rem;
-    background: #ffffff;
+    background: #181d21;
     border-radius: 6px;
     box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.1);
     padding: 16px;