Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/App.vue

@@ -271,7 +271,7 @@ export default {
   }
   /* 滑块颜色 */
   ::-webkit-scrollbar-thumb {
-    background-color: rgba(0, 0, 0, 0.2);
+    background-color: #FFF;
   }
   // firefox浏览器
   #app {

src/styles/index.scss

@@ -329,4 +329,31 @@ aside {
 .el-tabs__nav-scroll{
   color:#FFF;
   background-color: #172434;
+}
+
+.el-select-dropdown__wrap,.el-cascader-menu__wrap{
+  color:#FFF !important;
+  background-color: #172434 !important;
+}
+
+.el-select-dropdown__item,.el-cascader-node{
+  color:#FFF;
+}
+.el-select-dropdown__item.hover, .el-cascader-node:hover{
+  background-color:#486288 !important;
+}
+.el-range-input{
+  color:#FFF !important;
+}
+.el-picker-panel,.el-picker-panel__sidebar,.el-picker-panel__footer{
+  color:#FFF !important;
+  background-color: #172434 !important;
+}
+.el-date-table td.in-range div{
+  background-color:#486288 !important;
+}
+.el-button--default{
+  color:#FFF;
+  background:#5c90d2;
+  border:0px;
 }

src/views/alarm/component/viewDialog.vue

@@ -16,7 +16,7 @@
             <span class="content-row"> <span class="name-item"> 告警时间: </span> <span>{{alarmInfo.alarm_time}}</span> </span> -->
             <span class="content-row"> <span class="name-item"> 设备名称: </span> <span>测试设备1</span> </span>
             <span class="content-row"> <span class="name-item"> 设备编号: </span> <span>10001</span> </span>
-            <span class="content-row" style="color:red"> <span class="name-item"> 告警原因: </span> <span>液压油偏低</span> </span>
+            <span class="content-row" > <span class="name-item"> 告警原因: </span> <span>液压油偏低</span> </span>
             <span class="content-row"> <span class="name-item"> 告警时间: </span> <span>2022-05-16 14:43:00</span> </span>
           </div>
         </el-row>