Merge branch 'dev-yjl' into 'shenzhen-dev'

修改人员定位系统页面-(点位配置、人员定位)平面图显示图标

See merge request !60

src/views/projectFront/personnelPosition/ConfigChildrenIndex/configuration.vue

@@ -138,8 +138,8 @@
                       <img
                       @mousedown.prevent="move(index,$event)"
                       @mouseup="up(index,$event)"
-                        style="width: 70px; height:70px;"
-                        src="@/assets/images/deepFoundationPitManage/ljz.png"
+                        style="width: 30px; height:30px;"
+                        src="@/assets/images/deepFoundationPitManage/ld.png"
                       />
                     </li>
                   </ul>

src/views/projectFront/personnelPosition/ConfigChildrenIndex/positoningIndex.vue

@@ -154,8 +154,8 @@
                       <img
                       @mousedown.prevent="move(index,$event)"
                         @mouseup="up(index,$event)"
-                        style="width: 70px; height:70px;"
-                        src="@/assets/images/deepFoundationPitManage/zc.png"
+                        style="width: 30px; height:30px;"
+                        src="@/assets/images/deepFoundationPitManage/jz.png"
                       />
                     </li>
                   </ul>

src/views/projectFront/personnelPosition/personnelPositioning.vue

@@ -20,9 +20,7 @@
       </div>
       <div ref="mapbox">
         <vue-scroll style="height: 780px">
-          <div
-            class="img-box"
-          >
+          <div class="img-box">
             <img
               ref="map"
               v-if="mapUrl"
@@ -42,26 +40,36 @@
                     'scale(' + 1 / imgZoom + ')' + ' ' + item.transform,
                 }"
               >
-                
-                <el-tooltip :content="item.name" effect="dark" placement="top" v-if="item.type == 1">
+                <el-tooltip
+                  :content="item.name"
+                  effect="dark"
+                  placement="top"
+                  v-if="item.type == 1"
+                >
                   <img
                     @click="detailsBtn(item)"
-                    style="width: 70px; height: 70px"
-                    src="@/assets/images/deepFoundationPitManage/ljz.png"
+                    style="width: 30px; height: 30px"
+                    src="@/assets/images/deepFoundationPitManage/ld.png"
                   />
                 </el-tooltip>
 
-                <el-tooltip :content="item.name" effect="dark" placement="top"  v-if="item.type != 1">
+                <el-tooltip
+                  :content="item.name"
+                  effect="dark"
+                  placement="top"
+                  v-if="item.type != 1"
+                >
                   <img
                     @click="detailsBtn(item)"
-                    style="width: 70px; height: 70px"
-                    src="@/assets/images/deepFoundationPitManage/zc.png"
+                    style="width: 30px; height: 30px"
+                    src="@/assets/images/deepFoundationPitManage/jz.png"
                   />
                 </el-tooltip>
               </li>
             </ul>
           </div>
         </vue-scroll>
+        
       </div>
     </div>
     <!-- 点位详情弹框 -->
@@ -191,7 +199,7 @@ export default {
         let _this = this;
         var img = new Image();
         img.src = Domlement.src;
-        console.log("getNaturalSize 图片地址",img.src);
+        console.log("getNaturalSize 图片地址", img.src);
         img.onload = function () {
           natureSize.width = img.width;
           natureSize.height = img.height;
@@ -233,7 +241,7 @@ export default {
       }).then((res) => {
         console.log("点位信息", res);
         if ((res.code = 200)) {
-          this.PointSummary = []
+          this.PointSummary = [];
           this.baseStationList = res.result.baseStationList;
           this.figureBuildingList = res.result.figureBuildingList;
 
@@ -242,15 +250,14 @@ export default {
             this.PointSummary.push(item);
           });
           this.figureBuildingList.forEach((item) => {
-            console.log("item hotspot--",item.hotspot);
-            if(item.hotspot != null) {
-              let hstspot = JSON.parse(item.hotspot)
-              item.mapX = hstspot[0]
-              item.mapY = hstspot[1]
-
+            console.log("item hotspot--", item.hotspot);
+            if (item.hotspot != null) {
+              let hstspot = JSON.parse(item.hotspot);
+              item.mapX = hstspot[0];
+              item.mapY = hstspot[1];
             }
             item.type = 1;
-            item.name = item.buildingName
+            item.name = item.buildingName;
             this.PointSummary.push(item);
           });
           this.pointList = this.PointSummary;
@@ -268,10 +275,9 @@ export default {
         type: val.type,
       }).then((res) => {
         console.log("查看点位信息详情 数据", res);
-       this.tableData = res.result
+        this.tableData = res.result;
       });
     },
-     
   },
 };
 </script>
@@ -322,10 +328,10 @@ export default {
     position: relative;
     img {
       position: absolute;
-        width: 100% ;
-        height: 800px ;
+      width: 96%;
+      height: 755px;
       display: block;
-        margin: 0 auto;
+      margin: 0 0 0 28px;
       margin-top: 20px;
     }
     .point-list {
@@ -392,8 +398,17 @@ export default {
       }
     }
   }
-  }
-  .el-select {
+}
+.el-select {
   margin-right: 20px;
+}
+.noDataImgBox {
+  img {
+    width: 250px;
+    margin-bottom: 200px;
   }
+  p {
+    font-size: 20px;
+  }
+}
 </style>