样式优化

gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue

@@ -12,16 +12,16 @@
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">
-            设备类型：<span>{{ title }}</span>
+            设备类型：<span>{{ title ? title : "-"  }}</span>
           </div>
           <div class="eq-text">
-            设备型号：<span>{{ data.deviceModel }}</span>
+            设备型号：<span>{{ data.deviceModel ? data.deviceModel : "-"  }}</span>
           </div>
           <div class="eq-text">
-            所属管道：<span>{{ data.pipeName }}</span>
+            所属管道：<span>{{ data.pipeName ? data.pipeName : "-"  }}</span>
           </div>
           <div class="eq-text">
-            物联网编号：<span>{{ data.iotNo }}</span>
+            物联网编号：<span>{{ data.iotNo ? data.iotNo : "-" }}</span>
           </div>
         </div>
         <div class="pic">
@@ -48,11 +48,11 @@
 
         <div>
           <span>设备所在地址：</span>
-          <span>{{ data.pipeAddr }}</span>
+          <span>{{ data.pipeAddr ? data.pipeAddr : "-"}}</span>
         </div>
         <div>
           <span>备注信息：</span>
-          <span>{{ data.remarks }} </span>
+          <span>{{ data.remarks ? data.remarks : "-"}} </span>
         </div>
       </div>
     </div>
@@ -71,42 +71,42 @@
           ">
           <el-col :span="12">
             <div class="windowwarn">
-              标况累积量：<span class="standardConditionAccumulation"></span>
+              标况累积量：<span class="standardConditionAccumulation">-</span>
             </div>
           </el-col>
           <el-col :span="11">
             <div class="windowwarn">
-              工况累积量：<span class="workingConditionAccumulation"></span>
+              工况累积量：<span class="workingConditionAccumulation">-</span>
             </div>
           </el-col>
           <el-col :span="12">
             <div class="windowwarn">
-              剩余量：<span class="residualQuantity"></span>
+              剩余量：<span class="residualQuantity">-</span>
             </div>
           </el-col>
           <el-col :span="11">
             <div class="windowwarn">
-              标况流量：<span class="standardConditionFlow"></span>
+              标况流量：<span class="standardConditionFlow">-</span>
             </div>
           </el-col>
           <el-col :span="12">
             <div class="windowwarn">
-              工况流量：<span class="workingConditionFlow"></span>
+              工况流量：<span class="workingConditionFlow">-</span>
             </div>
           </el-col>
           <el-col :span="11">
             <div class="windowwarn">
-              温度：<span class="temperature"></span>
+              温度：<span class="temperature">-</span>
             </div>
           </el-col>
           <el-col :span="12">
             <div class="windowwarn">
-              压力：<span class="pressure"></span>
+              压力：<span class="pressure">-</span>
             </div>
           </el-col>
           <el-col :span="15">
             <div class="windowwarn">
-              上报时间：<span class="reportTime"></span>
+              上报时间：<span class="reportTime">-</span>
             </div>
           </el-col>
         </div>
@@ -117,12 +117,12 @@
           ">
           <el-col :span="24">
             <div class="windowwarn">
-              压力：<span class="pressure"></span>
+              压力：<span class="pressure">-</span>
             </div>
           </el-col>
           <el-col :span="24">
             <div class="windowwarn">
-              上报时间：<span class="reportTime"></span>
+              上报时间：<span class="reportTime">-</span>
             </div>
           </el-col>
         </div>

gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue

@@ -14,16 +14,16 @@
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">
-            设备类型：<span>{{ title }}</span>
+            设备类型：<span>{{ title ? title: "-" }}</span>
           </div>
           <div class="eq-text">
-            设备型号：<span>{{ data.deviceModel }}</span>
+            设备型号：<span>{{ data.deviceModel ? data.deviceModel : "-"  }}</span>
           </div>
           <div class="eq-text">
-            所属管道：<span>{{ data.pipeName }}</span>
+            所属管道：<span>{{ data.pipeName ? data.pipeName : "-"  }}</span>
           </div>
           <div class="eq-text">
-            物联网编号：<span>{{ data.iotNo }}</span>
+            物联网编号：<span>{{ data.iotNo ? data.iotNo : "-"  }}</span>
           </div>
         </div>
         <div class="pic">
@@ -50,11 +50,11 @@
 
         <div>
           <span>设备所在地址：</span>
-          <span>{{ data.pipeAddr }}</span>
+          <span>{{ data.pipeAddr ? data.pipeAddr : "-"  }}</span>
         </div>
         <div>
           <span>备注信息：</span>
-          <span>{{ data.remarks }} </span>
+          <span>{{ data.remarks ? data.remarks : "-"  }} </span>
         </div>
       </div>
     </div>
@@ -63,13 +63,13 @@
     <div class="warn-wrapper" v-if="true">
       <div class="warn-content">
         <div>
