tongshanglei 2 vuotta sitten
vanhempi
commit
c5b63f326a

+ 11 - 1
src/views/wind/wind/components/viewDialog.vue

@@ -36,6 +36,15 @@
           </div>
           </div>
         </el-row>
         </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>
       </div>
     <el-divider class="dialog-divider"></el-divider>
     <el-divider class="dialog-divider"></el-divider>
     <span slot="footer" class="dialog-footer">
     <span slot="footer" class="dialog-footer">
@@ -120,7 +129,7 @@
   margin-left: 20px;
   margin-left: 20px;
   margin-bottom: 10px;
   margin-bottom: 10px;
   font-size: 15px;
   font-size: 15px;
-  color: black;
+  color: #FFF;
 }
 }
 .dialog-row-content{
 .dialog-row-content{
   margin-left: 50px;
   margin-left: 50px;
@@ -129,6 +138,7 @@
 }
 }
 .content-row{
 .content-row{
   margin-top: 5px;
   margin-top: 5px;
+  color:#FFF;
 }
 }
 .name-item{
 .name-item{
   width: 60px;
   width: 60px;

+ 3 - 1
src/views/wind/wind/index.vue

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