fix 设备信息

ruoyi-ui/src/components/map/index.vue

@@ -8,18 +8,18 @@
         <i class="el-icon-close" style="font-size:9rem;margin-top:2rem;float:right" @click="deviceShow=false"></i>
       </div>
       <div style="padding—left:10rem" class="shipContent">
-            <el-row :gutter="3" style="margin-top:3rem">
+            <el-row :gutter="3" style="margin-top:13rem">
               <el-col :span="4">
-                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">设备类型:</div>
+                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595;">设备名称:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{deviceName}}</div>
               </el-col>
               <el-col :span="4">
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">监测点:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">南京三桥</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
@@ -27,13 +27,27 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">设备状态:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">在线</div>
               </el-col>
               <el-col :span="4">
-                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">设备模式:</div>
+                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">管辖机构:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">南京海事局</div>
+              </el-col>
+            </el-row>
+             <el-row :gutter="3" style="margin-top:3rem">
+              <el-col :span="4">
+                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">更新时间:</div>
+              </el-col>
+              <el-col :span="8">
+                <div class="grid-content bg-purple contentFont" style="float:left">2021-09-30 10:12:11</div>
+              </el-col>
+              <el-col :span="4">
+                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">经纬度:</div>
+              </el-col>
+              <el-col :span="8">
+                <div class="grid-content bg-purple contentFont" style="float:left">118.32,32.04</div>
               </el-col>
             </el-row>
             <!-- <el-row :gutter="3" style="margin-top:3rem">
@@ -255,7 +269,7 @@ import { Style, Icon,Stroke } from "ol/style";
 import { Vector as LayerVec } from "ol/layer";
 
 let ispro = process.env.NODE_ENV === "production";
-//  ispro = false;
+ ispro = false;
 export default {
   props: {
     src: {
@@ -327,9 +341,11 @@ export default {
                if(tadata.type == "ship"){
                     console.log(111111);
                      that.shipShow = true;
+                     that.deviceShow = false;
                      that.shipName = tadata.data
                }else if(tadata.type == "device"){
                      that.deviceShow = true;
+                     that.shipShow = false;
                      that.deviceName = tadata.data
                }
               //  alert("我是点："+tadata.data)
@@ -574,12 +590,16 @@ export default {
 .ol-zoom {
   display: none;
 }
+.contentFont{
+      font-size: 6rem;
+    line-height: 16rem;
+}
 
 .shipDiv {
   position: absolute;
   top: 250rem;
   left: 140rem;
-  width: 220rem;
+  width: 240rem;
   height: 130rem;
   background-color: white;
 }