tongshanglei 3 years ago
parent
commit
bab44de41c

+ 2 - 0
src/components/Hamburger/index.vue

@@ -36,9 +36,11 @@ export default {
   vertical-align: middle;
   width: 20px;
   height: 20px;
+  background:#Fff;
 }
 
 .hamburger.is-active {
+  background:#Fff;
   transform: rotate(180deg);
 }
 </style>

+ 3 - 3
src/components/HeaderNotice/index.vue

@@ -25,7 +25,7 @@
                 @click.native="viewAlarmDetail(item)"
               >
                 <el-col :span="4">
-                  <el-avatar :size="avatarSize" :src="item.avatarUrl" style="background: #fff;"></el-avatar>
+                  <el-avatar :size="avatarSize" :src="item.avatarUrl" ></el-avatar>
                 </el-col>
                 <el-col :span="16" style="line-height:22px;font-size: 12px;padding: 0;margin: 0;">
                   <el-row style="margin-bottom: 8px;">
@@ -34,7 +34,7 @@
                       <h4 style="margin: 0;">测试液压泵1</h4>
                     </el-col>
                   </el-row>
-                  <el-row style="color:rgba(0,0,0,.45);line-height:1.5">
+                  <el-row style="color:#fff;line-height:1.5">
                     <!-- <el-col>设备{{item.device_number}}发生了{{item.alarm_type_name}}</el-col> -->
                     <el-col>设备1001校准有效期临近</el-col>
                     <el-col style="margin-top: 4px;margin-bottom: 4px;">{{item.createTimeAgo}}</el-col>