-          报警状态：<span>报警({{ data.alarmType }})</span>
+          报警状态：<span>报警({{ data.alarmType  ? data.alarmType : "-" }})</span>
         </div>
         <div>
           详细信息：<span>{{ data.alarmValue ? data.alarmValue : "-" }}</span>
         </div>
         <div v-if="!orderId">
-          工单编号：<span>{{ data.orderId }}</span>
+          工单编号：<span>{{ data.orderId ? data.orderId : "-"  }}</span>
         </div>
       </div>
 
@@ -81,42 +81,42 @@
           ">
           <el-col :span="12">
             <div class="windowwarn">
-              标况累积量：<span class="standardConditionAccumulation"></span>
+              标况累积量：<span class="standardConditionAccumulation">-</span>
             </div>
           </el-col>
           <el-col :span="11">
             <div class="windowwarn">
-              工况累积量：<span class="workingConditionAccumulation"></span>
+              工况累积量：<span class="workingConditionAccumulation">-</span>
             </div>
           </el-col>
           <el-col :span="12">
             <div class="windowwarn">
-              剩余量：<span class="residualQuantity"></span>
+              剩余量：<span class="residualQuantity">-</span>
             </div>
           </el-col>
           <el-col :span="11">
             <div class="windowwarn">
-              标况流量：<span class="standardConditionFlow"></span>
+              标况流量：<span class="standardConditionFlow">-</span>
             </div>
           </el-col>
           <el-col :span="12">
             <div class="windowwarn">
-              工况流量：<span class="workingConditionFlow"></span>
+              工况流量：<span class="workingConditionFlow">-</span>
             </div>
           </el-col>
           <el-col :span="11">
             <div class="windowwarn">
-              温度：<span class="temperature"></span>
+              温度：<span class="temperature">-</span>
             </div>
           </el-col>
           <el-col :span="12">
             <div class="windowwarn">
-              压力：<span class="pressure"></span>
+              压力：<span class="pressure">-</span>
             </div>
           </el-col>
           <el-col :span="15">
             <div class="windowwarn">
-              上报时间：<span class="reportTime"></span>
+              上报时间：<span class="reportTime">-</span>
             </div>
           </el-col>
         </div>
@@ -127,12 +127,12 @@
           ">
           <el-col :span="24">
             <div class="windowwarn">
-              压力：<span class="pressure"></span>
+              压力：<span class="pressure">-</span>
             </div>
           </el-col>
           <el-col :span="24">
             <div class="windowwarn">
-              上报时间：<span class="reportTime"></span>
+              上报时间：<span class="reportTime">-</span>
             </div>
           </el-col>
         </div>

gassafety-web/src/views/device/map/index.vue

@@ -194,8 +194,8 @@
                     <div class="list-wrapper">
                       <div class="thead">
                         <div class="no"></div>
-                        <div class="code">设备编号</div>
                         <div class="name">设备名称</div>
+                        <div class="code">设备编号</div>
                       </div>
                       <div
                         class="deviceList"
@@ -205,12 +205,12 @@
                         @click.stop="panToo(iten, item)"
                       >
                         <div class="no">{{ iten.no + 1 }}</div>
-                        <div :title="iten.code" class="code">
-                          {{ iten.code }}
-                        </div>
                         <div :title="iten.deviceName" class="name">
                           {{ iten.deviceName }}
                         </div>
+                        <div :title="iten.code" class="code">
+                          {{ iten.code }}
+                        </div>
                       </div>
                     </div>
                   </template>

gassafety-web/src/views/enterprise/mapView/components/Right.vue

@@ -67,9 +67,9 @@ export default {
 <style lang="scss"  scoped>
 .wrapper {
   width: 270px;
-  height: 700px;
-  position: absolute;
-  top: 40px;
+  height: 857px;
+  position: fixed;
+  top: 80px;
   right: 0;
   bottom:0;
   overflow-x: hidden;
@@ -91,9 +91,7 @@ export default {
   & > div {
   }
   .right {
-    position: absolute;
     right: 10px;
-    top: 51px;
     & > .right-content {
       // background-color: #fff;
       width: 247px;

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -192,8 +192,8 @@
                     <div class="list-wrapper">
                       <div class="thead">
                         <div class="no"></div>
-                        <div class="code">设备编号</div>
                         <div class="name">设备名称</div>
+                        <div class="code">设备编号</div>
                       </div>
                       <div
                         class="deviceList"
@@ -208,12 +208,12 @@
                         <div class="no">
                           {{ iten.no + 1 }}
                         </div>
-                        <div :title="iten.code" class="code">
-                          {{ iten.code }}
-                        </div>
                         <div :title="iten.deviceName" class="name">
                           {{ iten.deviceName }}
                         </div>
+                        <div :title="iten.code" class="code">
+                          {{ iten.code }}
+                        </div>
                       </div>
                     </div>
                   </template>