Forráskód Böngészése

Merge branch 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf

MSI\liwei 3 éve
szülő
commit
0002e32293
1 módosított fájl, 6 hozzáadás és 6 törlés
  1. 6 6
      ruoyi-ui/src/components/map/index.vue

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

@@ -7,7 +7,7 @@
         <span style="float:left">{{deviceName}}</span>
         <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">    
+      <div style="padding—left:10rem" class="shipContent">
             <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>
@@ -339,8 +339,8 @@ export default {
         }
     });
 
-     this.addpoint();
-     this.addline();
+    //  this.addpoint();
+    //  this.addline();
   },
   methods: {
     //[[1111,1111]]
@@ -422,7 +422,7 @@ export default {
         );
 
       this.map = map;
-      map.getView().setCenter(this.transpoints([[118.78, 32.04]],0)[0]);
+      map.getView().setCenter(this.transpoints([[118.642876,31.970445]],0)[0]);
       map.getView().setZoom(13);
     },
     initprod: function() {
@@ -504,7 +504,7 @@ export default {
       });
       map.getView().fit([75.0, 20.0, 135.0, 50.0], map.getSize());
       this.map = map;
-       map.getView().setCenter(this.transpoints([[118.78, 32.04]],0)[0]);
+       map.getView().setCenter(this.transpoints([[118.642876,31.970445]],0)[0]);
        map.getView().setZoom(13);
     },
 
@@ -550,7 +550,7 @@ export default {
           image: new Icon({
             color: "#eee",
             crossOrigin: "anonymous",
-            src: require("../../assets/images/icon/"+img) //本地的样式                              
+            src: require("../../assets/images/icon/"+img) //本地的样式
           })
         })
       ); //这里是样式