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: #FFF;
+    background-color: #354059;
   }
   // firefox浏览器
   #app {

src/styles/index.scss

@@ -292,7 +292,10 @@ aside {
 .el-input-group__append, .el-input-group__prepend{
   color:#FFF;
   background-color: #70b9eb;
-
+}
+.el-textarea__inner{
+  color:#FFF;
+  background-color: #172434;
 }
 .el-popover{
   color:#FFF;
@@ -300,6 +303,14 @@ aside {
   border: 1px solid #443e3e;
 
 }
+.el-drawer,.el-drawer__header{
+  color:#FFF !important;
+  background-color: #172434;
+}
+.el-drawer__body{
+  color:#FFF;
+  background-color: #172434;
+}
 .el-popper[x-placement^=bottom] .popper__arrow::after{
 
   border-bottom-color: #443e3e;
@@ -330,7 +341,32 @@ aside {
   color:#FFF;
   background-color: #172434;
 }
+.el-popper{
+  border:1px solid #443e3e;
+}
+.el-picker-panel *[slot=sidebar]{
+  border:1px solid #443e3e;
+}
+.el-input.is-disabled .el-input__inner {
+  background-color: #172434;
+  border-color: #443e3e;
+  color: #FFF;
+  cursor: not-allowed;
+}
+.el-picker-panel__sidebar,.el-date-range-picker__content.is-left{
+  border-right:1px solid #443e3e;
 
+}
+.el-date-range-picker__time-header{
+  border-bottom:1px solid #443e3e;
+}
+.el-picker-panel__footer{
+  border-top:1px solid #443e3e;
+}
+.el-date-table th{
+  border-bottom:1px solid #443e3e;
+
+}
 .el-select-dropdown__wrap,.el-cascader-menu__wrap{
   color:#FFF !important;
   background-color: #172434 !important;

src/views/device/hyd_equipment/detail.vue

@@ -141,7 +141,7 @@ export default {
 }
 .item {
   font-size: 14px;
-  color: black;
+  color: #FFF;
   margin-top: 5px;
 }
 .el-table .warning-row {

src/views/device/hyd_equipment/hydraulic_detail.vue

@@ -162,7 +162,7 @@ export default {
 }
 .item {
   font-size: 14px;
-  color: black;
+  color: #FFF;
   margin-top: 5px;
 }
 .el-table .warning-row {

src/views/device/storage_equipment/detail.vue

@@ -131,7 +131,7 @@ export default {
 }
 .item {
   font-size: 14px;
-  color: black;
+  color: #FFF;
   margin-top: 5px;
 }
 .el-table .warning-row {

src/views/wind/fan/detail.vue

@@ -191,15 +191,39 @@ export default {
                     }
                 },
                 xAxis: {
+                     nameTextStyle: {
+                      color: "#fff"
+                    },
+                    axisLine: {
+                      lineStyle: { color: "#70b9eb" }
+                    },
+                    axisLabel: {
+                      textStyle: {
+                        color: "#fff"
+                      },
+                    
+                    },
                     type: "category",
                     data: this.xData
                 },
-                yAxis: {},
-                dataZoom: [{
-                    startValue: this.xData[0]
-                }, {
-                    type: 'inside'
-                }],
+                yAxis: {
+                     nameTextStyle: {
+                        color: "#fff"
+                      },
+                      axisLine: {
+                        lineStyle: { color: "#70b9eb" }
+                      },
+                      axisLabel: {
+                        textStyle: {
+                          color: "#fff"
+                        }
+                      }
+                },
+                // dataZoom: [{
+                //     startValue: this.xData[0]
+                // }, {
+                //     type: 'inside'
+                // }],
                 visualMap: {
                     show: false,
                     min: 0,

src/views/wind/wind/components/viewDialog.vue

@@ -36,6 +36,15 @@
           </div>
         </el-row>
 
+        <el-row class="dialog-row">
+          <div class="dialog-row-title">设备统计  
+          </div>
+          <div class="dialog-row-content">
+            <span class="content-row"> <span class="name-item"> 液压泵: </span> <span>40台</span> </span>
+            <span class="content-row"> <span class="name-item"> 液压扳手: </span> <span>40台</span> </span>
+          </div>
+        </el-row>
+
       </div>
     <el-divider class="dialog-divider"></el-divider>
     <span slot="footer" class="dialog-footer">
@@ -120,7 +129,7 @@
   margin-left: 20px;
   margin-bottom: 10px;
   font-size: 15px;
-  color: black;
+  color: #FFF;
 }
 .dialog-row-content{
   margin-left: 50px;
@@ -129,6 +138,7 @@
 }
 .content-row{
   margin-top: 5px;
+  color:#FFF;
 }
 .name-item{
   width: 60px;

src/views/wind/wind/index.vue

@@ -356,7 +356,7 @@ export default {
                     address=result.address
                     $('#marker_address').text(address);
                 });
-                var content ='<div class="info_label">设备名称：' + (data.name) + '</div>'
+                var content ='<div class="info_label">设备名称：测试001</div>'
                 content +='<div class="info_label">设备编号：' + (data.number) + '</div>'
                 content += '<div class="info_label">定位地址：<a id="marker_address">' + address + '</a></div>' 
                 content+='<div class="handle_btn info_label">'
@@ -1022,6 +1022,8 @@ export default {
             content +='<div class="info_label"> 环境类型:  潮间带 </div>'
             content +='<div class="info_label"> 海拔高度:  100米 </div>'
             content +='<div class="info_label"> 主机制造商:  上海电气 </div>'
+            content +='<div class="info_label"> 液压泵数量:  42 </div>'
+            content +='<div class="info_label"> 液压扳手数量:  40 </div>'
                 
             return content
         },

src/views/work_box_map/routeMap.vue

@@ -401,7 +401,7 @@ export default {
 #student-container{
   width:240px;
   height: 500px;
-  background-color: #fff;
+  background-color: #172434;
 }
 
 .app-container {