panhui 4 жил өмнө
parent
commit
4e87161897

+ 1 - 1
src/main/vue/src/App.vue

@@ -3,6 +3,6 @@
 </template>
 
 <style lang="less">
-@import url(./styles/app.less);
+// @import url(./styles/app.less);
 @import url(./styles/operation.less);
 </style>

+ 1 - 1
src/main/vue/src/components/operation/BedInfo.vue

@@ -137,7 +137,7 @@ export default {
 .bed-info {
     min-height: 70px;
     // background: rgba(255, 255, 255, 1);
-    background: #242744 !important;
+    background: #242744;
     box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.08);
     border-radius: 4px;
     display: flex;

+ 2 - 2
src/main/vue/src/components/roomStatus/RoomDrawer.vue

@@ -630,7 +630,7 @@ export default {
     flex-basis: 0;
     flex-grow: 1;
     // background: #242744 !important;
-    background: #080c27 !important;
+    background: #080c27;
     .drawer-title {
         font-size: 21px;
         font-weight: bold;
@@ -718,7 +718,7 @@ export default {
 }
 .drawer-btn-list {
     // background-color: #fff;
-    background: #242744 !important;
+    background: #242744;
     box-sizing: border-box;
     display: flex;
     align-items: center;

+ 1 - 0
src/main/vue/src/main.js

@@ -17,6 +17,7 @@ import ChooseContract from '@/components/chooseContract';
 import ChooseBed from '@/components/chooseBed';
 import 'normalize.css/normalize.css';
 import '@/styles/theme/index.css';
+import '@/styles/app.less';
 import VueAMap from 'vue-amap';
 import AreaChoose from '@/components/AreaChoose';
 import wlGantt from '@/components/wl-gantt/index';

+ 369 - 7
src/main/vue/src/styles/app.less

@@ -82,7 +82,7 @@ li {
     }
 }
 .el-message-box {
-    background: #242744 !important;
+    background-color: #242744;
     border: 0 !important;
 }
 .el-message-box__message {
@@ -92,7 +92,7 @@ li {
     }
 }
 .el-message-box__title {
-    color: #fff !important;
+    color: #fff;
 }
 .filter-item {
     .el-input__inner {
@@ -204,9 +204,9 @@ li {
     background: #080c27 !important;
 }
 .el-table {
-    background: #242744;
+    background: #242744 !important;
     .el-table__header {
-        background: #242744;
+        background: #2b2c31 !important;
     }
 }
 .el-table thead.is-group th {
@@ -693,7 +693,9 @@ li {
         opacity: 0;
     }
 }
-
+.el-date-editor .el-range-input {
+    color: #fff !important;
+}
 .custom-tree-node:hover {
     .opt {
         opacity: 1;
@@ -828,9 +830,9 @@ li {
     }
 
     .el-table {
-        background: #ffffff;
+        background: #ffffff !important;
         .el-table__header {
-            background: #ffffff;
+            background: #ffffff !important;
         }
     }
 
@@ -838,14 +840,356 @@ li {
         color: #000;
     }
     .el-table tr {
+        background: #ffffff !important;
+        &:hover {
+            background: #f2f4f5 !important;
+            td {
+                background: #f2f4f5 !important;
+            }
+        }
+    }
+    .list-view .el-table .header-row {
+        background: #ffffff !important;
+    }
+    .el-table__body tr.hover-row {
+        background: #f2f4f5 !important;
+    }
+    .el-table__body tr.hover-row > td {
+        background: #f7931d22 !important;
+    }
+    .el-table th {
+        background-color: #ffffff !important;
+    }
+    .el-table thead.is-group th {
+        background-color: #ffffff !important;
+    }
+    .el-table td,
+    .el-table th.is-leaf {
+        border-bottom: 1px solid #f2f4f5 !important;
+    }
+    .el-table__fixed-right-patch {
+        background-color: #f2f4f5 !important;
+    }
+    .el-table th.is-leaf {
+        border-bottom: 1px solid #f2f4f5 !important;
+    }
+
+    .el-table .cell {
+        color: #000 !important;
+    }
+
+    .el-table__footer-wrapper tbody td {
         background-color: #ffffff !important;
     }
+    .el-table__footer-wrapper td {
+        border-bottom: 1px solid #f2f4f5 !important;
+    }
+    .el-table__fixed-footer-wrapper tbody td {
+        background-color: #ffffff !important;
+    }
+    .filters-container {
+        background: #ffffff !important;
+        .el-input .el-input__inner {
+            background-color: #f2f4f5 !important;
+        }
+    }
+    .edit-view {
+        background-color: #ffffff;
+        .el-form-item__label {
+            color: #000 !important;
+        }
+        .el-input__inner {
+            border: 1px solid #f2f4f5;
+            color: #000 !important;
+        }
+        .el-button {
+            background-color: transparent !important;
+        }
+    }
+    .el-tree {
+        background-color: #fff !important;
+        color: #000 !important;
+    }
+    .el-tree-node__content:hover {
+        background: #f2f4f5 !important;
+        .el-button {
+            border-width: 0;
+        }
+    }
+    .main-contianer .menu-tabs {
+        background: #ffffff !important;
+    }
+    .menu-tabs .el-tabs__header {
+        background: #ffffff !important;
+    }
+    .sum-row {
+        background: #ffffff !important;
+    }
+    .sum-row .col {
+        background: #ffffff !important;
+        color: #000 !important;
+    }
+
+    .table-summary {
+        color: #000 !important;
+    }
+
+    .el-input__inner {
+        color: #000 !important;
+    }
+    .el-header {
+        .el-input__inner {
+            color: #fff !important;
+        }
+    }
+
+    .drawer-content {
+        background: #ffffff !important;
+        color: #000 !important;
+        .drawer-title .drawer-title-name {
+            color: #000 !important;
+        }
+        .info-content {
+            border-bottom-color: #f2f4f5 !important;
+            .info-item {
+                color: #000 !important;
+            }
+        }
+        .bed-info {
+            background: #ffffff;
+        }
+    }
+    .drawer-btn-list {
+        background: #f2f4f5 !important;
+    }
+    .el-dialog__header {
+        background-color: #fff !important;
+        span {
+            color: #000 !important;
+        }
+    }
+    .el-dialog__body {
+        background-color: #fff !important;
+    }
+    .el-dialog__footer {
+        background: #ffffff !important;
+    }
+    .el-message-box {
+        background: #ffffff !important;
+        .el-message-box__title {
+            color: #000 !important;
+        }
+    }
+    .el-form-item__label {
+        color: #000 !important;
+    }
+    .el-input-number__increase,
+    .el-input-number__decrease {
+        color: #000 !important;
+    }
+    .filter-item .el-input__inner {
+        border-color: #f2f4f5;
+    }
+    .el-form-item__content .el-button {
+        background: transparent !important;
+    }
+    .el-dialog__footer .el-button {
+        background: transparent !important;
+    }
+    .filter-btn {
+        background: transparent !important;
+    }
+    .el-message-box__content {
+        color: #000 !important;
+    }
+    .el-message-box__btns .el-button {
+        background: transparent !important;
+    }
+    .bed-info .person .name {
+        color: #000 !important;
+    }
+    .checkin-form .checkin-form-item .checkin-form-content {
+        color: #000 !important;
+    }
+}
+.lightBg ~ div {
+    .checkin-form .checkin-form-item .checkin-form-content {
+        color: #000 !important;
+    }
+    .el-message-box__btns .el-button {
+        background: transparent !important;
+    }
+    .el-message-box__content {
+        color: #000 !important;
+    }
+    .filter-btn {
+        background: transparent !important;
+    }
+    .el-form-item__content .el-button {
+        background: transparent !important;
+    }
+    .el-form-item__label {
+        color: #000 !important;
+    }
+    .el-dialog__footer .el-button {
+        background: transparent !important;
+    }
+    .el-input-number__increase,
+    .el-input-number__decrease {
+        color: #000 !important;
+    }
+    .filter-item .el-input__inner {
+        border-color: #f2f4f5;
+    }
+    .el-message-box {
+        background: #ffffff !important;
+        .el-message-box__title {
+            color: #000 !important;
+        }
+    }
+    .el-message-box__message .el-button {
+        background: #ffffff !important;
+    }
+    .el-dialog__header {
+        background-color: #fff !important;
+        span {
+            color: #000 !important;
+        }
+    }
+    .el-dialog__body {
+        background-color: #fff !important;
+    }
+
+    .filters-container {
+        background: #fff !important;
+    }
+
+    .el-tabs__nav-scroll {
+        background-color: #f2f4f5 !important;
+    }
+    .el-tabs__nav .is-top {
+        background-color: #fff !important;
+    }
+    .main-contianer {
+        background-color: #f2f4f5 !important;
+    }
+    .top-stat {
+        background-color: #fff !important;
+        .name {
+            color: #000000 !important;
+        }
+        .stat-item .content .label {
+            color: #000000 !important;
+        }
+    }
+    .floor-list {
+        background-color: #fff !important;
+        .floor-title {
+            color: #000 !important;
+            &::before {
+                background-color: #4dcc6f !important;
+            }
+        }
+        .search-content {
+            background-color: #fff !important;
+            border-bottom-color: #f5f7fa;
+        }
+
+        .search-top .select .el-input__inner {
+            background-color: #f2f4f5 !important;
+        }
+        .contract-filter {
+            &:hover {
+                border-color: #4dcc6f;
+                background-color: #4dcc6f;
+            }
+        }
+
+        .Arrears {
+            &:hover {
+                background-color: #ff5d5d;
+            }
+        }
+        .menu {
+            height: 38px;
+            background-color: #f5f7fa;
+            .el-radio-button {
+                .el-radio-button__inner {
+                    .radio-item {
+                        &:hover {
+                            color: #4dcc6f;
+                        }
+                    }
+                    &:hover {
+                        color: #4dcc6f;
+                    }
+                }
+                &:hover {
+                    color: #4dcc6f;
+                }
+                &.is-active {
+                    .el-radio-button__inner {
+                        .radio-item {
+                            &:hover {
+                                color: #fff;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        .room {
+            background-color: #fff;
+            &:hover {
+                // width: 110px;
+                // height: 108px;
+                // background: rgba(93, 125, 255, 0.3);
+                // box-shadow: 0px 2px 6px 0px rgba(255, 255, 255, 0.4);
+                border-radius: 4px;
+                box-shadow: 0px 0px 6px 0px #4dcc6f;
+            }
+        }
+    }
+
+    .list-view {
+        background-color: #f2f4f5;
+    }
+
+    .el-table {
+        background: #ffffff !important;
+        .el-table__header {
+            background: #ffffff !important;
+        }
+    }
+
+    .el-table .floor-row .cell {
+        color: #000;
+    }
+    .el-table tr {
+        background: #ffffff !important;
+        &:hover {
+            background: #f2f4f5 !important;
+            td {
+                background: #f2f4f5 !important;
+            }
+        }
+    }
+    .list-view .el-table .header-row {
+        background: #ffffff !important;
+    }
+    .el-table__body tr.hover-row {
+        background: #f2f4f5 !important;
+    }
     .el-table__body tr.hover-row > td {
         background: #f7931d22 !important;
     }
     .el-table th {
         background-color: #ffffff !important;
     }
+    .el-table thead.is-group th {
+        background-color: #ffffff !important;
+    }
     .el-table td,
     .el-table th.is-leaf {
         border-bottom: 1px solid #f2f4f5 !important;
@@ -905,4 +1249,22 @@ li {
     .menu-tabs .el-tabs__header {
         background: #ffffff !important;
     }
+    .sum-row {
+        background: #ffffff !important;
+    }
+    .sum-row .col {
+        background: #ffffff !important;
+        color: #000 !important;
+    }
+
+    .table-summary {
+        color: #000 !important;
+    }
+
+    .el-input__inner {
+        color: #000 !important;
+    }
+    .el-dialog__footer {
+        background: #ffffff !important;
+    }
 }

+ 1 - 1
src/main/vue/src/views/Admin.vue

@@ -243,7 +243,7 @@ export default {
                 'CustomerList',
                 'RealTimeFee'
             ],
-            darkColor: true
+            darkColor: false
         };
     },
     computed: {