Преглед на файлове

Merge branch 'feat_theme_g' of United_Software/k_online_ui into feat_theme

Jack Zhou преди 11 месеца
родител
ревизия
187a496213

+ 1 - 1
src/styles/Antdui.scss

@@ -82,7 +82,7 @@
   border-left: 1px solid var(--border-color-2);
 }
 .ant-picker .ant-picker-input >input, .ant-picker .ant-picker-input >input::placeholder {
-  color: var(--color-neutral-3);
+  color: var(--color-neutral-1);
 }
 .ant-picker-dropdown .ant-picker-cell .ant-picker-cell-inner {
   color: var(--color-neutral-1);

+ 2 - 0
src/styles/theme-g.scss

@@ -64,4 +64,6 @@
   // 输入框禁用的颜色
   --input-disabled-bg-color: #2b2f36;
   --input-disabled-text-color: #66696f;
+  --color-recent-name: rgba(240,241,243,0.1);
+  --color-disabled-bg: #2b2b2c;
 }

+ 3 - 0
src/styles/theme.scss

@@ -226,6 +226,9 @@
   --color-btn-blue-bg: #f6f6fe;
 
   --color-btn-default-dark-hover-bg: #2b2f36;
+
+  --color-recent-name: rgba(43, 47, 54, 0.05);
+  --color-disabled-bg: #eaebed;
 }
 
 :root.dark {

+ 2 - 2
src/views/Dashboard/src/components/DashFiters.vue

@@ -317,9 +317,9 @@ const DateRangeSearch = () => {
   border-left-color: var(--color-theme);
 }
 :deep(.el-checkbox-button.is-disabled.is-checked .el-checkbox-button__inner) {
-  background-color: #eaebed;
+  background-color: var(--color-disabled-bg);
   border-color: var(--color-select-border);
-  color: #2b2f36;
+  color: var(--color-neutral-1);
   font-weight: 700;
 }
 // :deep(.el-checkbox-button.is-focus .el-checkbox-button__inner) {

+ 12 - 13
src/views/Dashboard/src/components/RecentStatus.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
-import dayjs from 'dayjs'
 import { formatTimezoneByUTCorGMT } from '@/utils/tools'
 
 const router = useRouter()
@@ -42,7 +41,7 @@ const RouteToDetail = (val: any) => {
       <div class="recent-header-left">
         <div>
           <span class="iconfont_icon">
-            <svg class="iconfont iconfont_route" aria-hidden="true">
+            <svg class="iconfont iconfont_route icon_dark" aria-hidden="true">
               <use xlink:href="#icon-icon_ocean_b"></use>
             </svg>
           </span>
@@ -89,7 +88,7 @@ const RouteToDetail = (val: any) => {
         <div class="startStation">
           <div class="startStation_title">
             <span class="iconfont_icon">
-              <svg class="iconfont" aria-hidden="true">
+              <svg class="iconfont icon_dark" aria-hidden="true">
                 <use xlink:href="#icon-icon_location_fill_b"></use>
               </svg>
             </span>
@@ -100,7 +99,7 @@ const RouteToDetail = (val: any) => {
         <div class="StationIcon">
           <div>
             <span class="iconfont_icon">
-              <svg class="iconfont" aria-hidden="true">
+              <svg class="iconfont icon_dark" aria-hidden="true">
                 <use xlink:href="#icon-icon_path_b"></use>
               </svg>
             </span>
@@ -110,7 +109,7 @@ const RouteToDetail = (val: any) => {
         <div class="startStation">
           <div class="startStation_title">
             <span class="iconfont_icon">
-              <svg class="iconfont" aria-hidden="true">
+              <svg class="iconfont icon_dark" aria-hidden="true">
                 <use xlink:href="#icon-icon_location_fill_b"></use>
               </svg>
             </span>
@@ -134,13 +133,13 @@ const RouteToDetail = (val: any) => {
 <style lang="scss" scoped>
 .recent_route {
   border-radius: var(--border-radius-12);
-  border: 1px solid var(--color-border-2);
+  border: 1px solid var(--color-border);
   margin: 8px;
 }
 .recent_header {
   background-color: var(--color-header-bg);
   border-radius: var(--border-radius-12) var(--border-radius-12) 0 0;
-  border-bottom: 1px solid var(--color-border-2);
+  border-bottom: 1px solid var(--color-border);
   display: flex;
   padding: 12px 16px;
   justify-content: space-between;
@@ -171,9 +170,9 @@ const RouteToDetail = (val: any) => {
   color: var(--color-theme);
 }
 .recent-name {
-  border: 1px solid var(--color-border-2);
+  border: 1px solid var(--color-border);
   border-radius: 3px;
-  background-color: rgba(43, 47, 54, 0.05);
+  background-color: var(--color-recent-name);
   padding: 4px;
   margin-right: 8px;
 }
@@ -207,7 +206,7 @@ const RouteToDetail = (val: any) => {
   }
 }
 .recent-content-left {
-  border-right: 1px solid var(--color-border-2);
+  border-right: 1px solid var(--color-border);
   padding-left: 16px;
   width: 37%;
   height: 76px;
@@ -218,14 +217,14 @@ const RouteToDetail = (val: any) => {
   line-height: 21px;
 }
 .recent-content-middle {
-  border-right: 1px solid var(--color-border-2);
+  border-right: 1px solid var(--color-border);
   padding-left: 8px;
   width: 37%;
   height: 76px;
   display: flex;
 }
 .left_title {
-  color: var(--dashboard-text-color);
+  color: var(--color-neutral-2);
 }
 .startStation {
   display: flex;
@@ -239,7 +238,7 @@ const RouteToDetail = (val: any) => {
 }
 .startStation_time {
   font-size: var(--font-size-2);
-  color: var(--dashboard-text-color);
+  color: var(--color-neutral-2);
 }
 .recent-content-right {
   width: 24%;