@@ -189,7 +189,7 @@ export default {
   padding: 0px;
 }
 .list-row {
-  border-bottom: 1px solid #e8e8e8;
+  border-bottom: 1px solid #2d3a48;
   line-height: 88px;
   cursor: pointer;
   padding-top: 12px;

+ 1 - 1
src/layout/components/AppMain.vue

@@ -31,7 +31,7 @@ export default {
   width: 100%;
   position: relative;
   overflow: hidden;
-  background: #eaedf1;
+  background: #2d3a48;
 }
 
 .fixed-header+.app-main {

+ 3 - 2
src/layout/components/Navbar.vue

@@ -104,7 +104,8 @@ export default {
   height: 50px;
   overflow: hidden;
   position: relative;
-  background: #fff;
+/*主题颜色修改*/
+  background: #172434;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
   .hamburger-container {
@@ -143,7 +144,7 @@ export default {
       padding: 0 8px;
       height: 100%;
       font-size: 18px;
-      color: #5a5e66;
+      color: #FFF;
       vertical-align: text-bottom;
 
       &.hover-effect {

+ 2 - 2
src/layout/components/TagsView/index.vue

@@ -204,8 +204,8 @@ export default {
 .tags-view-container {
   height: 34px;
   width: 100%;
-  background: #fff;
-  border-bottom: 1px solid #d8dce5;
+  background: #354059;
+  // border-bottom: 1px solid #d8dce5;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
   .tags-view-wrapper {
     .tags-view-item {

+ 1 - 0
src/styles/element-ui.scss

@@ -3,6 +3,7 @@
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
   font-weight: 400 !important;
+  color:#FFF !important;
 }
 
 .el-upload {

+ 7 - 1
src/styles/element-variables.scss

@@ -20,8 +20,14 @@ $--border-color-light: #e8e8e8;
 $--border-color-lighter: #e8e8e8;
 
 //$--table-border: 1px solid #e8e8e8;
-$--table-border: 1px solid #dfe6ec;
+$--table-border: 1px solid #3a4858;//table表格boder
 
+// $--background-color-base:#123849;
+$--table-current-row-background-color:#172434;//当前选中行背景色
+$--table-font-color: #FFF;//表格字体
+$--table-header-font-color: #EAECF2;
+$--table-header-background-color: #140101;
+$--table-row-hover-background-color: #486288;
 /* icon font path, required */
 $--font-path: "~element-ui/lib/theme-chalk/fonts";
 

+ 105 - 3
src/styles/index.scss

@@ -130,7 +130,7 @@ aside {
 .app-container {
   padding: 20px;
   margin: 24px 24px;
-  background: white;
+  background: #172434;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 }
 
@@ -224,7 +224,109 @@ aside {
   font-size: 12px;
   padding: 7px 10px;
 }
+/*主题颜色修改*/
+.el-table{
+  background-color: #172434;
+}
+.el-loading-mask{
+  background-color: #172434;
+}
+.el-loading-spinner .path {
+  stroke:#FFF;
+}
+.el-table::before{
+  height:0px;
+}
+.el-table--group::after, .el-table--border::after{
+  width:0px ;
+}
 .el-table th {
-  color:#646464;
-  background-color: #fafafa;
+  color:#FFF;
+  background-color: #172434;
+}
+.el-table tr {
+  background-color: #172434;
+}
+.el-input__inner{
+  color:#FFF;
+  background-color: #172434;
+  border: 1px solid #3a4858;
+}
+.el-range-input{
+  color:#FFF;
+  background-color: #172434;
+}
+.el-date-editor .el-range-separator{
+  color:#FFF;
+}
+.el-card{
+  color:#FFF;
+  background-color: #172434;
+  border:1px solid #172434;
+}
+.el-tree{
+  color:#FFF;
+  background-color: #172434;
+}
+.el-tree-node.is-current>.el-tree-node__content{
+  background-color:#486288;
+}
+.el-tree-node__content:hover{
+  background-color:#486288 !important;
+}
+.el-dialog{
+  color:#FFF;
+  background-color: #172434;
+}
+.el-dialog__title{
+  color:#FFF;
+}
+.el-form-item__label{
+  color:#FFF;
+}
+.el-tabs--border-card{
+  color:#FFF;
+  background-color: #172434;
+  border:0px;
+}
+.el-input-group__append, .el-input-group__prepend{
+  color:#FFF;
+  background-color: #70b9eb;
+
+}
+.el-popover{
+  color:#FFF;
+  background-color: #172434;
+  border: 1px solid #443e3e;
+
+}
+.el-popper[x-placement^=bottom] .popper__arrow::after{
+
+  border-bottom-color: #443e3e;
+}
+.el-main .list-row:hover{
+  background-color:#486288 !important;
+
+}
+.el-tabs__nav-wrap::after{
+  background-color:#443e3e;
+}
+.el-card__header{
+  border-bottom: 1px solid #443e3e;
+}
+.app-container .datatable .table-title{
+  background-color: #172434 !important;
+
+}
+.el-table__fixed::before, .el-table__fixed-right::before{
+  height:0px;
+}
+.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active{
+  color:#FFF;
+  background-color: #354059;
+  border:0px;
 }
+.el-tabs__nav-scroll{
+  color:#FFF;
+  background-color: #172434;
+}

+ 1 - 1
src/views/alarm/alarmRecords/alarm.scss

@@ -11,7 +11,7 @@
 }
 .dashboard-editor-container {
     padding: 20px;
-    background-color: rgb(240, 242, 245);
+    // background-color: rgb(240, 242, 245);
     position: relative;
     min-width: 1260px;
     .chart-wrapper {

+ 2 - 1
src/views/alarm/component/viewDialog.vue

@@ -115,12 +115,13 @@ import deviceDialog from "./deviceDialog"
   margin-left: 20px;
   margin-bottom: 10px;
   font-size: 15px;
-  color: black;
+  color: #FFF;
 }
 .dialog-row-content{
   margin-left: 50px;
   display: flex;
   flex-direction: column; 
+  color:#FFF;
 }
 .content-row{
   margin-top: 5px;

+ 1 - 1
src/views/alarm/history/alarm.scss

@@ -1,6 +1,6 @@
 .dashboard-editor-container {
     padding: 20px;
-    background-color: rgb(240, 242, 245);
+    // background-color: rgb(240, 242, 245);
     position: relative;
   
     .chart-wrapper {

+ 1 - 1
src/views/alarm/realtime/alarm.scss

@@ -11,7 +11,7 @@
 }
 .dashboard-editor-container {
     padding: 20px;
-    background-color: rgb(240, 242, 245);
+    // background-color: rgb(240, 242, 245);
     position: relative;
     min-width: 1260px;
     .chart-wrapper {

+ 1 - 1
src/views/alarm/realtime/equipmentAlarm.scss

@@ -11,7 +11,7 @@
 }
 .dashboard-editor-container {
     padding: 20px;
-    background-color: rgb(240, 242, 245);
+    // background-color: rgb(240, 242, 245);
     position: relative;
     min-width: 1360px;
     .chart-wrapper {

+ 6 - 6
src/views/alarm/search/Searchbar.vue

@@ -12,7 +12,7 @@
           />
         </el-col> -->
 
-        <el-col :md="4">
+        <el-col :md="5">
           <el-input
             v-model="queryParam.asset_no"
             placeholder="设备编号"
@@ -22,7 +22,7 @@
           />
         </el-col>
 
-        <el-col :md="4">
+        <el-col :md="5">
           <el-cascader
             class="filter-item fl"
             @change="selectDepart"
@@ -36,7 +36,7 @@
           </el-cascader>
         </el-col>
 
-        <el-col :md="4">
+        <el-col :md="5">
           <el-select
             class="filter-item fl"
             v-model="queryParam.alarm_reason"
@@ -53,7 +53,7 @@
             ></el-option>
           </el-select>
         </el-col>
-        <el-col :md="4">
+        <el-col :md="5">
           <el-select
             class="filter-item fl"
             v-model="queryParam.alarm_type"
@@ -303,10 +303,10 @@ export default {
 .filter-container {
   display: flex;
   width: 100%;
-  background: #fff;
+  background: #172434;
   padding: 18px;
   margin-bottom: 14px;
-  box-shadow: 1px 1px 8px 0 #e4e4e4;
+  box-shadow: 1px 1px 8px 0 #000;
   display: flex;
   align-items: center;
   .el-row {

+ 1 - 1
src/views/dashboard/rladmin/index.vue

@@ -298,7 +298,7 @@ export default {
 
   .dashboard-editor-container {
     padding: 20px;
-    background-color: rgb(240, 242, 245);
+    // background-color: rgb(240, 242, 245);
     position: relative;
 
     .chart-wrapper {

+ 1 - 1
src/views/device/hyd_equipment/alarm.scss

@@ -13,7 +13,7 @@
 
 .dashboard-editor-container {
     padding: 20px;
-    background-color: rgb(240, 242, 245);
+    // background-color: rgb(240, 242, 245);
     position: relative;
     min-width: 1260px;
     .chart-wrapper {

+ 1 - 1
src/views/device/storage_equipment/alarm.scss

@@ -13,7 +13,7 @@
 
 .dashboard-editor-container {
     padding: 20px;
-    background-color: rgb(240, 242, 245);
+    // background-color: rgb(240, 242, 245);
     position: relative;
     min-width: 1260px;
     .chart-wrapper {

+ 1 - 2
src/views/map/routeMap.vue

@@ -153,7 +153,6 @@ export default {
     init({ BMap, map }) {
       this.map = map;
       // 初始化地图,设置中心点坐标
-      
       this.searchControlOffset=new BMap.Size(20, 20)
       this.listControlOffset=new BMap.Size(0, 40)
       // 添加鼠标滚动缩放
@@ -400,7 +399,7 @@ export default {
 #student-container{
   width:240px;
   height: 500px;
-  background-color: #fff;
+
 }
 
 .app-container {

+ 5 - 3
src/views/permission/config/index.vue

@@ -379,9 +379,11 @@ export default {
    margin-top:10px;
    margin-right:10px;
   min-width:380px;
+    box-shadow: 1px 1px 8px 0 #000;
+    border:0px;
 }
 .mixin-components-container {
-  background-color: #f0f2f5;
+  background-color: #2d3a48;
   padding: 30px;
   min-height: calc(100vh - 84px);
 }
@@ -394,7 +396,7 @@ export default {
 }
 
   .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
+    border: 1px dashed #443e3e;
     border-radius: 6px;
     cursor: pointer;
     position: relative;
@@ -448,7 +450,7 @@ export default {
     -webkit-box-align: center;
     -ms-flex-align: center;
     align-items: center;
-    border: 1px solid #cccccc;
+    border: 1px solid #443e3e;
     border-radius: 5px;
     overflow: hidden;
     box-shadow: 0 0 1px #cccccc;