Merge pull request 'pc-master' (#207) from pc-master into portal

Reviewed-on: #207

src/views/page/largeScreen.vue

@@ -157,7 +157,7 @@
               </div>
               <!-- 大冶鑫 -->
               <div class="drag_box8" ref="drag_box8" v-show="limitUserId == 8">
-                <img class="drag_img" src="../../assets/img/map4.jpg" alt="" />
+                <img class="drag_img" src="../../assets/img/map4.png" alt="" />
                 <img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
                 <img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
                 <img class="axis_shimen2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
@@ -2728,8 +2728,8 @@ export default {
                 width: 0.4rem;
                 height: auto;
                 position: absolute;
-                top: 66%;
+                top: 67%;
-                left: 41%;
+                left: 42%;
                 z-index: 99;
                 cursor: pointer;
               }
@@ -2738,8 +2738,8 @@ export default {
                 width: 0.4rem;
                 height: auto;
                 position: absolute;
-                top: 48%;
+                top: 55%;
-                left: 54%;
+                left: 52%;
                 z-index: 99;
                 cursor: pointer;
               }
@@ -2748,8 +2748,8 @@ export default {
                 width: 0.4rem;
                 height: auto;
                 position: absolute;
-                top: 28%;
+                top: 40%;
-                left: 61%;
+                left: 57%;
                 z-index: 99;
                 cursor: pointer;
               }
@@ -2758,8 +2758,8 @@ export default {
                 width: 0.4rem;
                 height: auto;
                 position: absolute;
-                top: 20%;
+                top: 32%;
-                left: 59%;
+                left: 57%;
                 z-index: 99;
                 cursor: pointer;
               }
@@ -2768,8 +2768,8 @@ export default {
                 width: 0.4rem;
                 height: auto;
                 position: absolute;
-                top: 10%;
+                top: 24%;
-                left: 57%;
+                left: 56%;
                 z-index: 99;
                 cursor: pointer;
               }
@@ -2778,8 +2778,8 @@ export default {
                 width: 0.4rem;
                 height: auto;
                 position: absolute;
-                top: 5%;
+                top: 17%;
-                left: 54%;
+                left: 55%;
                 z-index: 99;
                 cursor: pointer;
               }
@@ -2788,8 +2788,8 @@ export default {
                 width: 0.4rem;
                 height: auto;
                 position: absolute;
-                top: 0%;
+                top: 12%;
-                left: 50%;
+                left: 52%;
                 z-index: 99;
                 cursor: pointer;
               }

src/views/page/largeScreen1.vue

@@ -476,7 +476,7 @@
         <div class="map">
           <div class="map1">
             <div class="drag_box8" ref="drag_box8">
-              <img class="drag_img" src="../../assets/img/map4.jpg" alt="" />
+              <img class="drag_img" src="../../assets/img/map4.png" alt="" />
               <div class="popBox" >
                 <template>
                   <div class="pole_item" :style="getTopOrLeft8(8)">
@@ -1355,40 +1355,40 @@ export default {
     },
     getTopOrLeft8(id){
       if(id == 8){
-        return 'top:79%;left:28%;z-index:8;'
+        return 'top:81%;left:29%;z-index:8;'
       }else if(id == 1){
-        return 'top:62%;left:39%;z-index:7;'
+        return 'top:65%;left:39%;z-index:7;'
       }else if(id == 2){
-        return 'top:48%;left:52%;z-index:6;'
+        return 'top:53%;left:49%;z-index:6;'
       }else if(id == 3){
-        return 'top:24%;left:59%;z-index:5;'
+        return 'top:38%;left:55%;z-index:5;'
       }else if(id == 4){
-        return 'top:16%;left:57%;z-index:4;'
+        return 'top:30%;left:55%;z-index:4;'
       }else if(id == 5){
-        return 'top:6%;left:55%;z-index:3;'
+        return 'top:22%;left:54%;z-index:3;'
       }else if(id == 6){
-        return 'top:1%;left:52%;z-index:2;'
+        return 'top:14%;left:52%;z-index:2;'
       }else if(id == 7){
-        return 'top:-4%;left:48%;z-index:1;'
+        return 'top:9%;left:50%;z-index:1;'
       }
     },
     getTopOrLeft8_8(id){
       if(id == 8){
-        return 'top:79%;left:28%;transform: translate(54%,-50%);'
+        return 'top:81%;left:29%;transform: translate(54%,0%);'
       }else if(id == 1){
-        return 'top:62%;left:39%;transform: translate(54%,-50%);'
+        return 'top:65%;left:39%;transform: translate(54%,0%);'
       }else if(id == 2){
-        return 'top:48%;left:52%;transform: translate(54%,-50%);'
+        return 'top:53%;left:49%;transform: translate(54%,0%);'
       }else if(id == 3){
-        return 'top:24%;left:59%;transform: translate(54%,-50%);'
+        return 'top:38%;left:55%;transform: translate(54%,0%);'
       }else if(id == 4){
-        return 'top:16%;left:57%;transform: translate(54%,0%);'
+        return 'top:30%;left:55%;transform: translate(54%,0%);'
       }else if(id == 5){
-        return 'top:6%;left:55%;transform: translate(54%,0%);'
+        return 'top:22%;left:54%;transform: translate(54%,0%);'
       }else if(id == 6){
-        return 'top:1%;left:52%;transform: translate(54%,0%);'
+        return 'top:14%;left:52%;transform: translate(54%,0%);'
       }else if(id == 7){
-        return 'top:0%;left:48%;transform: translate(54%,0%);'
+        return 'top:9%;left:50%;transform: translate(54%,0%);'
       }
     },
        getTopOrLeft9(id){

src/views/page/realTime.vue

@@ -448,7 +448,7 @@
         <el-dialog :close-on-click-modal="false" title="提示" top="15vh" :visible.sync="voltModel" width="564px"
       class="vrcode-model manage-model" :append-to-body="true">
       <div class="vrcode-model-title">
-        编辑
+        无线传感器调试信息
       </div>
       <div class="vrcode-content">
         <div class="manage-left">